12 files changed, 52 insertions, 61 deletions
diff --git a/source/l/GConf/GConf.SlackBuild b/source/l/GConf/GConf.SlackBuild
index 19f9f44b1..4d5fd0144 100755
--- a/source/l/GConf/GConf.SlackBuild
+++ b/source/l/GConf/GConf.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=GConf
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -99,6 +99,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Move dbus configs to system location:
+mkdir -p $PKG/usr/share/dbus-1/system.d/
+mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
+rmdir --parents $PKG/etc/dbus-1/system.d/
+
 # Don't ship .la files:
 rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
 
diff --git a/source/l/accountsservice/accountsservice.SlackBuild b/source/l/accountsservice/accountsservice.SlackBuild
index 0c2c02b3f..d4ec55d0b 100755
--- a/source/l/accountsservice/accountsservice.SlackBuild
+++ b/source/l/accountsservice/accountsservice.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=accountsservice
 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
@@ -115,6 +115,11 @@ meson setup \
   DESTDIR=$PKG $NINJA install || exit 1
 cd ..
 
+# Move dbus configs to system location:
+mkdir -p $PKG/usr/share/dbus-1/system.d/
+mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
+rmdir --parents $PKG/etc/dbus-1/system.d/
+
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/source/l/cryptopp/cryptopp.SlackBuild b/source/l/cryptopp/cryptopp.SlackBuild
index 4ce5a9694..482e46c7c 100755
--- a/source/l/cryptopp/cryptopp.SlackBuild
+++ b/source/l/cryptopp/cryptopp.SlackBuild
@@ -24,7 +24,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cryptopp
-VERSION=${VERSION:-8.2.0}
+VERSION=${VERSION:-8.3.0}
 SRCVER=$(echo $VERSION | tr -d '.')
 BUILD=${BUILD:-1}
 
diff --git a/source/l/cryptopp/cryptopp.url b/source/l/cryptopp/cryptopp.url
index 1bc3357dd..dfea34568 100644
--- a/source/l/cryptopp/cryptopp.url
+++ b/source/l/cryptopp/cryptopp.url
@@ -1 +1 @@
-https://www.cryptopp.com/cryptopp820.zip
+https://www.cryptopp.com/cryptopp830.zip
diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild
index 803507eb6..4ba20e714 100755
--- a/source/l/harfbuzz/harfbuzz.SlackBuild
+++ b/source/l/harfbuzz/harfbuzz.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=harfbuzz
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/polkit/10-org.freedesktop.NetworkManager.rules b/source/l/polkit/10-org.freedesktop.NetworkManager.rules
deleted file mode 100644
index 9d6557b3b..000000000
--- a/source/l/polkit/10-org.freedesktop.NetworkManager.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-polkit.addRule(function(action, subject) {
-  if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && 
-      subject.isInGroup("netdev")) {
-      return polkit.Result.YES;
-  }
-});
-
diff --git a/source/l/polkit/20-plugdev-group-mount-override.rules b/source/l/polkit/20-plugdev-group-mount-override.rules
deleted file mode 100644
index c47a66cf2..000000000
--- a/source/l/polkit/20-plugdev-group-mount-override.rules
+++ /dev/null
@@ -1,16 +0,0 @@
-/* http://udisks.freedesktop.org/docs/latest/udisks-polkit-actions.html */
-
-polkit.addRule(function(action, subject) {
-    if (action.id == "org.freedesktop.udisks2.filesystem-mount" &&
-        subject.isInGroup("plugdev")) {
-        return polkit.Result.YES;
-    }
-});
-
-polkit.addRule(function(action, subject) {
-    if (action.id == "org.freedesktop.udisks2.eject-media" &&
-        subject.isInGroup("plugdev")) {
-        return polkit.Result.YES;
-    }
-});
-
diff --git a/source/l/polkit/doinst.sh b/source/l/polkit/doinst.sh
index ebcfef748..3d81307e8 100644
--- a/source/l/polkit/doinst.sh
+++ b/source/l/polkit/doinst.sh
@@ -9,8 +9,7 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-config etc/polkit-1/rules.d/20-plugdev-group-mount-override.rules.new
-config etc/polkit-1/rules.d/10-org.freedesktop.NetworkManager.rules.new
+
 if [ -r etc/pam.d/polkit-1.new ]; then
   config etc/pam.d/polkit-1.new
 fi
diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild
index 0c12c80a6..b292b7987 100755
--- a/source/l/polkit/polkit.SlackBuild
+++ b/source/l/polkit/polkit.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=polkit
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -144,9 +144,13 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 # actually used for anything later.  Perms don't matter.
 mkdir -p $PKG/var/lib/polkit
 
-# Add default policy files for udisks2 and NetworkManager events:
-cat $CWD/10-org.freedesktop.NetworkManager.rules > $PKG/etc/polkit-1/rules.d/10-org.freedesktop.NetworkManager.rules.new
-cat $CWD/20-plugdev-group-mount-override.rules > $PKG/etc/polkit-1/rules.d/20-plugdev-group-mount-override.rules.new
+# Move dbus configs to system location:
+mkdir -p $PKG/usr/share/dbus-1/system.d/
+mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
+rmdir --parents $PKG/etc/dbus-1/system.d/
+
+# Leave the /etc/polkit-1/rules.d/ dir in place, but move the config(s)
+mv $PKG/etc/polkit-1/rules.d/* $PKG/usr/share/polkit-1/rules.d/
 
 if [ ! -z "$PAM_OPTIONS" ]; then
   # Make the PAM file .new:
diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild
index 27a9d13b3..2f6512138 100755
--- a/source/l/pulseaudio/pulseaudio.SlackBuild
+++ b/source/l/pulseaudio/pulseaudio.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pulseaudio
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -124,6 +124,11 @@ cd ..
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
+# Move dbus configs to system location:
+mkdir -p $PKG/usr/share/dbus-1/system.d/
+mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
+rmdir --parents $PKG/etc/dbus-1/system.d/
+
 # Move config files to .new:
 for f in $( find $PKG/etc/pulse/ -type f ) ; do mv $f $f.new ; done
 
diff --git a/source/l/system-config-printer/doinst.sh b/source/l/system-config-printer/doinst.sh
index 884cda801..d92f57f83 100644
--- a/source/l/system-config-printer/doinst.sh
+++ b/source/l/system-config-printer/doinst.sh
@@ -11,9 +11,6 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf.new
-config etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf.new
-
 # Update the desktop database:
 if [ -x usr/bin/update-desktop-database ]; then
   chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild
index 34a271920..b5f541bb1 100755
--- a/source/l/system-config-printer/system-config-printer.SlackBuild
+++ b/source/l/system-config-printer/system-config-printer.SlackBuild
@@ -4,30 +4,28 @@
 # Copyright 2010, 2011, 2012, 2013, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# -----------------------------------------------------------------------------
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=system-config-printer
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -127,16 +125,17 @@ python3 -O -m compileall "${PKG}/usr/share/system-config-printer"
 mkdir -p $PKG/lib
 mv $PKG/etc/udev $PKG/lib/
 
+# Move the dbus configs to the system location:
+mkdir -p $PKG/usr/share/dbus-1/system.d/
+mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
+rmdir --parents $PKG/etc/dbus-1/system.d/
+
 if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
   # Looks like PAM is not installed. Instead, your user must be in group 'lp'.
   sed -i -e 's/at_console="true"/group="lp"/g' \
-    $PKG/etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
+    $PKG/usr/share/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
 fi
 
-# Don't clobber the configuration file:
-mv $PKG/etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf{,.new}
-mv $PKG/etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf{,.new}
-
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \