Fri Dec 25 00:52:08 UTC 202020201225005208

Here are some updates to provide a little holiday cheer. The kernels are
rebuilt (yeah, we'll probably have new ones tomorrow but whatever) to build in
HWMON making NVMe temperature monitoring available, and there's also a massive
cleanup of polkit/dbus related packages to move most of the config files out
of /etc and not install them as .new. Local config files that override the
shipped ones may be placed in the directories in /etc to override the ones that
we ship. Thanks to Robby Workman for this!
None of the packages included in Slackware place any files in
/etc/polkit-1/rules.d/ or /etc/dbus-1/system.d/ any more, but there may be
third-party packages that still do. However, since Slackware's packages
originally installed these as .new files, the leftover configs will remain.
You'll probably want to take a look in those directories to clean out any
config files that you haven't modified yourself or that belong to packages that
aren't part of Slackware itself.
Hope everyone has a great day. :-)
a/dbus-1.12.20-x86_64-3.txz:  Rebuilt.
  Added local config override directory /etc/dbus-1/system.d/ since no other
  package provides it now.
a/kernel-generic-5.10.2-x86_64-2.txz:  Upgraded.
a/kernel-huge-5.10.2-x86_64-2.txz:  Upgraded.
a/kernel-modules-5.10.2-x86_64-2.txz:  Upgraded.
a/udisks-1.0.5-x86_64-6.txz:  Rebuilt.
  Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
a/udisks2-2.9.1-x86_64-2.txz:  Rebuilt.
  Include 20-plugdev-group-mount-override.rules, installed in the system
  location. Thanks to Robby Workman.
ap/cups-2.3.3-x86_64-3.txz:  Rebuilt.
  Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
ap/hplip-3.20.6-x86_64-4.txz:  Rebuilt.
  Use --enable-qt5.
  Move D-Bus configs from /etc to the system location.
  Drop HAL support (LOL!)
  Thanks to Robby Workman.
ap/mpg123-1.26.4-x86_64-1.txz:  Upgraded.
d/gnucobol-3.1.2-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.10.2-x86-2.txz:  Upgraded.
k/kernel-source-5.10.2-noarch-2.txz:  Upgraded.
   HWMON m -> y
  +NVME_HWMON y
  +POWER_SUPPLY_HWMON y
  +THERMAL_HWMON y
  Thanks to Daedra.
kde/sddm-0.19.0-x86_64-4.txz:  Rebuilt.
  Don't include the /etc/dbus-1/system.d/ directory.
l/GConf-3.2.6-x86_64-5.txz:  Rebuilt.
  Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
l/accountsservice-0.6.55-x86_64-2.txz:  Rebuilt.
  Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
l/cryptopp-8.3.0-x86_64-1.txz:  Upgraded.
l/harfbuzz-2.7.3-x86_64-1.txz:  Upgraded.
l/polkit-0.118-x86_64-3.txz:  Rebuilt.
  Remove D-Bus rules for udisks2 and NetworkManager (moved to those packages).
  Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
l/pulseaudio-14.0-x86_64-2.txz:  Rebuilt.
  Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
l/system-config-printer-1.5.12-x86_64-6.txz:  Rebuilt.
  Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
n/ModemManager-1.14.8-x86_64-2.txz:  Rebuilt.
  Added elogind support.
  Move D-Bus configs from /etc to the system location.
  Thanks to Robby Workman.
n/NetworkManager-1.28.0-x86_64-2.txz:  Rebuilt.
  Include 10-org.freedesktop.NetworkManager.rules, installed in the system
  location. Thanks to Robby Workman.
n/bluez-5.55-x86_64-2.txz:  Rebuilt.
  Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
n/netatalk-3.1.12-x86_64-5.txz:  Rebuilt.
  Patched to fix failure to build from source with gcc10.
  Move D-Bus configs from /etc to the system location.
  Thanks to Robby Workman.
n/wpa_supplicant-2.9-x86_64-3.txz:  Rebuilt.
  Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
x/mesa-20.3.1-x86_64-2.txz:  Rebuilt.
  [PATCH] vulkan/device_select: Store Vulkan vendorID and deviceID as uint32_t.
  Thanks to sasha69 for the link to the upstream discussion/commit.
xap/blueman-2.1.4-x86_64-3.txz:  Rebuilt.
  Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
xap/xgames-0.3-x86_64-6.txz:  Rebuilt.
  Fixed spider failing to build from source with gcc10.
  Removed the ancient version of xsnow.
xap/xscreensaver-5.45-x86_64-2.txz:  Rebuilt.
  Make the description of the xscreensaver settings be clearly for xscreensaver
  as opposed to a generic "screensaver" settings. Thanks to Robby Workman.
xap/xsnow-3.1.9-x86_64-1.txz:  Added.
  Merry Christmas / Happy Holidays! :-)
xfce/mousepad-0.5.1-x86_64-1.txz:  Upgraded.
xfce/xfce4-screensaver-0.1.11-x86_64-2.txz:  Rebuilt.
  Make the description of the xfce4-screensaver settings be clearly for
  xfce4-screensaver as opposed to a generic "screensaver" settings.
  Thanks to Robby Workman.
xfce/xfce4-session-4.14.2-x86_64-2.txz:  Rebuilt.
  Use xfce4-screensaver by default and don't ship the xscreensaver.desktop
  autostart file. Thanks to Robby Workman.
extra/pure-alsa-system/*:  Removed.
  This served a purpose during the pure ALSA to PulseAudio transition, but
  it's time for it to go away. If the latency is an issue for your use case,
  a look around should turn up documentation on how to reduce it, or how to
  send output directly to ALSA without having to uninstall PulseAudio or
  recompile anything that's linked to it. As an example, see this one (which
  was mentioned here before):
  https://wiki.archlinux.org/index.php/PulseAudio/Examples#PulseAudio_as_a_minimal_unintrusive_dumb_pipe_to_ALSA
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

47 files changed, 448 insertions, 98 deletions

diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild
index bb17338b4..1ae1871ca 100755
--- a/source/a/dbus/dbus.SlackBuild
+++ b/source/a/dbus/dbus.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dbus
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -141,6 +141,10 @@ chmod 0755 $PKG/etc/rc.d/rc.messagebus.new
 # Fix some directory ownership
 chown messagebus $PKG/var/lib/dbus
 
+# Create the local override directory since no other package will include it
+# now that config files have been moved to the system location under /usr:
+mkdir -p $PKG/etc/dbus-1/system.d
+
 # Add documentation
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
diff --git a/source/a/udisks/udisks.SlackBuild b/source/a/udisks/udisks.SlackBuild
index b2f756472..d8caa4967 100755
--- a/source/a/udisks/udisks.SlackBuild
+++ b/source/a/udisks/udisks.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for udisks
 
-# Copyright 2010, 2011, 2014, 2015  Robby Workman, Northport, Alabama, USA
+# Copyright 2010, 2011, 2014, 2015, 2020  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=udisks
 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) "}
 
@@ -117,6 +117,11 @@ mv $PKG/etc/profile.d/udisks-bash-completion.sh \
    $PKG/usr/share/bash-completion/completions/udisks
 rmdir --parents $PKG/etc/profile.d
 
+# Move the dbus config file to the system directory
+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/
+
 find $PKG/usr/man -type f -exec gzip -9 {} \+
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
diff --git a/source/l/polkit/20-plugdev-group-mount-override.rules b/source/a/udisks2/20-plugdev-group-mount-override.rules
index c47a66cf2..c47a66cf2 100644
--- a/source/l/polkit/20-plugdev-group-mount-override.rules
+++ b/source/a/udisks2/20-plugdev-group-mount-override.rules
diff --git a/source/a/udisks2/udisks2.SlackBuild b/source/a/udisks2/udisks2.SlackBuild
index 8886f0151..734454f56 100755
--- a/source/a/udisks2/udisks2.SlackBuild
+++ b/source/a/udisks2/udisks2.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=udisks2
 SRCNAM=udisks
 VERSION=${VERSION:-$(echo $SRCNAM-*.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
@@ -119,6 +119,10 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 # Don't overwrite config file, but leave mount_options.conf.example alone
 mv $PKG/etc/udisks2/udisks2.conf $PKG/etc/udisks2/udisks2.conf.new
 
+# Add default policy files for udisks2 events:
+mkdir -p $PKG/usr/share/polkit-1/rules.d/
+cat $CWD/20-plugdev-group-mount-override.rules > $PKG/usr/share/polkit-1/rules.d/20-plugdev-group-mount-override.rules
+
 # 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/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild
index 4a9f85ac1..1f5a41a88 100755
--- a/source/ap/cups/cups.SlackBuild
+++ b/source/ap/cups/cups.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cups
 VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.?z | cut -f 2 -d -)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -146,11 +146,10 @@ chmod 644 $PKG/etc/rc.d/rc.cups.new
 # Clear out the additions:
 rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d
 
-# I'm not sure if overwriting this blindly could have ill effects,
-# but it never hurts to play it safe.  According to the dbus-daemon
-# manpage, only files ending in .conf will be used, so there won't
-# be any unintended doubling up.
-mv $PKG/etc/dbus-1/system.d/cups.conf $PKG/etc/dbus-1/system.d/cups.conf.new
+# Move the dbus config file to the system directory
+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/
 
 # For full CUPS SMB support, you'll need to install the cups-samba
 # package from the source in this directory.  There's no easy way
diff --git a/source/ap/cups/doinst.sh b/source/ap/cups/doinst.sh
index d0349bca7..80ebbd17e 100644
--- a/source/ap/cups/doinst.sh
+++ b/source/ap/cups/doinst.sh
@@ -12,7 +12,7 @@ config() {
 for file in etc/cups/*.new ; do
   config $file
 done
-config etc/dbus-1/system.d/cups.conf.new
+
 if [ -r etc/pam.d/cups.new ]; then
   config etc/pam.d/cups.new
 fi
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index d8cf68b0b..3e57f8f27 100755
--- a/source/ap/hplip/hplip.SlackBuild
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=hplip
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -150,7 +150,7 @@ PYTHON=/usr/bin/python3 \
   --disable-foomatic-ppd-install \
   --enable-foomatic-drv-install \
   --enable-network-build=yes \
-  --enable-qt4 \
+  --enable-qt5 \
   --enable-policykit \
   --enable-cups-ppd-install \
   --build=$ARCH-slackware-linux \
@@ -160,6 +160,11 @@ PYTHON=/usr/bin/python3 \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG rulesdir=/lib/udev/rules.d || 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
 
@@ -167,6 +172,9 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 # continue to make use of it:
 mkdir -p $PKG/var/lib/hp/
 
+# HAL is long gone:
+rm -rf $PKG/usr/share/hal
+
 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/d/gnucobol/gnucobol.SlackBuild b/source/d/gnucobol/gnucobol.SlackBuild
index dfb7842c5..c3ce8c84c 100755
--- a/source/d/gnucobol/gnucobol.SlackBuild
+++ b/source/d/gnucobol/gnucobol.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gnucobol
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -75,7 +75,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
diff --git a/source/k/kernel-configs/config-generic-5.10.2 b/source/k/kernel-configs/config-generic-5.10.2
index 0cfeb5c39..85ea5353c 100644
--- a/source/k/kernel-configs/config-generic-5.10.2
+++ b/source/k/kernel-configs/config-generic-5.10.2
@@ -2375,6 +2375,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
@@ -4587,6 +4588,7 @@ CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_RESTART is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_TEST_POWER=m
@@ -4626,7 +4628,7 @@ CONFIG_CHARGER_RT9455=m
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_BD99954=m
 CONFIG_CHARGER_WILCO=m
-CONFIG_HWMON=m
+CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -4832,6 +4834,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_NETLINK=y
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
diff --git a/source/k/kernel-configs/config-generic-5.10.2.x64 b/source/k/kernel-configs/config-generic-5.10.2.x64
index 3aed313b6..f86ee551f 100644
--- a/source/k/kernel-configs/config-generic-5.10.2.x64
+++ b/source/k/kernel-configs/config-generic-5.10.2.x64
@@ -2433,6 +2433,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
@@ -4598,6 +4599,7 @@ CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_RESTART is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_TEST_POWER=m
@@ -4637,7 +4639,7 @@ CONFIG_CHARGER_RT9455=m
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_BD99954=m
 CONFIG_CHARGER_WILCO=m
-CONFIG_HWMON=m
+CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -4844,6 +4846,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_NETLINK=y
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
diff --git a/source/k/kernel-configs/config-generic-smp-5.10.2-smp b/source/k/kernel-configs/config-generic-smp-5.10.2-smp
index 9df76279c..d5b86a23a 100644
--- a/source/k/kernel-configs/config-generic-smp-5.10.2-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.10.2-smp
@@ -2421,6 +2421,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
@@ -4633,6 +4634,7 @@ CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_RESTART is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_TEST_POWER=m
@@ -4672,7 +4674,7 @@ CONFIG_CHARGER_RT9455=m
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_BD99954=m
 CONFIG_CHARGER_WILCO=m
-CONFIG_HWMON=m
+CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -4878,6 +4880,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_NETLINK=y
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
diff --git a/source/k/kernel-configs/config-huge-5.10.2 b/source/k/kernel-configs/config-huge-5.10.2
index 3aa36819b..5e379dd2e 100644
--- a/source/k/kernel-configs/config-huge-5.10.2
+++ b/source/k/kernel-configs/config-huge-5.10.2
@@ -2375,6 +2375,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
@@ -4587,6 +4588,7 @@ CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_RESTART is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_TEST_POWER=m
@@ -4626,7 +4628,7 @@ CONFIG_CHARGER_RT9455=m
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_BD99954=m
 CONFIG_CHARGER_WILCO=m
-CONFIG_HWMON=m
+CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -4832,6 +4834,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_NETLINK=y
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
diff --git a/source/k/kernel-configs/config-huge-5.10.2.x64 b/source/k/kernel-configs/config-huge-5.10.2.x64
index 6a99bc837..a47c4040c 100644
--- a/source/k/kernel-configs/config-huge-5.10.2.x64
+++ b/source/k/kernel-configs/config-huge-5.10.2.x64
@@ -2433,6 +2433,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
@@ -4598,6 +4599,7 @@ CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_RESTART is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_TEST_POWER=m
@@ -4637,7 +4639,7 @@ CONFIG_CHARGER_RT9455=m
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_BD99954=m
 CONFIG_CHARGER_WILCO=m
-CONFIG_HWMON=m
+CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -4844,6 +4846,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_NETLINK=y
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
diff --git a/source/k/kernel-configs/config-huge-smp-5.10.2-smp b/source/k/kernel-configs/config-huge-smp-5.10.2-smp
index 7b6792d71..23f73bb5c 100644
--- a/source/k/kernel-configs/config-huge-smp-5.10.2-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.10.2-smp
@@ -2421,6 +2421,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
@@ -4633,6 +4634,7 @@ CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_RESTART is not set
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_TEST_POWER=m
@@ -4672,7 +4674,7 @@ CONFIG_CHARGER_RT9455=m
 CONFIG_CHARGER_CROS_USBPD=m
 CONFIG_CHARGER_BD99954=m
 CONFIG_CHARGER_WILCO=m
-CONFIG_HWMON=m
+CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -4878,6 +4880,7 @@ CONFIG_THERMAL=y
 CONFIG_THERMAL_NETLINK=y
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
diff --git a/source/kde/kde/build/sddm b/source/kde/kde/build/sddm
index 00750edc0..b8626c4cf 100644
--- a/source/kde/kde/build/sddm
+++ b/source/kde/kde/build/sddm
@@ -1 +1 @@
-3
+4
diff --git a/source/kde/kde/post-install/sddm.post-install b/source/kde/kde/post-install/sddm.post-install
index 29229d742..b69fdcd78 100644
--- a/source/kde/kde/post-install/sddm.post-install
+++ b/source/kde/kde/post-install/sddm.post-install
@@ -12,6 +12,7 @@ chown sddm:sddm $PKG/var/lib/sddm
 # D-Bus configs should be under /usr, not /etc:
 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
 
 # Remove the sddm.conf file because we will generate our own in doinst.sh:
 rm -f $PKG/etc/sddm.conf
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/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 \
diff --git a/source/n/ModemManager/ModemManager.SlackBuild b/source/n/ModemManager/ModemManager.SlackBuild
index af9a88df6..c8e19dd69 100755
--- a/source/n/ModemManager/ModemManager.SlackBuild
+++ b/source/n/ModemManager/ModemManager.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ModemManager
 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
@@ -81,6 +81,8 @@ find . \
 
 zcat $CWD/WeDoNotHaveSystemD.patch.gz | patch -p1 --verbose || exit 1
 
+LIBSYSTEMD_LOGIN_CFLAGS="$(pkg-config --cflags libelogind)" \
+LIBSYSTEMD_LOGIN_LIBS="$(pkg-config --libs libelogind)" \
 CFLAGS="$SLKCFLAGS -Wno-incompatible-pointer-types" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -92,11 +94,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --disable-static \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --with-systemd-suspend-resume \
   --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || 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/polkit/10-org.freedesktop.NetworkManager.rules b/source/n/NetworkManager/10-org.freedesktop.NetworkManager.rules
index 9d6557b3b..9d6557b3b 100644
--- a/source/l/polkit/10-org.freedesktop.NetworkManager.rules
+++ b/source/n/NetworkManager/10-org.freedesktop.NetworkManager.rules
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild
index c826785b0..fb108b5bf 100755
--- a/source/n/NetworkManager/NetworkManager.SlackBuild
+++ b/source/n/NetworkManager/NetworkManager.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=NetworkManager
 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:
 MARCH=$( uname -m )
@@ -182,6 +182,10 @@ mkdir -p $PKG/etc/NetworkManager/conf.d
 cat $CWD/conf.d/00-dhcp-client.conf > $PKG/etc/NetworkManager/conf.d/00-dhcp-client.conf.new
 cat $CWD/conf.d/00-rc-manager.conf > $PKG/etc/NetworkManager/conf.d/00-rc-manager.conf.new
 
+# Add default polkit rules for NM
+mkdir -p $PKG/usr/share/polkit-1/rules.d/
+cat $CWD/10-org.freedesktop.NetworkManager.rules > $PKG/usr/share/polkit-1/rules.d/10-org.freedesktop.NetworkManager.rules
+
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS CONTRIBUTING COPYING ChangeLog INSTALL NEWS README TODO \
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild
index cc55d396b..eabe10140 100755
--- a/source/n/bluez/bluez.SlackBuild
+++ b/source/n/bluez/bluez.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=bluez
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -129,6 +129,11 @@ chmod 644 $PKG/lib/modprobe.d/btusb.conf
 mkdir -p $PKG/usr/sbin
 ln -s ../libexec/bluetooth/bluetoothd $PKG/usr/sbin
 
+# Move the dbus config file to the system directory
+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/
+
 # Fix substitution in /usr/share/dbus-1/services/org.bluez.obex.service:
 if [ -x $PKG/usr/libexec/bluetooth/obexd ]; then
   sed -i "s|@libexecdir@|/usr/libexec|g" $PKG/usr/share/dbus-1/services/org.bluez.obex.service
diff --git a/source/n/netatalk/netatalk-invalid_dircache_entries.patch b/source/n/netatalk/netatalk-invalid_dircache_entries.patch
new file mode 100644
index 000000000..8652b68ca
--- /dev/null
+++ b/source/n/netatalk/netatalk-invalid_dircache_entries.patch
@@ -0,0 +1,22 @@
+From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001
+From: Andrew Bauer <zonexpertconsulting@outlook.com>
+Date: Wed, 22 Jan 2020 09:59:47 -0600
+Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries
+
+---
+ etc/afpd/directory.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
+index eb89c606..81bfa9cb 100644
+--- a/etc/afpd/directory.h
++++ b/etc/afpd/directory.h
+@@ -91,7 +91,7 @@ struct maccess {
+ #define	AR_UWRITE	(1<<2)
+ #define	AR_UOWN		(1<<7)
+ 
+-q_t *invalid_dircache_entries;
++extern q_t *invalid_dircache_entries;
+ 
+ typedef int (*dir_loop)(struct dirent *, char *, void *);
+ 
diff --git a/source/n/netatalk/netatalk.SlackBuild b/source/n/netatalk/netatalk.SlackBuild
index 7674450d6..09f715c43 100755
--- a/source/n/netatalk/netatalk.SlackBuild
+++ b/source/n/netatalk/netatalk.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=netatalk
 VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -78,6 +78,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1793912
+zcat $CWD/netatalk-invalid_dircache_entries.patch.gz | patch -p1 --verbose || exit 1
+
 # Choose correct options depending on whether PAM is installed:
 if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
   PAM_OPTIONS="--with-pam-confdir=/etc/pam.d --with-pam --enable-ddp"
@@ -101,7 +104,7 @@ CFLAGS="$SLKCFLAGS" \
   $PAM_OPTIONS \
   $SHADOW_OPTIONS \
   --with-libevent=system \
-  --with-dbus-sysconf-dir=/etc/dbus-1/system.d/ \
+  --with-dbus-sysconf-dir=/usr/share/dbus-1/system.d/ \
   --with-dbus-daemon=/usr/bin/dbus-daemon \
   --build=$ARCH-slackware-linux || exit 1
 
diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
index 61b993f81..18ed83939 100755
--- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
+++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=wpa_supplicant
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 SRCVERSION=$(printf $VERSION | tr _ -)
 
@@ -136,9 +136,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 # Install dbus configuration file:
-mkdir -p $PKG/etc/dbus-1/system.d/
+mkdir -p $PKG/usr/share/dbus-1/system.d/
 cp dbus/dbus-wpa_supplicant.conf \
-  $PKG/etc/dbus-1/system.d/dbus-wpa_supplicant.conf
+  $PKG/usr/share/dbus-1/system.d/dbus-wpa_supplicant.conf
 
 mkdir -p $PKG/usr/share/dbus-1/system-services
 install -m644 dbus/*.service $PKG/usr/share/dbus-1/system-services/
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 67ace3b5a..a10c955ba 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=mesa
 VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 DEMOVERS=${DEMOVERS:-8.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 BUILD_DEMOS=${BUILD_DEMOS:-YES}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -97,7 +97,7 @@ find . \
 #   git format-patch 93c2beafc0a7fa2f210b006d22aba61caa71f773 # 17.2.6 release
 if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
   for patch in $CWD/patches/*.patch ; do
-    patch -p1 < $patch || exit 1 ;
+    patch -p1 --verbose < $patch || exit 1 ;
   done
 fi
 
diff --git a/source/x/mesa/patches/mesa.f93b7d14d66d8ba70d44772d1a1b6696310b7d17.patch b/source/x/mesa/patches/mesa.f93b7d14d66d8ba70d44772d1a1b6696310b7d17.patch
new file mode 100644
index 000000000..bf3483a41
--- /dev/null
+++ b/source/x/mesa/patches/mesa.f93b7d14d66d8ba70d44772d1a1b6696310b7d17.patch
@@ -0,0 +1,48 @@
+From f93b7d14d66d8ba70d44772d1a1b6696310b7d17 Mon Sep 17 00:00:00 2001
+From: Witold Baryluk <witold.baryluk@gmail.com>
+Date: Mon, 7 Dec 2020 20:45:42 +0000
+Subject: [PATCH] vulkan/device_select: Store Vulkan vendorID and deviceID as
+ uint32_t
+
+Vulkan uses 32-bit IDs, compared to PCI/USB 16-bit ones.
+
+Some driver vendorIDs do exceed 0xffff, including MESA (used by lavapipe).
+
+Without this, the value will be truncated, and device select layer
+will not match expected (or any) device.
+
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3935
+Reviewed-by: Dave Airlie <airlied@redhat.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7977>
+---
+ src/vulkan/device-select-layer/device_select.h | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/vulkan/device-select-layer/device_select.h b/src/vulkan/device-select-layer/device_select.h
+index 23350707a33..248878fbc71 100644
+--- a/src/vulkan/device-select-layer/device_select.h
++++ b/src/vulkan/device-select-layer/device_select.h
+@@ -24,10 +24,18 @@
+ #define DEVICE_SELECT_H
+ 
+ #include <stdbool.h>
++#include <stdint.h>
+ #include "xf86drm.h"
+ 
++/* We don't use `drmPciDeviceInfo` because it uses 16-bit ids,
++ * instead of Vulkan's 32-bit ones. */
++struct device_info {
++  uint32_t vendor_id;
++  uint32_t device_id;
++};
++
+ struct device_pci_info {
+-  drmPciDeviceInfo dev_info;
++  struct device_info dev_info;
+   drmPciBusInfo bus_info;
+   bool has_bus_info;
+   bool cpu_device;
+-- 
+GitLab
+
+
diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild
index e7d9c8c89..cfe25a438 100755
--- a/source/xap/blueman/blueman.SlackBuild
+++ b/source/xap/blueman/blueman.SlackBuild
@@ -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:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -123,6 +123,11 @@ 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
 
+# Move the dbus config file to the system directory
+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/
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/source/xap/xgames/spider.gcc10.diff b/source/xap/xgames/spider.gcc10.diff
new file mode 100644
index 000000000..cbde66d64
--- /dev/null
+++ b/source/xap/xgames/spider.gcc10.diff
@@ -0,0 +1,11 @@
+--- ./Makefile.orig	2020-12-24 15:54:29.538553593 -0600
++++ ./Makefile	2020-12-24 15:56:23.320547299 -0600
+@@ -295,7 +295,7 @@
+ 
+       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
+        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -fcommon
+         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+          LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS)
+         LDPOSTLIB =
diff --git a/source/xap/xgames/xgames.SlackBuild b/source/xap/xgames/xgames.SlackBuild
index f688a41ce..6931b8dcd 100755
--- a/source/xap/xgames/xgames.SlackBuild
+++ b/source/xap/xgames/xgames.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xgames
 VERSION=0.3
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -53,10 +53,11 @@ mkdir -p $TMP $PKG
 
 # Build spider:
 cd $TMP
-tar xvf $CWD/spider.tar.gz || exit 1
+tar xvf $CWD/spider.tar.lz || exit 1
 cd spider || exit 1
 zcat $CWD/spider.diff.gz | patch -p1 --verbose || exit 1
 xmkmf
+zcat $CWD/spider.gcc10.diff.gz | patch -p1 --verbose || exit 1
 make $NUMJOBS || make || exit 1
 mkdir -p $PKG/usr/bin
 cat spider > $PKG/usr/bin/spider
@@ -67,7 +68,7 @@ cp -a README* $PKG/usr/doc/xgames-$VERSION/spider
 
 # Build maze:
 cd $TMP
-tar xvf $CWD/maze.tar.gz || exit 1
+tar xvf $CWD/maze.tar.lz || exit 1
 cd maze || exit 1
 zcat $CWD/maze.diff.gz | patch -p1 || exit 1
 xmkmf
@@ -79,7 +80,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/maze
 
 # Build xcolormap:
 cd $TMP
-tar xvf $CWD/xcolormap.tar.gz || exit 1
+tar xvf $CWD/xcolormap.tar.lz || exit 1
 cd xcolormap || exit 1
 zcat $CWD/xcolormap.diff.gz | patch -p1 || exit 1
 make $NUMJOBS || make || exit 1
@@ -89,7 +90,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xcolormap
 
 # Build xcuckoo:
 cd $TMP
-tar xvf $CWD/xcuckoo-1.1.tar.gz || exit 1
+tar xvf $CWD/xcuckoo-1.1.tar.lz || exit 1
 cd xcuckoo || exit 1
 zcat $CWD/xcuckoo.diff.gz | patch -p1 --verbose || exit 1
 xmkmf
@@ -101,7 +102,7 @@ cp -a CHANGES $PKG/usr/doc/xgames-$VERSION/xcuckoo
 
 # Build xlander:
 cd $TMP
-tar xvf $CWD/xlander.tar.gz || exit 1
+tar xvf $CWD/xlander.tar.lz || exit 1
 cd xlander || exit 1
 zcat $CWD/xlander.fixes.diff.gz | patch -p1 || exit 1
 zcat $CWD/xlander-2009-07-18.diff.gz | patch -p1 || exit 1
@@ -114,7 +115,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xlander
 
 # Build xminesweep:
 cd $TMP
-tar xvf $CWD/xminesweep3.0.tar.gz || exit 1
+tar xvf $CWD/xminesweep3.0.tar.lz || exit 1
 cd xminesweep3.0 || exit 1
 xmkmf
 make $NUMJOBS || make || exit 1
@@ -125,7 +126,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xminesweep
 
 # Build xneko:
 cd $TMP
-tar xvf $CWD/xneko.tar.gz || exit 1
+tar xvf $CWD/xneko.tar.lz || exit 1
 cd xneko || exit 1
 xmkmf
 make $NUMJOBS || make || exit 1
@@ -136,7 +137,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xneko
 
 # Build xroach:
 cd $TMP
-tar xvf $CWD/xroach.tar.gz || exit 1
+tar xvf $CWD/xroach.tar.lz || exit 1
 cd xroach || exit 1
 xmkmf
 make $NUMJOBS || make || exit 1
@@ -145,24 +146,13 @@ cat xroach.man | gzip -9c > $PKG/usr/man/man6/xroach.6.gz
 mkdir -p $PKG/usr/doc/xgames-$VERSION/xroach
 cp -a README.linux $PKG/usr/doc/xgames-$VERSION/xroach
 
-# Build xsnow:
-cd $TMP
-tar xvf $CWD/xsnow-1.42.tar.gz || exit 1
-cd xsnow-1.42 || exit 1
-xmkmf
-make $NUMJOBS || make || exit 1
-cat xsnow > $PKG/usr/bin/xsnow
-cat xsnow.man | gzip -9c > $PKG/usr/man/man6/xsnow.6.gz
-mkdir -p $PKG/usr/doc/xgames-$VERSION/xsnow
-cp -a README $PKG/usr/doc/xgames-$VERSION/xsnow
-
 # Fix everything up:
 chmod 755 $PKG/usr/bin/*
 strip $PKG/usr/bin/*
 
 ( cd $PKG/usr/doc
-  find . -type f -exec chown root.root {} \+
-  find . -type f -exec chmod 644 {} \+
+  find . -type f -exec chown root.root {} \;
+  find . -type f -exec chmod 644 {} \;
 )
 
 mkdir -p $PKG/install
@@ -170,4 +160,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/xgames-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch b/source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch
new file mode 100644
index 000000000..8a1a0ab9f
--- /dev/null
+++ b/source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch
@@ -0,0 +1,13 @@
+diff -Nur xscreensaver-5.45.orig/driver/screensaver-properties.desktop.in xscreensaver-5.45/driver/screensaver-properties.desktop.in
+--- xscreensaver-5.45.orig/driver/screensaver-properties.desktop.in	2009-10-06 21:26:41.000000000 -0500
++++ xscreensaver-5.45/driver/screensaver-properties.desktop.in	2020-12-15 20:12:13.223955366 -0600
+@@ -2,7 +2,7 @@
+ Exec=xscreensaver-demo
+ Icon=xscreensaver
+ Terminal=false
+-_Name=Screensaver
+-_Comment=Change screensaver properties
++_Name=XScreenSaver
++_Comment=Change XScreenSaver properties
+ Type=Application
+ Categories=Settings;DesktopSettings;Security;X-XFCE;
diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild
index cb9c10cdb..46fef08e2 100755
--- a/source/xap/xscreensaver/xscreensaver.SlackBuild
+++ b/source/xap/xscreensaver/xscreensaver.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xscreensaver
 VERSION=${VERSION:-$(echo xscreensaver-*.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
@@ -91,6 +91,10 @@ zcat $CWD/xscreensaver.electricsheep.diff.gz | patch -p1 --verbose --backup --su
 # helpful to distributions.
 zcat $CWD/xscreensaver.no.expiration.date.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 
+# Make the description of the xscreensaver settings be clearly for xscreensaver
+# as opposed to a generic "screensaver" settings
+zcat $CWD/clarify-desc-in-xfce-settings.patch.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/xap/xsnow/slack-desc b/source/xap/xsnow/slack-desc
new file mode 100644
index 000000000..9e126a9af
--- /dev/null
+++ b/source/xap/xsnow/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+xsnow: xsnow (let it snow on your desktop)
+xsnow:
+xsnow: XSnow brings snow, trees, reindeer, Santa, and birds to your desktop.
+xsnow:
+xsnow: Homepage: http://ratrabbit.nl/ratrabbit/xsnow/
+xsnow:
+xsnow:
+xsnow:
+xsnow:
+xsnow:
+xsnow:
diff --git a/source/xap/xsnow/xsnow.SlackBuild b/source/xap/xsnow/xsnow.SlackBuild
new file mode 100755
index 000000000..59e6639ee
--- /dev/null
+++ b/source/xap/xsnow/xsnow.SlackBuild
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+# Copyright 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 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=xsnow
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+    *) ARCH=$(uname -m) ;;
+  esac
+  export ARCH
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
+
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \+ -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \+
+
+# Configure, build, and install:
+if [ ! -r configure ]; then
+  if [ -x ./autogen.sh ]; then
+    NOCONFIGURE=1 ./autogen.sh
+  else
+    autoreconf -vif
+  fi
+fi
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --mandir=/usr/man \
+  --with-x \
+  --build=$ARCH-slackware-linux || exit 1
+make $NUMJOBS gamesdir=/usr/bin || make gamesdir=/usr/bin || exit 1
+make install gamesdir=/usr/bin DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# 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
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \+
+for i in $( find $PKG/usr/man -type l ) ; do
+  ln -s $( readlink $i ).gz $i.gz
+  rm $i
+done
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+  AUTHORS* ChangeLog Changes COPYING* NEWS* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xap/xsnow/xsnow.url b/source/xap/xsnow/xsnow.url
new file mode 100644
index 000000000..2f6285fcc
--- /dev/null
+++ b/source/xap/xsnow/xsnow.url
@@ -0,0 +1 @@
+https://sourceforge.net/projects/xsnow/files/
diff --git a/source/xfce/xfce4-screensaver/clarify-desc-in-xfce-settings.patch b/source/xfce/xfce4-screensaver/clarify-desc-in-xfce-settings.patch
new file mode 100644
index 000000000..a411b16c5
--- /dev/null
+++ b/source/xfce/xfce4-screensaver/clarify-desc-in-xfce-settings.patch
@@ -0,0 +1,12 @@
+diff -Nur xfce4-screensaver-0.1.11.orig/data/xfce4-screensaver-preferences.desktop.in xfce4-screensaver-0.1.11/data/xfce4-screensaver-preferences.desktop.in
+--- xfce4-screensaver-0.1.11.orig/data/xfce4-screensaver-preferences.desktop.in	2020-11-07 06:53:45.000000000 -0600
++++ xfce4-screensaver-0.1.11/data/xfce4-screensaver-preferences.desktop.in	2020-12-15 20:16:14.521788731 -0600
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+-_Name=Screensaver
+-_Comment=Set your screensaver preferences
++_Name=xfce4-screensaver
++_Comment=Set your xfce4-screensaver preferences
+ Icon=org.xfce.ScreenSaver
+ Exec=xfce4-screensaver-preferences
+ Terminal=false
diff --git a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
index 22165e39f..80bc42657 100755
--- a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
+++ b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-screensaver
 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
@@ -82,6 +82,9 @@ find . \
 # Revert this one: https://gitlab.xfce.org/apps/xfce4-screensaver/-/issues/66
 zcat $CWD/0001-Catch-gs_listener_dbus_init-failures.patch.gz | patch -p1 -R || exit 1
 
+# Clarify description in Xfce Settings menu
+zcat $CWD/clarify-desc-in-xfce-settings.patch.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -141,7 +144,6 @@ fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/xfce4-session/use-xfss-by-default-in-xfce.patch b/source/xfce/xfce4-session/use-xfss-by-default-in-xfce.patch
new file mode 100644
index 000000000..ce73c10f1
--- /dev/null
+++ b/source/xfce/xfce4-session/use-xfss-by-default-in-xfce.patch
@@ -0,0 +1,12 @@
+diff -Nur xfce4-session-4.14.2.orig/settings/xfce4-session.xml xfce4-session-4.14.2/settings/xfce4-session.xml
+--- xfce4-session-4.14.2.orig/settings/xfce4-session.xml	2019-07-25 17:33:25.000000000 -0500
++++ xfce4-session-4.14.2/settings/xfce4-session.xml	2020-12-15 20:27:10.194758457 -0600
+@@ -3,7 +3,7 @@
+ <channel name="xfce4-session" version="1.0">
+   <property name="general" type="empty">
+     <property name="FailsafeSessionName" type="string" value="Failsafe"/>
+-    <property name="LockCommand" type="string" value=""/>
++    <property name="LockCommand" type="string" value="/usr/bin/xfce4-screensaver-command --lock"/>
+   </property>
+   <property name="sessions" type="empty">
+     <property name="Failsafe" type="empty">
diff --git a/source/xfce/xfce4-session/xfce4-session.SlackBuild b/source/xfce/xfce4-session/xfce4-session.SlackBuild
index 51578b8e4..7a3598f3f 100755
--- a/source/xfce/xfce4-session/xfce4-session.SlackBuild
+++ b/source/xfce/xfce4-session/xfce4-session.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-session
 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:
 MARCH=$( uname -m )
@@ -80,6 +80,8 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+zcat $CWD/use-xfss-by-default-in-xfce.patch.gz | patch -p1 --verbose || exit 1
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -96,6 +98,10 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Don't ship the xscreensaver autostart file:
+rm -f $PKG/etc/xdg/autostart/xscreensaver.desktop
+rmdir --parents $PKG/etc/xdg/autostart/
+
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la