Sun Jul 7 19:32:19 UTC 202420240707193219

d/gdb-15.1-x86_64-1.txz:  Upgraded.
n/openssh-9.8p1-x86_64-3.txz:  Rebuilt.
  As upstream refactors this into smaller binaries, we could easily run into
  another update that causes an sshd lockout if the listener process isn't
  restarted. So, let's try to prevent that. After the package is upgraded,
  we'll use "sshd -t" to make sure that we have a sane configuration, and if
  so then we'll restart the listener process automatically.
  If you don't like this idea, you may turn it off in /etc/default/sshd.
n/wpa_supplicant-2.10-x86_64-5.txz:  Rebuilt.
  Use more normal permissions for the documentation and examples.
  Thanks to Didier Spaier.

5 files changed, 19 insertions, 9 deletions

diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index 04d0ec420..9071d0ddd 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2020, 2023  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2020, 2023, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gdb
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -109,7 +109,7 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 cd ..
 
 mkdir -p $PKG/usr/doc/gdb-$VERSION/gdb
-cp -a COPYING* README $PKG/usr/doc/gdb-$VERSION
+cp -a COPYING* MAINTAINERS* README* SECURITY* $PKG/usr/doc/gdb-$VERSION
 cd gdb
 cp -a NEWS README $PKG/usr/doc/gdb-$VERSION/gdb
 cp -a gdbserver/README $PKG/usr/doc/gdb-$VERSION/README.gdbserver
diff --git a/source/n/openssh/doinst.sh b/source/n/openssh/doinst.sh
index ba1d1cdd3..f24972c6f 100644
--- a/source/n/openssh/doinst.sh
+++ b/source/n/openssh/doinst.sh
@@ -51,3 +51,9 @@ if [ ! -r var/log/btmp ]; then
   ( cd var/log ; umask 077 ; touch btmp )
 fi
 
+# Restart sshd if it is safe to do so:
+. etc/default/sshd
+if [ ! "$SSHD_LISTENER_AUTO_RESTART_ON_UPGRADE" = "no" -a ! -x /usr/lib/setup/setup ]; then
+  chroot . /bin/bash -c "if sshd -t 1> /dev/null 2> /dev/null ; then if [ -x /etc/rc.d/rc.sshd ]; then sh /etc/rc.d/rc.sshd restart 1> /dev/null 2>/dev/null; fi; fi"
+fi
+unset SSHD_OPTS SSHD_LISTENER_AUTO_RESTART_ON_UPGRADE
diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild
index 716721618..d5dd2cea3 100755
--- a/source/n/openssh/openssh.SlackBuild
+++ b/source/n/openssh/openssh.SlackBuild
@@ -30,7 +30,7 @@ PKG=$TMP/package-openssh
 
 PKGNAM=openssh
 VERSION=${VERSION:-$(echo openssh-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -196,11 +196,10 @@ fi
 
   # Copy runtime installation files:
   mkdir -p install
-  zcat $CWD/doinst.sh.gz > install/doinst.sh
+  cat $CWD/doinst.sh > install/doinst.sh
   cat $CWD/slack-desc > install/slack-desc
 )
 
 # Create the package itself:
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/openssh-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/openssh/sshd.default b/source/n/openssh/sshd.default
index 6cab3ba31..8699a97a6 100644
--- a/source/n/openssh/sshd.default
+++ b/source/n/openssh/sshd.default
@@ -8,3 +8,7 @@
 #
 # If you want to use non-standard sshd_config, use:
 #SSHD_OPTS="-f /some/other/sshd_config"
+#
+# If you don't want the sshd listener automatically restarted when the package
+# is upgraded, then uncomment this line:
+#SSHD_LISTENER_AUTO_RESTART_ON_UPGRADE=no
diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
index 6e8071a17..d309b81eb 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:-4}
+BUILD=${BUILD:-5}
 
 SRCVERSION=$(printf $VERSION | tr _ -)
 
@@ -171,8 +171,9 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   ChangeLog ../COPYING README README-{P2P,WPS} examples *.txt *.sample $CWD/README.slackware \
   $PKG/usr/doc/$PKGNAM-$VERSION
-chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION/*
-chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
+
+# Fix python script perms:
+find $PKG/usr/doc/$PKGNAM-$VERSION -name "*.py" -exec chmod 755 "{}" \;
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control: