Merge ~mirespace/ubuntu/+source/openssh:ubuntu/devel into ubuntu/+source/openssh:ubuntu/devel

[Miriam España Acebal]

[Miriam España Acebal (mirespace)]

Hi team,

ppa for this is:
https://launchpad.net/~mirespace/+archive/ubuntu/openssh-lp2049552-ftbfs-with-zlib/
ppa:mirespace/openssh-lp2049552-ftbfs-with-zlib

This imported upstream change makes the Openssh build happen.

I ran the test for that PPA here: https://autopkgtest.ubuntu.com/results/autopkgtest-noble-mirespace-openssh-lp2049552-ftbfs-with-zlib/?format=plain , but they are not yet finished.

Please, review and sponsor if LGTY... Thanks in advance,

Miriam

[Andreas Hasenack (ahasenack)]

Looks good, +1

In the future, and this is just a suggestion, please use a more meaningful branch name, not just "ubuntu/devel", as that is the default branch we get when we checkout a package from git-ubuntu :)

I'll check back later to see the dep8 results, I saw an s390x failure, but let's see what happens in the other arches.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, mirespace
Uploaders: ahasenack
MP auto-approved

review: Approve

[Miriam España Acebal (mirespace)]

> Looks good, +1
>
> In the future, and this is just a suggestion, please use a more meaningful
> branch name, not just "ubuntu/devel", as that is the default branch we get
> when we checkout a package from git-ubuntu :)
>
> I'll check back later to see the dep8 results, I saw an s390x failure, but
> let's see what happens in the other arches.

Thanks Andreas... I take note! It's the first time I use that branch (lazzy branch switching), and now I understand why I (us in general) didn't use it before: not because of the content but for the traceability.

I'll take a look tomorrow of the dep8 results too.

[Andreas Hasenack (ahasenack)]

I'm told DEP8 is passing with noble release, that's sufficient. I'll upload.

review: Approve

[Andreas Hasenack (ahasenack)]

Uploading openssh_9.4p1-1ubuntu2.dsc
Uploading openssh_9.4p1-1ubuntu2.debian.tar.xz
Uploading openssh_9.4p1-1ubuntu2_source.buildinfo
Uploading openssh_9.4p1-1ubuntu2_source.changes

diff --git a/debian/changelog b/debian/changelog
index 864c77d..41fa754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:9.4p1-1ubuntu2) noble; urgency=medium
+
+  * d/p/fix-ftbfs-with-zlib13.patch: fix ftbfs when using
+    zlib 1.3 (LP: #2049552).
+
+ -- Miriam España Acebal <[e-mail]>  Wed, 17 Jan 2024 20:00:55 +0100
+
 openssh (1:9.4p1-1ubuntu1) noble; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/patches/fix-ftbfs-with-zlib13.patch b/debian/patches/fix-ftbfs-with-zlib13.patch
new file mode 100644
index 0000000..2ba6f05
--- /dev/null
+++ b/debian/patches/fix-ftbfs-with-zlib13.patch
@@ -0,0 +1,25 @@
+From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001
+From: Darren Tucker <[e-mail]>
+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(-)
+
+Origin: upstream, https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621
+Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=3604
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/2049552
+Last-Update: 2024-01-17
+--- a/configure.ac
++++ b/configure.ac
+@@ -1488,7 +1488,7 @@
+ 	[[
+ 	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/debian/patches/series b/debian/patches/series
index 650a6c5..4c36c2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ conch-ssh-rsa.patch
 systemd-socket-activation.patch
 socket-activation-documentation.patch
 test-set-UsePAM-no-on-some-tests.patch
+fix-ftbfs-with-zlib13.patch