diff --git a/ChangeLog.rss b/ChangeLog.rss index cf62e12b3..510f194cd 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,28 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Wed, 3 Jul 2024 22:27:28 GMT - Thu, 4 Jul 2024 11:30:42 GMT + Mon, 8 Jul 2024 18:00:35 GMT + Tue, 9 Jul 2024 11:30:25 GMT maintain_current_git.sh v 1.17 + + Mon, 8 Jul 2024 18:00:35 GMT + Mon, 8 Jul 2024 18:00:35 GMT + https://git.slackware.nl/current/tag/?h=20240708180035 + 20240708180035 + + +patches/packages/netatalk-3.2.2-x86_64-1_slack15.0.txz: Upgraded. + This is a bugfix release. +patches/packages/openssh-9.8p1-x86_64-3_slack15.0.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. + ]]> + + Wed, 3 Jul 2024 22:27:28 GMT Wed, 3 Jul 2024 22:27:28 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 105f63d06..6cf27b1b6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,14 @@ +Mon Jul 8 18:00:35 UTC 2024 +patches/packages/netatalk-3.2.2-x86_64-1_slack15.0.txz: Upgraded. + This is a bugfix release. +patches/packages/openssh-9.8p1-x86_64-3_slack15.0.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. ++--------------------------+ Wed Jul 3 22:27:28 UTC 2024 patches/packages/openssh-9.8p1-x86_64-2_slack15.0.txz: Rebuilt. rc.sshd: also shut down sshd-session processes with "stop" function. diff --git a/FILELIST.TXT b/FILELIST.TXT index efbf6978e..29768a319 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Wed Jul 3 22:30:40 UTC 2024 +Mon Jul 8 18:03:34 UTC 2024 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2024-07-03 22:27 . +drwxr-xr-x 12 root root 4096 2024-07-08 18:00 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1246513 2024-07-03 21:23 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-07-03 21:23 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1246513 2024-07-03 22:31 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-07-03 22:31 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 2140116 2024-07-03 22:27 ./ChangeLog.txt +-rw-r--r-- 1 root root 2140771 2024-07-08 18:00 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,7 +25,7 @@ drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1631015 2024-07-03 21:22 ./FILELIST.TXT +-rw-r--r-- 1 root root 1631015 2024-07-03 22:30 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY -rw-r--r-- 1 root root 864745 2022-02-02 08:25 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT @@ -832,13 +832,13 @@ drwxr-xr-x 2 root root 4096 2022-12-17 19:52 ./pasture/source/samba -rw-r--r-- 1 root root 7921 2018-04-29 17:31 ./pasture/source/samba/smb.conf.default -rw-r--r-- 1 root root 7933 2018-01-14 20:41 ./pasture/source/samba/smb.conf.default.orig -rw-r--r-- 1 root root 536 2017-03-23 19:18 ./pasture/source/samba/smb.conf.diff.gz -drwxr-xr-x 4 root root 4096 2024-07-03 22:30 ./patches --rw-r--r-- 1 root root 126696 2024-07-03 22:30 ./patches/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-07-03 22:30 ./patches/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 172511 2024-07-03 22:30 ./patches/FILE_LIST --rw-r--r-- 1 root root 18010030 2024-07-03 22:30 ./patches/MANIFEST.bz2 --rw-r--r-- 1 root root 90203 2024-07-03 22:30 ./patches/PACKAGES.TXT -drwxr-xr-x 7 root root 32768 2024-07-03 22:30 ./patches/packages +drwxr-xr-x 4 root root 4096 2024-07-08 18:03 ./patches +-rw-r--r-- 1 root root 126693 2024-07-08 18:03 ./patches/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-07-08 18:03 ./patches/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 172508 2024-07-08 18:03 ./patches/FILE_LIST +-rw-r--r-- 1 root root 18005170 2024-07-08 18:03 ./patches/MANIFEST.bz2 +-rw-r--r-- 1 root root 90203 2024-07-08 18:03 ./patches/PACKAGES.TXT +drwxr-xr-x 7 root root 32768 2024-07-08 18:03 ./patches/packages -rw-r--r-- 1 root root 360 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 2389564 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txz.asc @@ -1053,9 +1053,9 @@ drwxr-xr-x 2 root root 4096 2024-06-16 21:36 ./patches/packages/linux-5.1 -rw-r--r-- 1 root root 451 2022-07-21 17:53 ./patches/packages/net-snmp-5.9.3-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 1598024 2022-07-21 17:53 ./patches/packages/net-snmp-5.9.3-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-07-21 17:53 ./patches/packages/net-snmp-5.9.3-x86_64-1_slack15.0.txz.asc --rw-r--r-- 1 root root 580 2024-07-03 18:16 ./patches/packages/netatalk-3.2.1-x86_64-1_slack15.0.txt --rw-r--r-- 1 root root 483064 2024-07-03 18:16 ./patches/packages/netatalk-3.2.1-x86_64-1_slack15.0.txz --rw-r--r-- 1 root root 195 2024-07-03 18:16 ./patches/packages/netatalk-3.2.1-x86_64-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 580 2024-07-08 17:38 ./patches/packages/netatalk-3.2.2-x86_64-1_slack15.0.txt +-rw-r--r-- 1 root root 483188 2024-07-08 17:38 ./patches/packages/netatalk-3.2.2-x86_64-1_slack15.0.txz +-rw-r--r-- 1 root root 195 2024-07-08 17:38 ./patches/packages/netatalk-3.2.2-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 582 2023-06-26 18:57 ./patches/packages/network-scripts-15.0-noarch-19_slack15.0.txt -rw-r--r-- 1 root root 40028 2023-06-26 18:57 ./patches/packages/network-scripts-15.0-noarch-19_slack15.0.txz -rw-r--r-- 1 root root 163 2023-06-26 18:57 ./patches/packages/network-scripts-15.0-noarch-19_slack15.0.txz.asc @@ -1135,9 +1135,9 @@ drwxr-xr-x 2 root root 4096 2024-06-08 19:45 ./patches/packages/old-linux -rw-r--r-- 1 root root 226 2024-02-29 18:12 ./patches/packages/openjpeg-2.5.2-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 285780 2024-02-29 18:12 ./patches/packages/openjpeg-2.5.2-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2024-02-29 18:12 ./patches/packages/openjpeg-2.5.2-x86_64-1_slack15.0.txz.asc --rw-r--r-- 1 root root 672 2024-07-03 22:19 ./patches/packages/openssh-9.8p1-x86_64-2_slack15.0.txt --rw-r--r-- 1 root root 1101652 2024-07-03 22:19 ./patches/packages/openssh-9.8p1-x86_64-2_slack15.0.txz --rw-r--r-- 1 root root 195 2024-07-03 22:19 ./patches/packages/openssh-9.8p1-x86_64-2_slack15.0.txz.asc +-rw-r--r-- 1 root root 672 2024-07-08 17:59 ./patches/packages/openssh-9.8p1-x86_64-3_slack15.0.txt +-rw-r--r-- 1 root root 1102444 2024-07-08 17:59 ./patches/packages/openssh-9.8p1-x86_64-3_slack15.0.txz +-rw-r--r-- 1 root root 195 2024-07-08 17:59 ./patches/packages/openssh-9.8p1-x86_64-3_slack15.0.txz.asc -rw-r--r-- 1 root root 559 2023-09-11 20:06 ./patches/packages/openssl-1.1.1w-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 3600432 2023-09-11 20:06 ./patches/packages/openssl-1.1.1w-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-09-11 20:06 ./patches/packages/openssl-1.1.1w-x86_64-1_slack15.0.txz.asc @@ -1279,7 +1279,7 @@ drwxr-xr-x 2 root root 4096 2024-06-08 19:45 ./patches/packages/old-linux -rw-r--r-- 1 root root 463 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 459652 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txz.asc -drwxr-xr-x 119 root root 4096 2024-07-03 22:27 ./patches/source +drwxr-xr-x 119 root root 4096 2024-07-08 17:59 ./patches/source drwxr-xr-x 2 root root 4096 2023-09-26 19:22 ./patches/source/Cython -rw-r--r-- 1 root root 1623580 2023-07-04 19:24 ./patches/source/Cython/Cython-0.29.36.tar.lz -rwxr-xr-x 1 root root 3041 2023-09-26 19:23 ./patches/source/Cython/Cython.SlackBuild @@ -1899,9 +1899,9 @@ drwxr-xr-x 2 root root 4096 2022-07-21 17:44 ./patches/source/net-snmp -rw-r--r-- 1 root root 907 2018-02-27 06:13 ./patches/source/net-snmp/slack-desc -rw-r--r-- 1 root root 4909 2007-04-16 18:39 ./patches/source/net-snmp/snmpd.conf.gz -rw-r--r-- 1 root root 77 2021-12-21 18:36 ./patches/source/net-snmp/snmpd.default -drwxr-xr-x 2 root root 4096 2024-07-03 18:08 ./patches/source/netatalk +drwxr-xr-x 2 root root 4096 2024-07-08 17:36 ./patches/source/netatalk -rw-r--r-- 1 root root 377 2020-02-07 01:00 ./patches/source/netatalk/doinst.sh.gz --rw-r--r-- 1 root root 1919812 2024-06-29 06:28 ./patches/source/netatalk/netatalk-3.2.1.tar.xz +-rw-r--r-- 1 root root 1906644 2024-07-06 04:43 ./patches/source/netatalk/netatalk-3.2.2.tar.xz -rwxr-xr-x 1 root root 4955 2024-07-03 18:16 ./patches/source/netatalk/netatalk.SlackBuild -rw-r--r-- 1 root root 63 2023-01-13 19:51 ./patches/source/netatalk/netatalk.url -rw-r--r-- 1 root root 1009 2018-09-05 21:12 ./patches/source/netatalk/rc.atalk.new @@ -2076,16 +2076,16 @@ drwxr-xr-x 2 root root 4096 2024-02-29 18:11 ./patches/source/openjpeg -rwxr-xr-x 1 root root 4283 2024-02-26 19:24 ./patches/source/openjpeg/openjpeg.SlackBuild -rw-r--r-- 1 root root 387 2017-10-04 19:22 ./patches/source/openjpeg/openjpeg2_remove-thirdparty.patch.gz -rw-r--r-- 1 root root 682 2018-02-27 06:12 ./patches/source/openjpeg/slack-desc -drwxr-xr-x 2 root root 4096 2024-07-01 18:17 ./patches/source/openssh --rw-r--r-- 1 root root 593 2020-02-07 03:05 ./patches/source/openssh/doinst.sh.gz +drwxr-xr-x 2 root root 4096 2024-07-07 17:30 ./patches/source/openssh +-rw-r--r-- 1 root root 1697 2024-07-07 18:17 ./patches/source/openssh/doinst.sh -rw-r--r-- 1 root root 1910393 2024-07-01 07:34 ./patches/source/openssh/openssh-9.8p1.tar.gz -rw-r--r-- 1 root root 833 2024-07-01 07:34 ./patches/source/openssh/openssh-9.8p1.tar.gz.asc --rwxr-xr-x 1 root root 6300 2024-07-03 22:18 ./patches/source/openssh/openssh.SlackBuild +-rwxr-xr-x 1 root root 6295 2024-07-08 17:53 ./patches/source/openssh/openssh.SlackBuild -rw-r--r-- 1 root root 1682 2024-07-01 18:12 ./patches/source/openssh/openssh.tcp_wrappers.diff.gz -rw-r--r-- 1 root root 54 2020-02-14 19:40 ./patches/source/openssh/openssh.url -rw-r--r-- 1 root root 1865 2024-07-03 22:17 ./patches/source/openssh/rc.sshd -rw-r--r-- 1 root root 1127 2018-02-27 06:13 ./patches/source/openssh/slack-desc --rw-r--r-- 1 root root 318 2017-07-18 18:45 ./patches/source/openssh/sshd.default +-rw-r--r-- 1 root root 482 2024-07-07 17:43 ./patches/source/openssh/sshd.default -rw-r--r-- 1 root root 1228 2021-09-29 19:00 ./patches/source/openssh/sshd.pam -rw-r--r-- 1 root root 271 2021-08-21 03:23 ./patches/source/openssh/sshd_config-pam.diff.gz drwxr-xr-x 2 root root 4096 2023-09-11 19:59 ./patches/source/openssl diff --git a/patches/packages/netatalk-3.2.1-x86_64-1_slack15.0.txt b/patches/packages/netatalk-3.2.2-x86_64-1_slack15.0.txt similarity index 100% rename from patches/packages/netatalk-3.2.1-x86_64-1_slack15.0.txt rename to patches/packages/netatalk-3.2.2-x86_64-1_slack15.0.txt diff --git a/patches/packages/openssh-9.8p1-x86_64-2_slack15.0.txt b/patches/packages/openssh-9.8p1-x86_64-3_slack15.0.txt similarity index 100% rename from patches/packages/openssh-9.8p1-x86_64-2_slack15.0.txt rename to patches/packages/openssh-9.8p1-x86_64-3_slack15.0.txt diff --git a/patches/source/openssh/doinst.sh b/patches/source/openssh/doinst.sh index ba1d1cdd3..f24972c6f 100644 --- a/patches/source/openssh/doinst.sh +++ b/patches/source/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/patches/source/openssh/openssh.SlackBuild b/patches/source/openssh/openssh.SlackBuild index 68b0d5ef7..937910882 100755 --- a/patches/source/openssh/openssh.SlackBuild +++ b/patches/source/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_slack15.0} +BUILD=${BUILD:-3_slack15.0} 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/patches/source/openssh/sshd.default b/patches/source/openssh/sshd.default index 6cab3ba31..8699a97a6 100644 --- a/patches/source/openssh/sshd.default +++ b/patches/source/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/recompress.sh b/recompress.sh index 2791528e8..6374ab320 100755 --- a/recompress.sh +++ b/recompress.sh @@ -1428,7 +1428,6 @@ gzip ./patches/source/ntp/doinst.sh gzip ./patches/source/ntp/ntpdate.8 gzip ./patches/source/openssh/openssh.tcp_wrappers.diff gzip ./patches/source/openssh/sshd_config-pam.diff -gzip ./patches/source/openssh/doinst.sh gzip ./patches/source/old-linux-5.15.160/patches-5.15.160/amdgpu-revert-56b522f4668167096a50c39446d6263c96219f5f.patch gzip ./patches/source/bind/doinst.sh gzip ./patches/source/pidgin/fix-gmain_h-compile-error.diff