diff --git a/ChangeLog.rss b/ChangeLog.rss index e6c95e544..cf62e12b3 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,62 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Tue, 2 Jul 2024 19:31:00 GMT - Wed, 3 Jul 2024 11:30:36 GMT + Wed, 3 Jul 2024 22:27:28 GMT + Thu, 4 Jul 2024 11:30:42 GMT maintain_current_git.sh v 1.17 + + Wed, 3 Jul 2024 22:27:28 GMT + Wed, 3 Jul 2024 22:27:28 GMT + https://git.slackware.nl/current/tag/?h=20240703222728 + 20240703222728 + + +patches/packages/openssh-9.8p1-x86_64-2_slack15.0.txz: Rebuilt. + rc.sshd: also shut down sshd-session processes with "stop" function. + This shuts down connections cleanly instead of them having to time out. + Thanks to Petri Kaukasoina. + ]]> + + + + Wed, 3 Jul 2024 21:19:57 GMT + Wed, 3 Jul 2024 21:19:57 GMT + https://git.slackware.nl/current/tag/?h=20240703211957 + 20240703211957 + + +patches/packages/httpd-2.4.61-x86_64-1_slack15.0.txz: Upgraded. + This update contains the fix for the 2.4.60 regression, which has also + been assigned a CVE. We fixed this already, but we'll make it official. + For more information, see: + https://downloads.apache.org/httpd/CHANGES_2.4 + https://www.cve.org/CVERecord?id=CVE-2024-39884 + (* Security fix *) + ]]> + + + + Wed, 3 Jul 2024 18:48:48 GMT + Wed, 3 Jul 2024 18:48:48 GMT + https://git.slackware.nl/current/tag/?h=20240703184848 + 20240703184848 + + +patches/packages/ca-certificates-20240703-noarch-1_slack15.0.txz: Upgraded. + This update provides the latest CA certificates to check for the + authenticity of SSL connections. +patches/packages/netatalk-3.2.1-x86_64-1_slack15.0.txz: Upgraded. + Shared library .so-version bump. + Fixed security issues that could lead to a denial of service or the + execution of arbitrary code. + For more information, see: + https://www.cve.org/CVERecord?id=CVE-2024-38439 + https://www.cve.org/CVERecord?id=CVE-2024-38440 + https://www.cve.org/CVERecord?id=CVE-2024-38441 + (* Security fix *) + ]]> + + Tue, 2 Jul 2024 19:31:00 GMT Tue, 2 Jul 2024 19:31:00 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 545bae66f..105f63d06 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,32 @@ +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. + This shuts down connections cleanly instead of them having to time out. + Thanks to Petri Kaukasoina. ++--------------------------+ +Wed Jul 3 21:19:57 UTC 2024 +patches/packages/httpd-2.4.61-x86_64-1_slack15.0.txz: Upgraded. + This update contains the fix for the 2.4.60 regression, which has also + been assigned a CVE. We fixed this already, but we'll make it official. + For more information, see: + https://downloads.apache.org/httpd/CHANGES_2.4 + https://www.cve.org/CVERecord?id=CVE-2024-39884 + (* Security fix *) ++--------------------------+ +Wed Jul 3 18:48:48 UTC 2024 +patches/packages/ca-certificates-20240703-noarch-1_slack15.0.txz: Upgraded. + This update provides the latest CA certificates to check for the + authenticity of SSL connections. +patches/packages/netatalk-3.2.1-x86_64-1_slack15.0.txz: Upgraded. + Shared library .so-version bump. + Fixed security issues that could lead to a denial of service or the + execution of arbitrary code. + For more information, see: + https://www.cve.org/CVERecord?id=CVE-2024-38439 + https://www.cve.org/CVERecord?id=CVE-2024-38440 + https://www.cve.org/CVERecord?id=CVE-2024-38441 + (* Security fix *) ++--------------------------+ Tue Jul 2 19:31:00 UTC 2024 patches/packages/httpd-2.4.60-x86_64-2_slack15.0.txz: Rebuilt. This update is to fix a regression and to note security issues that were not diff --git a/FILELIST.TXT b/FILELIST.TXT index 26fb78efa..efbf6978e 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Tue Jul 2 19:34:09 UTC 2024 +Wed Jul 3 22:30:40 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-02 19:31 . +drwxr-xr-x 12 root root 4096 2024-07-03 22:27 . -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 1246517 2024-07-01 20:16 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-07-01 20:16 ./CHECKSUMS.md5.asc +-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 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 2138749 2024-07-02 19:31 ./ChangeLog.txt +-rw-r--r-- 1 root root 2140116 2024-07-03 22:27 ./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 1631019 2024-07-01 20:15 ./FILELIST.TXT +-rw-r--r-- 1 root root 1631015 2024-07-03 21:22 ./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-02 19:34 ./patches --rw-r--r-- 1 root root 126796 2024-07-02 19:34 ./patches/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-07-02 19:34 ./patches/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 172629 2024-07-02 19:34 ./patches/FILE_LIST --rw-r--r-- 1 root root 17999908 2024-07-02 19:34 ./patches/MANIFEST.bz2 --rw-r--r-- 1 root root 90204 2024-07-02 19:34 ./patches/PACKAGES.TXT -drwxr-xr-x 7 root root 32768 2024-07-02 19:33 ./patches/packages +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 -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 @@ -872,9 +872,9 @@ drwxr-xr-x 7 root root 32768 2024-07-02 19:33 ./patches/packages -rw-r--r-- 1 root root 484 2023-05-22 17:48 ./patches/packages/c-ares-1.19.1-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 139872 2023-05-22 17:48 ./patches/packages/c-ares-1.19.1-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-05-22 17:48 ./patches/packages/c-ares-1.19.1-x86_64-1_slack15.0.txz.asc --rw-r--r-- 1 root root 367 2024-06-15 16:58 ./patches/packages/ca-certificates-20240615-noarch-1_slack15.0.txt --rw-r--r-- 1 root root 139296 2024-06-15 16:58 ./patches/packages/ca-certificates-20240615-noarch-1_slack15.0.txz --rw-r--r-- 1 root root 195 2024-06-15 16:58 ./patches/packages/ca-certificates-20240615-noarch-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 367 2024-07-03 17:17 ./patches/packages/ca-certificates-20240703-noarch-1_slack15.0.txt +-rw-r--r-- 1 root root 139328 2024-07-03 17:17 ./patches/packages/ca-certificates-20240703-noarch-1_slack15.0.txz +-rw-r--r-- 1 root root 195 2024-07-03 17:17 ./patches/packages/ca-certificates-20240703-noarch-1_slack15.0.txz.asc -rw-r--r-- 1 root root 523 2024-03-29 02:24 ./patches/packages/coreutils-9.5-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 2796940 2024-03-29 02:24 ./patches/packages/coreutils-9.5-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 195 2024-03-29 02:24 ./patches/packages/coreutils-9.5-x86_64-1_slack15.0.txz.asc @@ -950,9 +950,9 @@ drwxr-xr-x 7 root root 32768 2024-07-02 19:33 ./patches/packages -rw-r--r-- 1 root root 314 2022-04-14 21:04 ./patches/packages/gzip-1.12-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 111208 2022-04-14 21:04 ./patches/packages/gzip-1.12-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-04-14 21:04 ./patches/packages/gzip-1.12-x86_64-1_slack15.0.txz.asc --rw-r--r-- 1 root root 513 2024-07-02 18:46 ./patches/packages/httpd-2.4.60-x86_64-2_slack15.0.txt --rw-r--r-- 1 root root 3917272 2024-07-02 18:46 ./patches/packages/httpd-2.4.60-x86_64-2_slack15.0.txz --rw-r--r-- 1 root root 195 2024-07-02 18:46 ./patches/packages/httpd-2.4.60-x86_64-2_slack15.0.txz.asc +-rw-r--r-- 1 root root 513 2024-07-03 21:06 ./patches/packages/httpd-2.4.61-x86_64-1_slack15.0.txt +-rw-r--r-- 1 root root 3916088 2024-07-03 21:06 ./patches/packages/httpd-2.4.61-x86_64-1_slack15.0.txz +-rw-r--r-- 1 root root 195 2024-07-03 21:06 ./patches/packages/httpd-2.4.61-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 513 2022-08-23 03:07 ./patches/packages/hunspell-1.7.1-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 312136 2022-08-23 03:07 ./patches/packages/hunspell-1.7.1-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-08-23 03:07 ./patches/packages/hunspell-1.7.1-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 2023-10-06 19:39 ./patches/packages/netatalk-3.1.18-x86_64-1_slack15.0.txt --rw-r--r-- 1 root root 507500 2023-10-06 19:39 ./patches/packages/netatalk-3.1.18-x86_64-1_slack15.0.txz --rw-r--r-- 1 root root 163 2023-10-06 19:39 ./patches/packages/netatalk-3.1.18-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 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-01 19:12 ./patches/packages/openssh-9.8p1-x86_64-1_slack15.0.txt --rw-r--r-- 1 root root 1101028 2024-07-01 19:12 ./patches/packages/openssh-9.8p1-x86_64-1_slack15.0.txz --rw-r--r-- 1 root root 195 2024-07-01 19:12 ./patches/packages/openssh-9.8p1-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 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-02 19:00 ./patches/source +drwxr-xr-x 119 root root 4096 2024-07-03 22:27 ./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 @@ -1358,10 +1358,10 @@ drwxr-xr-x 2 root root 4096 2023-05-22 17:44 ./patches/source/c-ares -rw-r--r-- 1 root root 850658 2023-05-22 12:25 ./patches/source/c-ares/c-ares-1.19.1.tar.lz -rwxr-xr-x 1 root root 4427 2023-05-22 17:48 ./patches/source/c-ares/c-ares.SlackBuild -rw-r--r-- 1 root root 970 2021-04-09 19:13 ./patches/source/c-ares/slack-desc -drwxr-xr-x 2 root root 4096 2024-06-15 16:57 ./patches/source/ca-certificates +drwxr-xr-x 2 root root 4096 2024-07-03 17:16 ./patches/source/ca-certificates -rwxr-xr-x 1 root root 3671 2023-01-10 21:37 ./patches/source/ca-certificates/ca-certificates.SlackBuild -rw-r--r-- 1 root root 14672 2018-12-11 03:14 ./patches/source/ca-certificates/ca-certificates.tar.lz --rw-r--r-- 1 root root 227192 2024-06-15 16:54 ./patches/source/ca-certificates/certdata-20240615.txt.xz +-rw-r--r-- 1 root root 227212 2024-07-03 17:14 ./patches/source/ca-certificates/certdata-20240703.txt.xz -rw-r--r-- 1 root root 596 2023-01-10 21:19 ./patches/source/ca-certificates/doinst.sh.gz -rw-r--r-- 1 root root 374 2015-09-14 21:52 ./patches/source/ca-certificates/fixup_update-ca-certificates.diff.gz -rwxr-xr-x 1 root root 1626 2018-12-11 03:25 ./patches/source/ca-certificates/get-certdata.txt.sh @@ -1569,14 +1569,13 @@ drwxr-xr-x 2 root root 4096 2022-04-07 21:51 ./patches/source/gzip -rw-r--r-- 1 root root 833 2022-04-07 17:00 ./patches/source/gzip/gzip-1.12.tar.xz.sig -rwxr-xr-x 1 root root 5170 2022-04-14 20:41 ./patches/source/gzip/gzip.SlackBuild -rw-r--r-- 1 root root 766 2018-02-27 06:13 ./patches/source/gzip/slack-desc -drwxr-xr-x 2 root root 4096 2024-07-02 18:34 ./patches/source/httpd +drwxr-xr-x 2 root root 4096 2024-07-03 21:05 ./patches/source/httpd -rw-r--r-- 1 root root 931 2018-09-24 18:58 ./patches/source/httpd/doinst.sh.gz --rw-r--r-- 1 root root 12834 2024-07-02 18:34 ./patches/source/httpd/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch --rw-r--r-- 1 root root 7508704 2024-07-01 11:27 ./patches/source/httpd/httpd-2.4.60.tar.bz2 --rw-r--r-- 1 root root 833 2024-07-01 11:27 ./patches/source/httpd/httpd-2.4.60.tar.bz2.asc --rwxr-xr-x 1 root root 9235 2024-07-02 18:38 ./patches/source/httpd/httpd.SlackBuild +-rw-r--r-- 1 root root 7512908 2024-07-03 13:45 ./patches/source/httpd/httpd-2.4.61.tar.bz2 +-rw-r--r-- 1 root root 833 2024-07-03 13:45 ./patches/source/httpd/httpd-2.4.61.tar.bz2.asc +-rwxr-xr-x 1 root root 9121 2024-07-03 21:05 ./patches/source/httpd/httpd.SlackBuild -rw-r--r-- 1 root root 260 2012-04-13 02:17 ./patches/source/httpd/httpd.runasapache.diff.gz --rw-r--r-- 1 root root 112 2024-07-01 18:48 ./patches/source/httpd/httpd.url +-rw-r--r-- 1 root root 112 2024-07-03 21:02 ./patches/source/httpd/httpd.url -rw-r--r-- 1 root root 171 2021-05-23 19:15 ./patches/source/httpd/logrotate.httpd -rw-r--r-- 1 root root 1001 2023-08-16 16:41 ./patches/source/httpd/rc.httpd -rw-r--r-- 1 root root 966 2018-02-27 06:13 ./patches/source/httpd/slack-desc @@ -1900,10 +1899,10 @@ 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 2023-10-06 19:37 ./patches/source/netatalk +drwxr-xr-x 2 root root 4096 2024-07-03 18:08 ./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 974852 2023-10-05 12:20 ./patches/source/netatalk/netatalk-3.1.18.tar.xz --rwxr-xr-x 1 root root 4913 2023-01-13 20:02 ./patches/source/netatalk/netatalk.SlackBuild +-rw-r--r-- 1 root root 1919812 2024-06-29 06:28 ./patches/source/netatalk/netatalk-3.2.1.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 -rw-r--r-- 1 root root 1036 2018-02-27 06:13 ./patches/source/netatalk/slack-desc @@ -2081,10 +2080,10 @@ 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 -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-01 19:11 ./patches/source/openssh/openssh.SlackBuild +-rwxr-xr-x 1 root root 6300 2024-07-03 22:18 ./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 1814 2017-07-18 06:51 ./patches/source/openssh/rc.sshd +-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 1228 2021-09-29 19:00 ./patches/source/openssh/sshd.pam @@ -2573,8 +2572,8 @@ drwxr-xr-x 2 root root 4096 2013-04-18 22:44 ./patches/source/xorg-server -rw-r--r-- 1 root root 1156 2018-02-26 23:03 ./patches/source/xorg-server/slack-desc/xorg-server-xvfb drwxr-xr-x 3 root root 4096 2013-04-18 22:44 ./patches/source/xorg-server/src drwxr-xr-x 2 root root 4096 2022-07-12 20:20 ./patches/source/xorg-server/src/xserver --rw-r--r-- 1 root root 5178288 2021-12-15 19:04 ./patches/source/xorg-server/src/xserver/xorg-server-1.20.14.tar.xz --rwxr-xr-x 1 root root 15219 2020-02-19 20:37 ./patches/source/xorg-server/x11.SlackBuild +-rw-r--r-- 1 root root 5178288 2021-12-15 19:04 ./patches/source/xorg-server/src/xserver/xorg-server-1.20.14.tar.xz +-rwxr-xr-x 1 root root 15219 2020-02-19 20:37 ./patches/source/xorg-server/x11.SlackBuild -rwxr-xr-x 1 root root 85 2014-12-18 04:56 ./patches/source/xorg-server/xorg-server.SlackBuild drwxr-xr-x 2 root root 4096 2023-06-20 19:16 ./patches/source/xorriso -rw-r--r-- 1 root root 1025 2018-02-27 06:12 ./patches/source/xorriso/slack-desc @@ -5341,8 +5340,8 @@ drwxr-xr-x 2 root root 69632 2022-02-02 04:20 ./slackware64/l -rw-r--r-- 1 root root 31396 2021-05-17 18:17 ./slackware64/l/libusb-compat-0.1.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-05-17 18:17 ./slackware64/l/libusb-compat-0.1.7-x86_64-1.txz.asc -rw-r--r-- 1 root root 321 2021-02-13 07:16 ./slackware64/l/libusbmuxd-20200615_c7d7d1a-x86_64-3.txt --rw-r--r-- 1 root root 41784 2021-02-13 07:16 ./slackware64/l/libusbmuxd-20200615_c7d7d1a-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 07:16 ./slackware64/l/libusbmuxd-20200615_c7d7d1a-x86_64-3.txz.asc +-rw-r--r-- 1 root root 41784 2021-02-13 07:16 ./slackware64/l/libusbmuxd-20200615_c7d7d1a-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 07:16 ./slackware64/l/libusbmuxd-20200615_c7d7d1a-x86_64-3.txz.asc -rw-r--r-- 1 root root 214 2022-01-05 07:01 ./slackware64/l/libuv-1.43.0-x86_64-1.txt -rw-r--r-- 1 root root 116240 2022-01-05 07:01 ./slackware64/l/libuv-1.43.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-05 07:01 ./slackware64/l/libuv-1.43.0-x86_64-1.txz.asc @@ -8240,8 +8239,8 @@ drwxr-xr-x 2 root root 4096 2020-11-11 19:58 ./source/a/pam/fedora-patches -rw-r--r-- 1 root root 541 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.1.8-audit-user-mgmt.patch.gz -rw-r--r-- 1 root root 923 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.1.8-full-relro.patch.gz -rw-r--r-- 1 root root 6901 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.3.0-pwhistory-helper.patch.gz --rw-r--r-- 1 root root 464 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.3.0-unix-nomsg.patch.gz --rw-r--r-- 1 root root 2291 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.3.1-coverity.patch.gz +-rw-r--r-- 1 root root 464 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.3.0-unix-nomsg.patch.gz +-rw-r--r-- 1 root root 2291 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.3.1-coverity.patch.gz -rw-r--r-- 1 root root 6056 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.3.1-motd-multiple-paths.patch.gz -rw-r--r-- 1 root root 416 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.3.1-noflex.patch.gz -rw-r--r-- 1 root root 1153 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.3.1-redhat-modules.patch.gz @@ -11364,8 +11363,8 @@ drwxr-xr-x 3 root root 12288 2022-01-21 19:09 ./source/kde/kde/src/framewor -rw-r--r-- 1 root root 28372 2022-01-01 14:29 ./source/kde/kde/src/frameworks/kcrash-5.90.0.tar.xz -rw-r--r-- 1 root root 488 2022-01-01 14:29 ./source/kde/kde/src/frameworks/kcrash-5.90.0.tar.xz.sig -rw-r--r-- 1 root root 63876 2022-01-01 14:29 ./source/kde/kde/src/frameworks/kdav-5.90.0.tar.xz --rw-r--r-- 1 root root 488 2022-01-01 14:29 ./source/kde/kde/src/frameworks/kdav-5.90.0.tar.xz.sig --rw-r--r-- 1 root root 47880 2022-01-01 14:29 ./source/kde/kde/src/frameworks/kdbusaddons-5.90.0.tar.xz +-rw-r--r-- 1 root root 488 2022-01-01 14:29 ./source/kde/kde/src/frameworks/kdav-5.90.0.tar.xz.sig +-rw-r--r-- 1 root root 47880 2022-01-01 14:29 ./source/kde/kde/src/frameworks/kdbusaddons-5.90.0.tar.xz -rw-r--r-- 1 root root 488 2022-01-01 14:29 ./source/kde/kde/src/frameworks/kdbusaddons-5.90.0.tar.xz.sig -rw-r--r-- 1 root root 199308 2022-01-01 14:29 ./source/kde/kde/src/frameworks/kdeclarative-5.90.0.tar.xz -rw-r--r-- 1 root root 488 2022-01-01 14:29 ./source/kde/kde/src/frameworks/kdeclarative-5.90.0.tar.xz.sig @@ -14731,10 +14730,10 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/ulogd -rw-r--r-- 1 root root 437 2013-04-22 06:15 ./source/n/ulogd/rc.ulogd -rw-r--r-- 1 root root 884 2018-05-28 17:54 ./source/n/ulogd/slack-desc -rw-r--r-- 1 root root 335009 2018-04-26 23:23 ./source/n/ulogd/ulogd-2.0.7.tar.lz --rwxr-xr-x 1 root root 3657 2021-02-13 05:32 ./source/n/ulogd/ulogd.SlackBuild --rw-r--r-- 1 root root 197 2018-05-29 00:42 ./source/n/ulogd/ulogd.logrotate -drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/uucp --rw-r--r-- 1 root root 1001 2003-06-05 22:07 ./source/n/uucp/_uucp.tar.gz +-rwxr-xr-x 1 root root 3657 2021-02-13 05:32 ./source/n/ulogd/ulogd.SlackBuild +-rw-r--r-- 1 root root 197 2018-05-29 00:42 ./source/n/ulogd/ulogd.logrotate +drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/uucp +-rw-r--r-- 1 root root 1001 2003-06-05 22:07 ./source/n/uucp/_uucp.tar.gz -rw-r--r-- 1 root root 1777 2003-06-05 21:46 ./source/n/uucp/policy.h.diff.gz -rw-r--r-- 1 root root 734 2018-02-27 06:13 ./source/n/uucp/slack-desc -rw-r--r-- 1 root root 1013234 2003-06-04 00:51 ./source/n/uucp/uucp-1.07.tar.gz diff --git a/patches/packages/ca-certificates-20240615-noarch-1_slack15.0.txt b/patches/packages/ca-certificates-20240703-noarch-1_slack15.0.txt similarity index 100% rename from patches/packages/ca-certificates-20240615-noarch-1_slack15.0.txt rename to patches/packages/ca-certificates-20240703-noarch-1_slack15.0.txt diff --git a/patches/packages/httpd-2.4.60-x86_64-2_slack15.0.txt b/patches/packages/httpd-2.4.61-x86_64-1_slack15.0.txt similarity index 100% rename from patches/packages/httpd-2.4.60-x86_64-2_slack15.0.txt rename to patches/packages/httpd-2.4.61-x86_64-1_slack15.0.txt diff --git a/patches/packages/netatalk-3.1.18-x86_64-1_slack15.0.txt b/patches/packages/netatalk-3.2.1-x86_64-1_slack15.0.txt similarity index 100% rename from patches/packages/netatalk-3.1.18-x86_64-1_slack15.0.txt rename to patches/packages/netatalk-3.2.1-x86_64-1_slack15.0.txt diff --git a/patches/packages/openssh-9.8p1-x86_64-1_slack15.0.txt b/patches/packages/openssh-9.8p1-x86_64-2_slack15.0.txt similarity index 100% rename from patches/packages/openssh-9.8p1-x86_64-1_slack15.0.txt rename to patches/packages/openssh-9.8p1-x86_64-2_slack15.0.txt diff --git a/patches/source/ca-certificates/certdata-20240615.txt b/patches/source/ca-certificates/certdata-20240703.txt similarity index 99% rename from patches/source/ca-certificates/certdata-20240615.txt rename to patches/source/ca-certificates/certdata-20240703.txt index ea914d409..d58e9eded 100644 --- a/patches/source/ca-certificates/certdata-20240615.txt +++ b/patches/source/ca-certificates/certdata-20240703.txt @@ -17020,8 +17020,14 @@ CKA_VALUE MULTILINE_OCTAL \155\015\277\173\327\222 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +# For Server Distrust After: Sun Jun 30 00:00:00 2024 +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\064\060\066\063\060\060\060\060\060\060\060\132 +END +# For Email Distrust After: Sun Jun 30 00:00:00 2024 +CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +\062\064\060\066\063\060\060\060\060\060\060\060\132 +END # Trust for "GLOBALTRUST 2020" # Issuer: CN=GLOBALTRUST 2020,O=e-commerce monitoring GmbH,C=AT diff --git a/patches/source/httpd/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch b/patches/source/httpd/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch deleted file mode 100644 index f3d6d6483..000000000 --- a/patches/source/httpd/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch +++ /dev/null @@ -1,302 +0,0 @@ -From fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d Mon Sep 17 00:00:00 2001 -From: Eric Covener -Date: Tue, 2 Jul 2024 13:07:17 +0000 -Subject: [PATCH] Merge r1918795, r1918814 from trunk: - -maintain trusted flag - - -* Always trust content types that we set literally - -Submitted by: covener, rpluem -Reviewed by: covener, jorton, rpluem - -Github: closes #459 - - -git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1918839 13f79535-47bb-0310-9956-ffa450edef68 ---- - modules/cluster/mod_heartmonitor.c | 2 +- - modules/dav/main/mod_dav.c | 10 +++++----- - modules/examples/mod_example_hooks.c | 2 +- - modules/filters/mod_data.c | 2 +- - modules/filters/mod_include.c | 2 +- - modules/filters/mod_proxy_html.c | 4 ++-- - modules/generators/mod_cgi.c | 2 +- - modules/generators/mod_cgid.c | 2 +- - modules/generators/mod_info.c | 2 +- - modules/generators/mod_status.c | 4 ++-- - modules/http/http_filters.c | 2 +- - modules/http/http_protocol.c | 4 ++-- - modules/http/http_request.c | 2 +- - modules/ldap/util_ldap.c | 2 +- - modules/mappers/mod_imagemap.c | 2 +- - modules/proxy/mod_proxy_balancer.c | 2 +- - 16 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c -index 53b650469d7..68db585181b 100644 ---- a/modules/cluster/mod_heartmonitor.c -+++ b/modules/cluster/mod_heartmonitor.c -@@ -782,7 +782,7 @@ static int hm_handler(request_rec *r) - hmserver.seen = apr_time_now(); - hm_update_stat(ctx, &hmserver, r->pool); - -- ap_set_content_type(r, "text/plain"); -+ ap_set_content_type_ex(r, "text/plain", 1); - ap_set_content_length(r, 2); - ap_rputs("OK", r); - ap_rflush(r); -diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c -index dea3f18b118..7a3eed7644a 100644 ---- a/modules/dav/main/mod_dav.c -+++ b/modules/dav/main/mod_dav.c -@@ -355,7 +355,7 @@ static int dav_error_response(request_rec *r, int status, const char *body) - r->status = status; - r->status_line = ap_get_status_line(status); - -- ap_set_content_type(r, "text/html; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); - - /* begin the response now... */ - ap_rvputs(r, -@@ -386,7 +386,7 @@ static int dav_error_response_tag(request_rec *r, - { - r->status = err->status; - -- ap_set_content_type(r, DAV_XML_CONTENT_TYPE); -+ ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); - - ap_rputs(DAV_XML_HEADER DEBUG_CR - "status = status; -- ap_set_content_type(r, DAV_XML_CONTENT_TYPE); -+ ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); - - /* Send the headers and actual multistatus response now... */ - ap_fputs(r->output_filters, bb, DAV_XML_HEADER DEBUG_CR -@@ -2016,7 +2016,7 @@ static int dav_method_options(request_rec *r) - - /* send the options response */ - r->status = HTTP_OK; -- ap_set_content_type(r, DAV_XML_CONTENT_TYPE); -+ ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); - - /* send the headers and response body */ - ap_rputs(DAV_XML_HEADER DEBUG_CR -@@ -3328,7 +3328,7 @@ static int dav_method_lock(request_rec *r) - (*locks_hooks->close_lockdb)(lockdb); - - r->status = HTTP_OK; -- ap_set_content_type(r, DAV_XML_CONTENT_TYPE); -+ ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); - - ap_rputs(DAV_XML_HEADER DEBUG_CR "" DEBUG_CR, r); - if (lock == NULL) -diff --git a/modules/examples/mod_example_hooks.c b/modules/examples/mod_example_hooks.c -index f7ef5a5ccf7..d9379060681 100644 ---- a/modules/examples/mod_example_hooks.c -+++ b/modules/examples/mod_example_hooks.c -@@ -993,7 +993,7 @@ static int x_handler(request_rec *r) - * Set the Content-type header. Note that we do not actually have to send - * the headers: this is done by the http core. - */ -- ap_set_content_type(r, "text/html"); -+ ap_set_content_type_ex(r, "text/html", 1); - /* - * If we're only supposed to send header information (HEAD request), we're - * already there. -diff --git a/modules/filters/mod_data.c b/modules/filters/mod_data.c -index ddadd1b3605..4e6e63606ca 100644 ---- a/modules/filters/mod_data.c -+++ b/modules/filters/mod_data.c -@@ -117,7 +117,7 @@ static apr_status_t data_out_filter(ap_filter_t *f, apr_bucket_brigade *bb) - } - } - -- ap_set_content_type(r, "text/plain"); -+ ap_set_content_type_ex(r, "text/plain", 1); - - } - -diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c -index 584d8fb311f..2c0cc67545c 100644 ---- a/modules/filters/mod_include.c -+++ b/modules/filters/mod_include.c -@@ -3972,7 +3972,7 @@ static int include_fixup(request_rec *r) - if (r->handler && (strcmp(r->handler, "server-parsed") == 0)) - { - if (!r->content_type || !*r->content_type) { -- ap_set_content_type(r, "text/html"); -+ ap_set_content_type_ex(r, "text/html", 1); - } - r->handler = "default-handler"; - } -diff --git a/modules/filters/mod_proxy_html.c b/modules/filters/mod_proxy_html.c -index 7783da108d7..4205a617157 100644 ---- a/modules/filters/mod_proxy_html.c -+++ b/modules/filters/mod_proxy_html.c -@@ -952,7 +952,7 @@ static apr_status_t proxy_html_filter(ap_filter_t *f, apr_bucket_brigade *bb) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, f->r, APLOGNO(01422) - "No i18n support found. Install mod_xml2enc if required"); - enc = XML_CHAR_ENCODING_NONE; -- ap_set_content_type(f->r, "text/html;charset=utf-8"); -+ ap_set_content_type_ex(f->r, "text/html;charset=utf-8", 1); - } - else { - /* if we wanted a non-default charset_out, insert the -@@ -968,7 +968,7 @@ static apr_status_t proxy_html_filter(ap_filter_t *f, apr_bucket_brigade *bb) - cenc, NULL)); - } - else /* Normal case, everything worked, utf-8 output */ -- ap_set_content_type(f->r, "text/html;charset=utf-8"); -+ ap_set_content_type_ex(f->r, "text/html;charset=utf-8", 1); - } - - ap_fputs(f->next, ctxt->bb, ctxt->cfg->doctype); -diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c -index 3799b06ce33..61d888dd946 100644 ---- a/modules/generators/mod_cgi.c -+++ b/modules/generators/mod_cgi.c -@@ -671,7 +671,7 @@ static apr_status_t include_cgi(include_ctx_t *ctx, ap_filter_t *f, - /* Force sub_req to be treated as a CGI request, even if ordinary - * typing rules would have called it something else. - */ -- ap_set_content_type(rr, CGI_MAGIC_TYPE); -+ ap_set_content_type_ex(rr, CGI_MAGIC_TYPE, 1); - - /* Run it. */ - rr_status = ap_run_sub_req(rr); -diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c -index 1d55b8dc481..f21eb12f741 100644 ---- a/modules/generators/mod_cgid.c -+++ b/modules/generators/mod_cgid.c -@@ -1666,7 +1666,7 @@ static apr_status_t include_cgi(include_ctx_t *ctx, ap_filter_t *f, - /* Force sub_req to be treated as a CGI request, even if ordinary - * typing rules would have called it something else. - */ -- ap_set_content_type(rr, CGI_MAGIC_TYPE); -+ ap_set_content_type_ex(rr, CGI_MAGIC_TYPE, 1); - - /* Run it. */ - rr_status = ap_run_sub_req(rr); -diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c -index 1662242afe9..a94e4e484c4 100644 ---- a/modules/generators/mod_info.c -+++ b/modules/generators/mod_info.c -@@ -784,7 +784,7 @@ static int display_info(request_rec * r) - return DECLINED; - } - -- ap_set_content_type(r, "text/html; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); - - ap_rputs(DOCTYPE_XHTML_1_0T - "\n" -diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c -index 5bada071185..2cb38c747fb 100644 ---- a/modules/generators/mod_status.c -+++ b/modules/generators/mod_status.c -@@ -273,7 +273,7 @@ static int status_handler(request_rec *r) - if (r->method_number != M_GET) - return DECLINED; - -- ap_set_content_type(r, "text/html; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); - - /* - * Simple table-driven form data set parser that lets you alter the header -@@ -301,7 +301,7 @@ static int status_handler(request_rec *r) - no_table_report = 1; - break; - case STAT_OPT_AUTO: -- ap_set_content_type(r, "text/plain; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/plain; charset=ISO-8859-1", 1); - short_report = 1; - break; - } -diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c -index f20aee73fa8..60b44d78580 100644 ---- a/modules/http/http_filters.c -+++ b/modules/http/http_filters.c -@@ -1261,7 +1261,7 @@ AP_DECLARE_NONSTD(int) ap_send_http_trace(request_rec *r) - } - } - -- ap_set_content_type(r, "message/http"); -+ ap_set_content_type_ex(r, "message/http", 1); - - /* Now we recreate the request, and echo it back */ - -diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c -index c31e8737337..3bc666e6d90 100644 ---- a/modules/http/http_protocol.c -+++ b/modules/http/http_protocol.c -@@ -1443,10 +1443,10 @@ AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error) - request_conf->suppress_charset = 1; /* avoid adding default - * charset later - */ -- ap_set_content_type(r, "text/html"); -+ ap_set_content_type_ex(r, "text/html", 1); - } - else { -- ap_set_content_type(r, "text/html; charset=iso-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=iso-8859-1", 1); - } - - if ((status == HTTP_METHOD_NOT_ALLOWED) -diff --git a/modules/http/http_request.c b/modules/http/http_request.c -index d59cfe25999..71ecc2bbab1 100644 ---- a/modules/http/http_request.c -+++ b/modules/http/http_request.c -@@ -708,7 +708,7 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r) - r->args = rr->args; - r->finfo = rr->finfo; - r->handler = rr->handler; -- ap_set_content_type(r, rr->content_type); -+ ap_set_content_type_ex(r, rr->content_type, AP_REQUEST_IS_TRUSTED_CT(r)); - r->content_encoding = rr->content_encoding; - r->content_languages = rr->content_languages; - r->per_dir_config = rr->per_dir_config; -diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c -index aa0bad1397c..8c9e58717d2 100644 ---- a/modules/ldap/util_ldap.c -+++ b/modules/ldap/util_ldap.c -@@ -171,7 +171,7 @@ static int util_ldap_handler(request_rec *r) - st = (util_ldap_state_t *) ap_get_module_config(r->server->module_config, - &ldap_module); - -- ap_set_content_type(r, "text/html; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); - - if (r->header_only) - return OK; -diff --git a/modules/mappers/mod_imagemap.c b/modules/mappers/mod_imagemap.c -index 206c0b6d44f..b2dca7e1ee7 100644 ---- a/modules/mappers/mod_imagemap.c -+++ b/modules/mappers/mod_imagemap.c -@@ -475,7 +475,7 @@ static int imap_reply(request_rec *r, const char *redirect) - - static void menu_header(request_rec *r, char *menu) - { -- ap_set_content_type(r, "text/html; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); - - ap_rvputs(r, DOCTYPE_HTML_3_2, "\nMenu for ", - ap_escape_html(r->pool, r->uri), -diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c -index b8b452d0bfe..3c0f5a8d6ab 100644 ---- a/modules/proxy/mod_proxy_balancer.c -+++ b/modules/proxy/mod_proxy_balancer.c -@@ -1471,7 +1471,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf, - - if (usexml) { - char date[APR_RFC822_DATE_LEN]; -- ap_set_content_type(r, "text/xml"); -+ ap_set_content_type_ex(r, "text/xml", 1); - ap_rputs("<?xml version='1.0' encoding='UTF-8' ?>\n", r); - ap_rputs("<httpd:manager xmlns:httpd='http://httpd.apache.org'>\n", r); - ap_rputs(" <httpd:balancers>\n", r); diff --git a/patches/source/httpd/httpd.SlackBuild b/patches/source/httpd/httpd.SlackBuild index 40f74c2ac..7ea95e463 100755 --- a/patches/source/httpd/httpd.SlackBuild +++ b/patches/source/httpd/httpd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=httpd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2_slack15.0} +BUILD=${BUILD:-1_slack15.0} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -81,9 +81,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix 2.4.60 regression: -cat $CWD/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch | patch -p1 --verbose || exit 1 - # A brief note about mpms: # # "prefork" is the legacy forked mpm, used with mod_php. Starting with httpd diff --git a/patches/source/httpd/httpd.url b/patches/source/httpd/httpd.url index 20f7f32ce..604aa6aa4 100644 --- a/patches/source/httpd/httpd.url +++ b/patches/source/httpd/httpd.url @@ -1,2 +1,2 @@ -http://www.apache.org/dist/httpd/httpd-2.4.60.tar.bz2 -http://www.apache.org/dist/httpd/httpd-2.4.60.tar.bz2.asc +http://www.apache.org/dist/httpd/httpd-2.4.61.tar.bz2 +http://www.apache.org/dist/httpd/httpd-2.4.61.tar.bz2.asc diff --git a/patches/source/netatalk/netatalk.SlackBuild b/patches/source/netatalk/netatalk.SlackBuild index 67c6fdbf2..5ab1214ef 100755 --- a/patches/source/netatalk/netatalk.SlackBuild +++ b/patches/source/netatalk/netatalk.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2012, 2015, 2018, 2019, 2020, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012, 2015, 2018, 2019, 2020, 2022, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -78,6 +78,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +./bootstrap || exit 1 + # Choose correct options depending on whether PAM is installed: if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then PAM_OPTIONS="--with-pam-confdir=/etc/pam.d --with-pam --enable-ddp" @@ -147,7 +149,7 @@ fi mkdir -p $PKG/usr/doc/netatalk-$VERSION cp -a \ - AUTHORS CONTRIBUTORS COPYING* COPYRIGHT NEWS VERSION \ + AUTHORS* CONTRIBUTORS* COPYING* COPYRIGHT* NEWS* README* VERSION* \ $PKG/usr/doc/netatalk-$VERSION cp -a $CWD/examples $PKG/usr/doc/netatalk-$VERSION chown -R root:root $PKG/usr/doc/netatalk-$VERSION/examples diff --git a/patches/source/openssh/openssh.SlackBuild b/patches/source/openssh/openssh.SlackBuild index 88dee583f..68b0d5ef7 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:-1_slack15.0} +BUILD=${BUILD:-2_slack15.0} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/patches/source/openssh/rc.sshd b/patches/source/openssh/rc.sshd index eea6c6a74..64a8b5d57 100644 --- a/patches/source/openssh/rc.sshd +++ b/patches/source/openssh/rc.sshd @@ -27,7 +27,8 @@ sshd_start() { } sshd_stop() { - killall sshd + killall --ns $$ sshd-session 2> /dev/null + killall --ns $$ sshd } sshd_restart() { @@ -61,4 +62,3 @@ case "$1" in *) echo "usage $0 start|stop|restart" esac -