10 files changed, 11 insertions, 59 deletions
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index 1b23163e..44a33253 100755
--- a/source/a/etc/etc.SlackBuild
+++ b/source/a/etc/etc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=etc
 VERSION=15.0
-BUILD=${BUILD:-15}
+BUILD=${BUILD:-16}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/etc/group.new b/source/a/etc/group.new
index 6d1d825e..414f4855 100644
--- a/source/a/etc/group.new
+++ b/source/a/etc/group.new
@@ -35,6 +35,7 @@ ftp:x:50:
 oprofile:x:51:
 sddm:x:64:
 pulse:x:65:
+dhcpcd:x:68:
 input:x:71:
 apache:x:80:
 messagebus:x:81:
diff --git a/source/a/etc/passwd.new b/source/a/etc/passwd.new
index 9b6dd226..e2e187ff 100644
--- a/source/a/etc/passwd.new
+++ b/source/a/etc/passwd.new
@@ -23,6 +23,7 @@ oprofile:x:51:51:oprofile:/:/bin/false
 usbmux:x:52:83:User for usbmux daemon:/var/empty:/bin/false
 sddm:x:64:64:User for SDDM:/var/lib/sddm:/bin/false
 pulse:x:65:65:User for PulseAudio:/var/run/pulse:/bin/false
+dhcpcd:x:68:68:User for dhcpcd:/var/lib/dhcpcd:/bin/false
 apache:x:80:80:User for Apache:/srv/httpd:/bin/false
 messagebus:x:81:81:User for D-BUS:/var/run/dbus:/bin/false
 haldaemon:x:82:82:User for HAL:/var/run/hald:/bin/false
diff --git a/source/a/etc/shadow.new b/source/a/etc/shadow.new
index 0b008c5d..1f3d8a5c 100644
--- a/source/a/etc/shadow.new
+++ b/source/a/etc/shadow.new
@@ -23,6 +23,7 @@ oprofile:*:9797:0:::::
 usbmux:*:9797:0:::::
 sddm:*:9797:0:::::
 pulse:*:9797:0:::::
+dhcpcd:*:9797:0:::::
 apache:*:9797:0:::::
 messagebus:*:9797:0:::::
 haldaemon:*:9797:0:::::
diff --git a/source/a/ntfs-3g/10-ntfs-3g-policy.fdi b/source/a/ntfs-3g/10-ntfs-3g-policy.fdi
deleted file mode 100644
index 8b837d10..00000000
--- a/source/a/ntfs-3g/10-ntfs-3g-policy.fdi
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Theoretically, this file should ship with ntfs-3g -->
-
-<deviceinfo version="0.2">
-  <device>
-    <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
-      <match key="volume.fstype" string="ntfs">
-
-        <!-- "Register" ntfs-3g as a valid alternative handler -->
-  	<append key="volume.fstype.alternative" type="strlist">ntfs-3g</append>
-
-        <!-- "Register" ntfs-3g as the preferred alternative handler -->
-  	<merge key="volume.fstype.alternative.preferred" type="string">ntfs-3g</merge>
-
-        <!-- Set valid mount options -->
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">ro</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">sync</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">dirsync</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">noatime</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">nodiratime</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">noexec</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">quiet</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">remount</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">exec</append>
-	<append key="volume.mount.ntfs-3g.valid_options" type="strlist">locale=</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">uid=</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">gid=</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">umask=</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">dmask=</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">fmask=</append>
-        <append key="volume.mount.ntfs-3g.valid_options" type="strlist">utf8</append>
-
-      </match>
-    </match>
-  </device>
-</deviceinfo>
-
diff --git a/source/a/ntfs-3g/99-ntfs-3g.rules b/source/a/ntfs-3g/99-ntfs-3g.rules
deleted file mode 100644
index c27c3cbb..00000000
--- a/source/a/ntfs-3g/99-ntfs-3g.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-# Use ntfs-3g rather than regular ntfs for devices detected through udev:
-ENV{ID_FS_TYPE}=="ntfs", ENV{ID_FS_TYPE}="ntfs-3g"
diff --git a/source/a/ntfs-3g/ntfs-3g.SlackBuild b/source/a/ntfs-3g/ntfs-3g.SlackBuild
index b855a275..eccbb903 100755
--- a/source/a/ntfs-3g/ntfs-3g.SlackBuild
+++ b/source/a/ntfs-3g/ntfs-3g.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for ntfs-3g
 
 # Copyright 2008  Antonio Hernandez Blas <hba.nihilismus@gmail.com>
-# Copyright 2012, 2013, 2015, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2012, 2013, 2015, 2016, 2018, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,8 +30,8 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ntfs-3g
 SRCNAM=ntfs-3g_ntfsprogs
-VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -74,7 +74,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP || exit 1
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
 cd $SRCNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -113,23 +113,12 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 # any better ideas, I'd like to hear them.
 chmod 4711 $PKG/bin/ntfs-3g
 
-## Add the HAL fdi file so that automount uses ntfs-3g for mounting
-## This should work with the "volume.fstype.alternative.*" in hal-0.5.12+
-#mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor
-#cat $CWD/10-ntfs-3g-policy.fdi \
-#  > $PKG/usr/share/hal/fdi/policy/10osvendor/10-ntfs-3g-policy.fdi
-
 # Create a mount.ntfs -> mount.ntfs-3g symlink.
 # This causes ntfs-3g to always be used when mounting NTFS filesystems.
 # NOTE:  This also seems to make mounting with the old ntfs filesystem
 # impossible.  But does anyone care?
 ( cd $PKG/sbin ; ln -s mount.ntfs-3g mount.ntfs )
 
-## Add a udev rule to use ntfs-3g instead of ntfs:
-## (This is not needed if the mount.ntfs symlink is made)
-#mkdir -p $PKG/lib/udev/rules.d
-#cat $CWD/99-ntfs-3g.rules > $PKG/lib/udev/rules.d/99-ntfs-3g.rules
-
 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/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace
index 0cfbf088..d00491fd 100644
--- a/source/kde/kde/build/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
@@ -1 +1 @@
-2
+1
diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild
index 073f8b9c..88edaa90 100755
--- a/source/l/mozilla-nss/mozilla-nss.SlackBuild
+++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mozilla-nss
 SRCNAM=nss
-VERSION=${VERSION:-3.69}
+VERSION=${VERSION:-3.69.1}
 NSPR=${NSPR:-4.32}
 BUILD=${BUILD:-1}
 
diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild
index 55fe47a4..25322d6c 100755
--- a/source/xap/xlockmore/xlockmore.SlackBuild
+++ b/source/xap/xlockmore/xlockmore.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xlockmore
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then