diff options
| author |   Sam James <sam@gentoo.org> | 2023-08-21 18:48:31 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-08-21 18:48:31 +0100 |
| commit | 5b974a3c903327b37f46a0212bf397ef634a67fd (patch) | |
| tree | 38cd9f695ccf92cdd37ccf89a37794ec40f6f61e /net-misc | |
| parent | sys-auth/rtkit: Stabilize 0.13-r2 arm, #912755 (diff) | |
| download | gentoo-5b974a3c903327b37f46a0212bf397ef634a67fd.tar.gz gentoo-5b974a3c903327b37f46a0212bf397ef634a67fd.tar.bz2 gentoo-5b974a3c903327b37f46a0212bf397ef634a67fd.zip | |
net-misc/openssh: fix configure check for zlib-1.3
Closes: https://bugs.gentoo.org/912766
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch | 21 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-9.3_p1-r1.ebuild | 1 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-9.3_p2.ebuild | 1 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-9.4_p1.ebuild | 1 |
4 files changed, 24 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch b/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch new file mode 100644 index 000000000000..f1336bbe0380 --- /dev/null +++ b/net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/912766 +https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621 + +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. +--- 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/net-misc/openssh/openssh-9.3_p1-r1.ebuild b/net-misc/openssh/openssh-9.3_p1-r1.ebuild index e3184f35c252..2624fa94f0ee 100644 --- a/net-misc/openssh/openssh-9.3_p1-r1.ebuild +++ b/net-misc/openssh/openssh-9.3_p1-r1.ebuild @@ -88,6 +88,7 @@ PATCHES=( "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" "${FILESDIR}/${PN}-9.3_p1-gss-use-HOST_NAME_MAX.patch" #834044 "${FILESDIR}/${PN}-9.3_p1-openssl-version-compat-check.patch" + "${FILESDIR}/${PN}-9.3_p2-zlib-1.3.patch" #912766 ) pkg_pretend() { diff --git a/net-misc/openssh/openssh-9.3_p2.ebuild b/net-misc/openssh/openssh-9.3_p2.ebuild index 8e57bfe2061c..3013b70ed4bc 100644 --- a/net-misc/openssh/openssh-9.3_p2.ebuild +++ b/net-misc/openssh/openssh-9.3_p2.ebuild @@ -88,6 +88,7 @@ PATCHES=( "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" "${FILESDIR}/${PN}-9.3_p1-gss-use-HOST_NAME_MAX.patch" #834044 "${FILESDIR}/${PN}-9.3_p1-openssl-version-compat-check.patch" + "${FILESDIR}/${PN}-9.3_p2-zlib-1.3.patch" #912766 ) pkg_pretend() { diff --git a/net-misc/openssh/openssh-9.4_p1.ebuild b/net-misc/openssh/openssh-9.4_p1.ebuild index ec36f3445783..5d1ffb94eba4 100644 --- a/net-misc/openssh/openssh-9.4_p1.ebuild +++ b/net-misc/openssh/openssh-9.4_p1.ebuild @@ -86,6 +86,7 @@ PATCHES=( "${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch" "${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch" "${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch" + "${FILESDIR}/${PN}-9.3_p2-zlib-1.3.patch" #912766 ) pkg_pretend() { |