Package: openssh
Version: 1:8.4p1-5
Severity: normal
Tags: patch
User: ubuntu-de...@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-disc...@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian OpenSSH Maintainers
<debian-...@lists.debian.org>
+Maintainer: Debian OpenSSH Maintainers <debian-...@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
