summaryrefslogtreecommitdiffstats
path: root/source/n
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-08-28 00:38:01 +0000
committer Eric Hameleers <alien@slackware.com>2023-08-28 03:00:22 +0200
commit6040e1895de0a28ad5ea3ca7093c6f8a768a6cc7 (patch)
tree98b2ca61b1b79433adc67781f0f914a419f3b7bf /source/n
parentee5ad0d97a7f544c15e408bc483f5470ed363a51 (diff)
downloadcurrent-6040e1895de0a28ad5ea3ca7093c6f8a768a6cc7.tar.gz
current-6040e1895de0a28ad5ea3ca7093c6f8a768a6cc7.tar.xz
Mon Aug 28 00:38:01 UTC 202320230828003801
a/kernel-generic-6.1.49-x86_64-1.txz: Upgraded. a/kernel-huge-6.1.49-x86_64-1.txz: Upgraded. a/kernel-modules-6.1.49-x86_64-1.txz: Upgraded. ap/sqlite-3.43.0-x86_64-2.txz: Rebuilt. Build/package sqldiff and sqlite3_analyzer. Thanks to Heinz Wiesinger. d/doxygen-1.9.8-x86_64-1.txz: Upgraded. d/kernel-headers-6.1.49-x86-1.txz: Upgraded. k/kernel-source-6.1.49-noarch-1.txz: Upgraded. l/libedit-20230827_3.1-x86_64-1.txz: Upgraded. x/m17n-lib-1.8.4-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/n')
-rw-r--r--source/n/FTBFSlog3
-rw-r--r--source/n/openssh/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch23
-rwxr-xr-xsource/n/openssh/openssh.SlackBuild3
3 files changed, 29 insertions, 0 deletions
diff --git a/source/n/FTBFSlog b/source/n/FTBFSlog
index ae2c4327a..1afd3c10e 100644
--- a/source/n/FTBFSlog
+++ b/source/n/FTBFSlog
@@ -1,3 +1,6 @@
+Sun Aug 27 18:13:06 UTC 2023
+ openssh: fix zlib version check. Thanks to nobodino and marav.
++--------------------------+
Mon May 1 23:45:40 UTC 2023
ncftp: add "CC=gcc \" before the configure block.
Thanks to nobodino.
diff --git a/source/n/openssh/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch b/source/n/openssh/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch
new file mode 100644
index 000000000..c86c68026
--- /dev/null
+++ b/source/n/openssh/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch
@@ -0,0 +1,23 @@
+From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001
+From: Darren Tucker <dtucker@dtucker.net>
+Date: Sat, 19 Aug 2023 07:39:08 +1000
+Subject: [PATCH] Fix zlib version check for 1.3 and future version.
+
+bz#3604.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 07893e87065..e3128dfcbb4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1464,7 +1464,7 @@ else
+ [[
+ int a=0, b=0, c=0, d=0, n, v;
+ n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d);
+- if (n != 3 && n != 4)
++ if (n < 1)
+ exit(1);
+ v = a*1000000 + b*10000 + c*100 + d;
+ fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v);
diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild
index 275d2558a..16ade27e6 100755
--- a/source/n/openssh/openssh.SlackBuild
+++ b/source/n/openssh/openssh.SlackBuild
@@ -86,6 +86,9 @@ chown -R root:root .
# Restore support for tcpwrappers:
zcat $CWD/openssh.tcp_wrappers.diff.gz | patch -p1 --verbose || exit 1
+# Fix zlib version check:
+cat $CWD/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch | patch -p1 --verbose || exit 1
+
# Choose correct options depending on whether PAM is installed:
if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
PAM_OPTIONS="--with-pam --with-kerberos5"