--- Begin Message ---
Package: openssh
Version: 1:8.4p1-5
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu impish ubuntu-patch
Dear Maintainer,
Due to an incompatible function prototype in the openbsd-compat tests, this package FTBFS with glibc >= 2.34. There is already an upstream commit to fix it, so I have pulled that in to this version of the package.
In Ubuntu, the attached patch was applied to achieve the following:
Have openssh build successfully with glibc >= 2.34
* Add includes.h to compat tests, and remove closefrom prototype
Thanks for considering the patch.
-- System Information:
Debian Release: 11.0
APT prefers impish
APT policy: (500, 'impish')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.11.0-22-generic (SMP w/32 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru openssh-8.4p1/debian/control openssh-8.4p1/debian/control
--- openssh-8.4p1/debian/control 2021-07-05 07:21:03.000000000 -0500
+++ openssh-8.4p1/debian/control 2021-08-12 15:55:06.000000000 -0500
@@ -1,8 +1,7 @@
Source: openssh
Section: net
Priority: standard
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
+Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
Build-Depends: autotools-dev,
debhelper (>= 9.20160709~),
debhelper-compat (= 9),
diff -Nru openssh-8.4p1/debian/patches/419aa01123db5ff5dbc68b2376ef23b222862338.patch openssh-8.4p1/debian/patches/419aa01123db5ff5dbc68b2376ef23b222862338.patch
--- openssh-8.4p1/debian/patches/419aa01123db5ff5dbc68b2376ef23b222862338.patch 1969-12-31 18:00:00.000000000 -0600
+++ openssh-8.4p1/debian/patches/419aa01123db5ff5dbc68b2376ef23b222862338.patch 2021-08-12 15:55:06.000000000 -0500
@@ -0,0 +1,96 @@
+Description: Add includes.h to compat tests
+ On platforms where closefrom returns void (eg glibc>=2.34) the prototype
+ for closefrom in its compat tests would cause compile errors. Remove
+ this and have the tests pull in the compat headers in the same way as
+ the main code.
+Origin: upstream, https://github.com/openssh/openssh-portable/commit/419aa01123db5ff5dbc68b2376ef23b222862338
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/1939751
+Last-Update: 2021-08-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/openbsd-compat/regress/closefromtest.c
++++ b/openbsd-compat/regress/closefromtest.c
+@@ -14,6 +14,8 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#include "includes.h"
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+@@ -24,8 +26,6 @@
+
+ #define NUM_OPENS 10
+
+-int closefrom(int);
+-
+ void
+ fail(char *msg)
+ {
+--- a/openbsd-compat/regress/Makefile.in
++++ b/openbsd-compat/regress/Makefile.in
+@@ -7,7 +7,7 @@
+ CC=@CC@
+ LD=@LD@
+ CFLAGS=@CFLAGS@
+-CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
++CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. @CPPFLAGS@ @DEFS@
+ EXEEXT=@EXEEXT@
+ LIBCOMPAT=../libopenbsd-compat.a
+ LIBS=@LIBS@
+--- a/openbsd-compat/regress/opensslvertest.c
++++ b/openbsd-compat/regress/opensslvertest.c
+@@ -14,6 +14,8 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#include "includes.h"
++
+ #include <stdio.h>
+ #include <stdlib.h>
+
+--- a/openbsd-compat/regress/snprintftest.c
++++ b/openbsd-compat/regress/snprintftest.c
+@@ -17,6 +17,8 @@
+
+ #define BUFSZ 2048
+
++#include "includes.h"
++
+ #include <sys/types.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+--- a/openbsd-compat/regress/strduptest.c
++++ b/openbsd-compat/regress/strduptest.c
+@@ -14,6 +14,8 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#include "includes.h"
++
+ #include <stdlib.h>
+ #include <string.h>
+
+--- a/openbsd-compat/regress/strtonumtest.c
++++ b/openbsd-compat/regress/strtonumtest.c
+@@ -17,6 +17,8 @@
+
+ /* OPENBSD ORIGINAL: regress/lib/libc/strtonum/strtonumtest.c */
+
++#include "includes.h"
++
+ #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+--- a/openbsd-compat/regress/utimensattest.c
++++ b/openbsd-compat/regress/utimensattest.c
+@@ -14,6 +14,8 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
++#include "includes.h"
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
diff -Nru openssh-8.4p1/debian/patches/series openssh-8.4p1/debian/patches/series
--- openssh-8.4p1/debian/patches/series 2021-07-05 07:21:03.000000000 -0500
+++ openssh-8.4p1/debian/patches/series 2021-08-12 15:52:20.000000000 -0500
@@ -29,3 +29,4 @@
0f90440ca70abab947acbd77795e9f130967956c.patch
2e0beff67def2120f4b051b1016d7fbf84823e78.patch
1bb130ed34721d46452529d094d9bbf045607d79.patch
+419aa01123db5ff5dbc68b2376ef23b222862338.patch
--- End Message ---
--- Begin Message ---
Source: openssh
Source-Version: 1:8.4p1-6
Done: Colin Watson <cjwatson@debian.org>
We believe that the bug you reported is fixed in the latest version of
openssh, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 992134@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Colin Watson <cjwatson@debian.org> (supplier of updated openssh package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 19 Aug 2021 11:04:01 +0100
Source: openssh
Architecture: source
Version: 1:8.4p1-6
Distribution: unstable
Urgency: medium
Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
Changed-By: Colin Watson <cjwatson@debian.org>
Closes: 934663 990456 992134
Changes:
openssh (1:8.4p1-6) unstable; urgency=medium
.
[ Colin Watson ]
* Rename ssh group to _ssh (closes: #990456). It's only used by
ssh-agent.
* debian/tests/regress: Don't fail cleanup if haveged isn't running.
* Backport from upstream:
- Add includes.h to compat tests (closes: #992134, LP: #1939751).
* Use "command -v" in maintainer scripts rather than "which".
.
[ Athos Ribeiro ]
* d/systemd/ssh@.service: preserve the systemd managed runtime directory to
ensure parallel processes will not disrupt one another when halting
(LP: #1905285) (closes: #934663)
Checksums-Sha1:
77a4d035d35386fb101351bf6abe19a45e40afcd 3353 openssh_8.4p1-6.dsc
01099792f97ccd4b5012e4db5e8fc9bf481e317d 180236 openssh_8.4p1-6.debian.tar.xz
Checksums-Sha256:
692615840d985bc66b49992d42235f35cc8f5e78ace6ca7bcb979b3d92530cc8 3353 openssh_8.4p1-6.dsc
a21f4a01ae6b19e929f164ff3a121939c4f83fc4dc868f2f815266dff93e0d1c 180236 openssh_8.4p1-6.debian.tar.xz
Files:
6759698733983ca4f8066eee6bcd529d 3353 net standard openssh_8.4p1-6.dsc
96cb3dcf100d6ce3639a7079d73914ee 180236 net standard openssh_8.4p1-6.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEErApP8SYRtvzPAcEROTWH2X2GUAsFAmEeMm4ACgkQOTWH2X2G
UAutOQ/+Lm9vbR9/3qMFXfKS1x+2vhk6dHO8976eCeabajvdpVJUndbI3sp4iPhC
XV2gP7k0Cn73ZjrDy+yZyNrPn9s4t2+KrIO+EbqQN0wbeE/Q2IThDnPchZyTuQnj
tA0ZlqQ7NEG7efZl8ftFHCdRg8KLY5nD8E9OrR3oxw7m+Dl3kQdo8S8Ha15vUW9v
IouU6fcWYwDbzYo1XTZrrzh2RLsYP6nKBsoTiOOM+Op7lYGt+9impx5Y1A7zZZlH
NOYj8yJBQuyS3WKWa58jiWghOIkhixf41kjZf8lyaO2EJvMhpgzHrPuawZn6fKiA
oD5Y1kihmfUYXEZUVhjF1l2qczDIh10yQFDU2TIhUfuybLzUesID4JpEiQdxzyOa
p2GA4diaKklotx7A/5Ki6eGikmcCpc+rEXnp4YK4mPNwrq7KZ1zkGINVzyq9dkhn
7lNO5pE3jf4bdKe4qn3vLUkgolnRJue73GNguHoZ3LAUkHr6Oc2Ul+vrypsHv0BH
vyBsjOton7SqYq0WxYLRFEHWFoR6GSjRaafMgb1w5Gdh1EwSogXRpbaLEmL48Rdr
PWOoz3F1ABfabVZPb/KCX6QTZD63QqABvFKraETcARcChi5jBLruHDmfjmStxFA/
dYfMhl9tpeZnxPd8Yh3bgmkU5Ym80zS7BzQGbE/Fww6rfy1TeQ4=
=KO12
-----END PGP SIGNATURE-----
--- End Message ---