From 62755e6ce193362360de379e16c8a3cc82d9abbb Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 21 Apr 2024 21:41:34 +0000
Subject: Sun Apr 21 21:41:34 UTC 2024

a/etc-15.1-x86_64-11.txz:  Rebuilt.
  Populate missing /etc/gshadow entries. Thanks to opty.
l/PyQt-builder-1.16.1-x86_64-1.txz:  Upgraded.
l/python-pluggy-1.5.0-x86_64-1.txz:  Upgraded.
---
 source/a/etc/doinst.sh      | 9 +++++++++
 source/a/etc/etc.SlackBuild | 3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'source/a')

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 70455db93..f958d7628 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:-10}
+BUILD=${BUILD:-11}
 
 # 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
-
-- 
cgit v1.2.3-80-g2a13