5 files changed, 22 insertions, 32 deletions
diff --git a/source/xap/blueman/30-blueman-netdev-allow-access.rules b/source/xap/blueman/30-blueman-netdev-allow-access.rules
deleted file mode 100644
index 9ef313c7..00000000
--- a/source/xap/blueman/30-blueman-netdev-allow-access.rules
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Allow users in netdev group to use blueman feature requiring root without authentication */
-polkit.addRule(function(action, subject) {
-    if ((action.id == "org.blueman.network.setup" ||
-         action.id == "org.blueman.dhcp.client" ||
-         action.id == "org.blueman.rfkill.setstate" ||
-         action.id == "org.blueman.pppd.pppconnect") &&
-        subject.isInGroup("netdev")) {
-        return polkit.Result.YES;
-    }
-});
diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild
index 5507fdf7..67356edc 100755
--- a/source/xap/blueman/blueman.SlackBuild
+++ b/source/xap/blueman/blueman.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for blueman
 
 # Copyright 2009, 2015  Robby Workman, Tuscaloosa, Alabama, USA
-# Copyright 2010, 2015, 2018  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2015, 2018, 2020  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=blueman
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -90,6 +90,9 @@ done
 # Don't autostart blueman applet in KDE; it has its own bluetooth application
 zcat $CWD/dont-autostart-applet-in-kde.diff.gz | patch -p1 --verbose || exit 1
 
+# Patch the blueman rules to allow members of the netdev group to make changes:
+zcat $CWD/blueman.allow.access.to.netdev.group.diff.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 PYTHON=/usr/bin/python3 \
@@ -120,10 +123,6 @@ sed -i "s,#!/usr/bin/env python3,#!/usr/bin/python${PYTHON3VER},g" module/_bluem
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Install default rules allowing users in the netdev group to make changes:
-mkdir -p $PKG/etc/polkit-1/rules.d
-zcat $CWD/30-blueman-netdev-allow-access.rules.gz > $PKG/etc/polkit-1/rules.d/30-blueman-netdev-allow-access.rules.new
-
 # Remove the AppIndicator.py plugin (we don't have libappindicator3
 # nor will we be getting it in the foreseeable future)
 rm ${PKG}$PYTHON3LIB/blueman/plugins/applet/AppIndicator.py
diff --git a/source/xap/blueman/blueman.allow.access.to.netdev.group.diff b/source/xap/blueman/blueman.allow.access.to.netdev.group.diff
new file mode 100644
index 00000000..5198a9a1
--- /dev/null
+++ b/source/xap/blueman/blueman.allow.access.to.netdev.group.diff
@@ -0,0 +1,15 @@
+--- ./data/configs/blueman.rules.orig	2020-04-28 03:20:19.000000000 -0500
++++ ./data/configs/blueman.rules	2020-05-09 13:52:27.000000000 -0500
+@@ -1,10 +1,10 @@
+-/* Allow users in wheel group to use blueman feature requiring root without authentication */
++/* Allow users in netdev group to use blueman feature requiring root without authentication */
+ polkit.addRule(function(action, subject) {
+     if ((action.id == "org.blueman.network.setup" ||
+          action.id == "org.blueman.dhcp.client" ||
+          action.id == "org.blueman.rfkill.setstate" ||
+          action.id == "org.blueman.pppd.pppconnect") &&
+-        subject.isInGroup("wheel")) {
++        subject.isInGroup("netdev")) {
+         return polkit.Result.YES;
+     }
+ });
diff --git a/source/xap/blueman/doinst.sh b/source/xap/blueman/doinst.sh
index 16e49ab9..0254ea06 100644
--- a/source/xap/blueman/doinst.sh
+++ b/source/xap/blueman/doinst.sh
@@ -1,17 +1,3 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-config etc/polkit-1/rules.d/30-blueman-netdev-allow-access.rules.new
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
@@ -27,4 +13,3 @@ if [ -e usr/share/glib-2.0/schemas ]; then
     /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
   fi
 fi
-
diff --git a/source/xap/network-manager-applet/network-manager-applet.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
index f7c289f2..1e39ed78 100755
--- a/source/xap/network-manager-applet/network-manager-applet.SlackBuild
+++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=network-manager-applet
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -96,6 +96,7 @@ meson setup \
   --buildtype=release \
   -Dteam=false \
   -Dselinux=false \
+  -Dappindicator=no \
   .. || exit 1
   "${NINJA:=ninja}" $NUMJOBS || exit 1
   DESTDIR=$PKG $NINJA install || exit 1