gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

net-misc/openssh: fix configure check for zlib-1.3

Browse Source 
Closes: https://bugs.gentoo.org/912766
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2023-08-21 18:48:31 +01:00
parent c37a0512d7
commit 5b974a3c90
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
net-misc/openssh/files/openssh-9.3_p2-zlib-1.3.patch Normal file
View File

@@ -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);

1
net-misc/openssh/openssh-9.3_p1-r1.ebuild
View File

@@ -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() {

1
net-misc/openssh/openssh-9.3_p2.ebuild
View File

@@ -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() {

1
net-misc/openssh/openssh-9.4_p1.ebuild
View File

@@ -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() {