openssh: don't download patch from Github
Patches downloaded from Github are not stable, so bring them in the tree. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni
Peter Korsgaard
parent
50368ac2ab
commit
4e7522aacd
44
package/openssh/0001-configure-ac-detect-mips-abi.patch
Normal file
44
package/openssh/0001-configure-ac-detect-mips-abi.patch
Normal file
@ -0,0 +1,44 @@
|
||||
From f4fcd8c788a4854d4ebae400cf55e3957f906835 Mon Sep 17 00:00:00 2001
|
||||
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
Date: Tue, 20 Jun 2017 16:42:11 +0100
|
||||
Subject: [PATCH] configure.ac: detect MIPS ABI
|
||||
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
[Upstream commit: ttps://github.com/openssh/openssh-portable/commit/f4fcd8c788a4854d4ebae400cf55e3957f906835]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
configure.ac | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 18079acba..f990cfe08 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -746,6 +746,27 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
|
||||
fi
|
||||
AC_CHECK_HEADERS([linux/seccomp.h linux/filter.h linux/audit.h], [],
|
||||
[], [#include <linux/types.h>])
|
||||
+ # Obtain MIPS ABI
|
||||
+ case "$host" in
|
||||
+ mips*)
|
||||
+ AC_COMPILE_IFELSE([
|
||||
+#if _MIPS_SIM != _ABIO32
|
||||
+#error
|
||||
+#endif
|
||||
+ ],[mips_abi="o32"],[AC_COMPILE_IFELSE([
|
||||
+#if _MIPS_SIM != _ABIN32
|
||||
+#error
|
||||
+#endif
|
||||
+ ],[mips_abi="n32"],[AC_COMPILE_IFELSE([
|
||||
+#if _MIPS_SIM != _ABI64
|
||||
+#error
|
||||
+#endif
|
||||
+ ],[mips_abi="n64"],[AC_MSG_ERROR([unknown MIPS ABI])
|
||||
+ ])
|
||||
+ ])
|
||||
+ ])
|
||||
+ ;;
|
||||
+ esac
|
||||
AC_MSG_CHECKING([for seccomp architecture])
|
||||
seccomp_audit_arch=
|
||||
case "$host" in
|
||||
@ -0,0 +1,63 @@
|
||||
From afc3e31b637db9dae106d4fad78f7b481c8c24e3 Mon Sep 17 00:00:00 2001
|
||||
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
Date: Tue, 20 Jun 2017 16:42:28 +0100
|
||||
Subject: [PATCH] configure.ac: properly set seccomp_audit_arch for MIPS64
|
||||
|
||||
Currently seccomp_audit_arch is set to AUDIT_ARCH_MIPS64 or
|
||||
AUDIT_ARCH_MIPSEL64 (depending on the endinness) when openssh is built
|
||||
for MIPS64. However, that's only valid for n64 ABI. The right macros for
|
||||
n32 ABI defined in seccomp.h are AUDIT_ARCH_MIPS64N32 and
|
||||
AUDIT_ARCH_MIPSEL64N32, for big and little endian respectively.
|
||||
|
||||
Because of that an sshd built for MIPS64 n32 rejects connection attempts
|
||||
and the output of strace reveals that the problem is related to seccomp
|
||||
audit:
|
||||
|
||||
[pid 194] prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, {len=57,
|
||||
filter=0x555d5da0}) = 0
|
||||
[pid 194] write(7, "\0\0\0]\0\0\0\5\0\0\0Ulist_hostkey_types: "..., 97) = ?
|
||||
[pid 193] <... poll resumed> ) = 2 ([{fd=5, revents=POLLIN|POLLHUP},
|
||||
{fd=6, revents=POLLHUP}])
|
||||
[pid 194] +++ killed by SIGSYS +++
|
||||
|
||||
This patch fixes that problem by setting the right value to
|
||||
seccomp_audit_arch taking into account the MIPS64 ABI.
|
||||
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
[Upstream commit: https://github.com/openssh/openssh-portable/commit/afc3e31b637db9dae106d4fad78f7b481c8c24e3]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
configure.ac | 18 ++++++++++++++++--
|
||||
1 file changed, 16 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f990cfe08..5d640f679 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -801,10 +801,24 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
|
||||
seccomp_audit_arch=AUDIT_ARCH_MIPSEL
|
||||
;;
|
||||
mips64-*)
|
||||
- seccomp_audit_arch=AUDIT_ARCH_MIPS64
|
||||
+ case "$mips_abi" in
|
||||
+ "n32")
|
||||
+ seccomp_audit_arch=AUDIT_ARCH_MIPS64N32
|
||||
+ ;;
|
||||
+ "n64")
|
||||
+ seccomp_audit_arch=AUDIT_ARCH_MIPS64
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
mips64el-*)
|
||||
- seccomp_audit_arch=AUDIT_ARCH_MIPSEL64
|
||||
+ case "$mips_abi" in
|
||||
+ "n32")
|
||||
+ seccomp_audit_arch=AUDIT_ARCH_MIPSEL64N32
|
||||
+ ;;
|
||||
+ "n64")
|
||||
+ seccomp_audit_arch=AUDIT_ARCH_MIPSEL64
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
esac
|
||||
if test "x$seccomp_audit_arch" != "x" ; then
|
||||
@ -1,4 +1,2 @@
|
||||
# From http://www.openssh.com/txt/release-7.5 (base64 encoded)
|
||||
sha256 9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 openssh-7.5p1.tar.gz
|
||||
sha256 310860606c4175cdfd095e724f624df27340c89a916f7a09300bcb7988d5cfbf afc3e31b637db9dae106d4fad78f7b481c8c24e3.patch
|
||||
sha256 395aa1006967713b599555440e09f898781a5559e496223587401768ece10904 f4fcd8c788a4854d4ebae400cf55e3957f906835.patch
|
||||
|
||||
@ -9,11 +9,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
|
||||
OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain
|
||||
OPENSSH_LICENSE_FILES = LICENCE
|
||||
# Autoreconf needed due to the following patches modifying configure.ac:
|
||||
# f4fcd8c788a4854d4ebae400cf55e3957f906835.patch
|
||||
# afc3e31b637db9dae106d4fad78f7b481c8c24e3.patch
|
||||
# 0001-configure-ac-detect-mips-abi.patch
|
||||
# 0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch
|
||||
OPENSSH_AUTORECONF = YES
|
||||
OPENSSH_PATCH = https://github.com/openssh/openssh-portable/commit/f4fcd8c788a4854d4ebae400cf55e3957f906835.patch \
|
||||
https://github.com/openssh/openssh-portable/commit/afc3e31b637db9dae106d4fad78f7b481c8c24e3.patch
|
||||
OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
|
||||
OPENSSH_CONF_OPTS = \
|
||||
--sysconfdir=/etc/ssh \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user