Skip to content

Commit

Permalink
openssh: fix check for zlib
Browse files Browse the repository at this point in the history
  • Loading branch information
hadfl committed Sep 18, 2023
1 parent f9e9883 commit b6a59e6
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
1 change: 1 addition & 0 deletions build/openssh/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ sshd_config.patch
0029-Accept-LANG-and-LC_-environment-variables-from-clien.patch
0031-Restore-tcpwrappers-libwrap-support.patch
test.patch
zlib-check.patch
23 changes: 23 additions & 0 deletions build/openssh/patches/zlib-check.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001
From: Darren Tucker <[email protected]>
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);

0 comments on commit b6a59e6

Please sign in to comment.