6 files changed, 14 insertions, 12 deletions
diff --git a/source/a/etc/_etc/etc/profile.new b/source/a/etc/_etc/etc/profile.new
index 9cfc74aa0..73a6c9993 100644
--- a/source/a/etc/_etc/etc/profile.new
+++ b/source/a/etc/_etc/etc/profile.new
@@ -4,15 +4,6 @@
 # Set the values for some environment variables:
 export MINICOM="-c on"
 export HOSTNAME="`cat /etc/HOSTNAME`"
-export LESSOPEN="|lesspipe.sh %s"
-# Setting a default $LESS was something inherited from SLS many years ago,
-# but apparently the previous setting of "-M" causes display issues with
-# some programs (i.e. git log). Adding "-R" as well fixes this, but some
-# folks have concerns about the security of this option (I think it's
-# actually "-r" that's the dangerous one). Anyway, it might be best to just
-# leave this unset by default. Uncomment it if you like, or set up your
-# own definition or aliases on a per-account basis.
-#export LESS="-M -R"
 
 # If the user doesn't have a .inputrc, use the one in /etc.
 if [ ! -r "$HOME/.inputrc" ]; then
@@ -63,7 +54,7 @@ else
  PS1='\u@\h:\w\$ '
 fi
 PS2='> '
-export PATH DISPLAY LESS TERM PS1 PS2
+export PATH DISPLAY TERM PS1 PS2
 
 # Default umask.  A umask of 022 prevents new files from being created group
 # and world writable.
diff --git a/source/a/etc/doinst.sh b/source/a/etc/doinst.sh
index 18b53f333..3734bc854 100644
--- a/source/a/etc/doinst.sh
+++ b/source/a/etc/doinst.sh
@@ -100,6 +100,15 @@ rm -f etc/gshadow.new
 rm -f etc/passwd.new
 rm -f etc/shadow.new
 
+# We will add any missing entries to gshadow, but make no attempt to repair existing ones:
+cat etc/group | while read line ; do
+  GRP="$(echo $line | cut -f 1 -d :)"
+  GMEMBERS="$(echo $line | rev | cut -f 1 -d : | rev)"
+  if ! grep -q "^${GRP}:" etc/gshadow ; then
+    echo "${GRP}:x::${GMEMBERS}" >> etc/gshadow
+  fi
+done
+
 # Make sure $HOME is correct for user sddm:
 chroot . /usr/sbin/usermod -d /var/lib/sddm sddm > /dev/null 2> /dev/null
 # Make sure that sddm is a member of group video:
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index 4dc6e0d59..82526efd0 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.1
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-12}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -80,4 +80,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 # Build the package:
 cd $PKG
 /sbin/makepkg -l y -c n  $TMP/etc-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/a/etc/group.new b/source/a/etc/group.new
index d4a516c68..2bcaf4ea9 100644
--- a/source/a/etc/group.new
+++ b/source/a/etc/group.new
@@ -59,6 +59,7 @@ nogroup:x:99:
 users:x:100:
 console:x:101:
 avahi:x:214:
+nut:x:218:
 colord:x:303:
 nm-openvpn:x:320:
 ldap:x:330:
diff --git a/source/a/etc/passwd.new b/source/a/etc/passwd.new
index e926f2f4a..f7e8e0e26 100644
--- a/source/a/etc/passwd.new
+++ b/source/a/etc/passwd.new
@@ -37,6 +37,7 @@ dovenull:x:95:95:User for Dovecot login processing:/dev/null:/bin/false
 proftpd:x:97:97:User for ProFTPD:/:/bin/false
 nobody:x:99:99:nobody:/:/bin/false
 avahi:x:214:214:User for avahi:/dev/null:/bin/false
+nut:x:218:218:User for NUT:/dev/null:/bin/false
 colord:x:303:303:User for colord:/var/lib/colord:/bin/false
 nm-openvpn:x:320:320:User for NetworkManager-openvpn:/var/lib/openvpn/chroot:/bin/false
 ldap:x:330:330:OpenLDAP server:/var/lib/openldap:/bin/false
diff --git a/source/a/etc/shadow.new b/source/a/etc/shadow.new
index f2acecf78..3cbc04070 100644
--- a/source/a/etc/shadow.new
+++ b/source/a/etc/shadow.new
@@ -37,6 +37,7 @@ dovenull:*:9797:0:::::
 proftpd:*:9797:0:::::
 nobody:*:9797:0:::::
 avahi:*:9797:0:::::
+nut:*:9797:0:::::
 colord:*:9797:0:::::
 nm-openvpn:*:9797:0:::::
 ldap:*:9797:0:::::