From ac7d1e8af45c2945486563b4fa64e6c037e8613e746ed0c1e56c56a9ab568c2c Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 25 Oct 2023 07:33:22 +0000
Subject: [PATCH] Accepting request 1119952 from home:dimstar:Factory

- Add cb4ed12f.patch: Fix build using zlib 1.3. The check expected
  a version in the form a.b.c[.d], which no longer matches 1.3.

See failure with zlib 1.3 in Staging:N

OBS-URL: https://build.opensuse.org/request/show/1119952
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=251
---
 cb4ed12f.patch  | 23 +++++++++++++++++++++++
 openssh.changes |  6 ++++++
 openssh.spec    |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 cb4ed12f.patch

diff --git a/cb4ed12f.patch b/cb4ed12f.patch
new file mode 100644
index 0000000..1e49cd3
--- /dev/null
+++ b/cb4ed12f.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/openssh.changes b/openssh.changes
index 35399ad..aed4e40 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 24 10:56:31 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add cb4ed12f.patch: Fix build using zlib 1.3. The check expected
+  a version in the form a.b.c[.d], which no longer matches 1.3.
+
 -------------------------------------------------------------------
 Fri Jul 21 02:48:58 UTC 2023 - Simon Lees <sflees@suse.de>
 
diff --git a/openssh.spec b/openssh.spec
index 1516741..932746c 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -116,6 +116,8 @@ Patch49:        openssh-do-not-send-empty-message.patch
 Patch50:        openssh-openssl-3.patch
 Patch51:        wtmpdb.patch
 Patch52:        logind_set_tty.patch
+# PATCH-FIx-UPSTREAM cb4ed12f.patch -- Fix build with zlib 1.3
+Patch53:        https://github.com/openssh/openssh-portable/commit/cb4ed12f.patch
 Patch100:       fix-missing-lz.patch
 BuildRequires:  audit-devel
 BuildRequires:  automake