diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-10-04 20:02:00 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-10-04 22:39:23 +0200 |
commit | 2cd510ebfb0750fddeeae3fe109bcb34647172e7 (patch) | |
tree | d568660fe1bb4195f1a0745221323d8102fe551f /source/n | |
parent | 7a2ee07f950f14ce482ae370d28b18de8fcbde69 (diff) | |
download | current-2cd510ebfb0750fddeeae3fe109bcb34647172e7.tar.gz current-2cd510ebfb0750fddeeae3fe109bcb34647172e7.tar.xz |
Wed Oct 4 20:02:00 UTC 202320231004200200
a/btrfs-progs-6.5.2-x86_64-1.txz: Upgraded.
a/gettext-0.22.3-x86_64-1.txz: Upgraded.
a/hwdata-0.375-noarch-1.txz: Upgraded.
d/gettext-tools-0.22.3-x86_64-1.txz: Upgraded.
d/gnucobol-3.2-x86_64-1.txz: Upgraded.
kde/fcitx5-configtool-5.1.1-x86_64-1.txz: Upgraded.
n/openssh-9.5p1-x86_64-1.txz: Upgraded.
xfce/xfce4-taskmanager-1.5.6-x86_64-1.txz: Upgraded.
Diffstat (limited to '')
-rw-r--r-- | source/n/openssh/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch | 23 | ||||
-rwxr-xr-x | source/n/openssh/openssh.SlackBuild | 5 |
2 files changed, 1 insertions, 27 deletions
diff --git a/source/n/openssh/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch b/source/n/openssh/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch deleted file mode 100644 index c86c68026..000000000 --- a/source/n/openssh/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 16ade27e6..642194ff7 100755 --- a/source/n/openssh/openssh.SlackBuild +++ b/source/n/openssh/openssh.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2000 BSDi, Inc. Concord, CA, USA # Copyright 2001, 2002, 2003, 2004 Slackware Linux, Inc. Concord, CA, USA -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2020, 2021, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -86,9 +86,6 @@ 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" |