net-misc/openssh: add upstream fix for building on s390

diff --git a/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch b/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch
new file mode 100644 (file)
index 0000000..d793200
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch
@@ -0,0 +1,27 @@
+From 58b8cfa2a062b72139d7229ae8de567f55776f24 Mon Sep 17 00:00:00 2001
+From: Damien Miller <djm@mindrot.org>
+Date: Wed, 22 Mar 2017 12:43:02 +1100
+Subject: [PATCH] Missing header on Linux/s390
+
+Patch from Jakub Jelen
+---
+ sandbox-seccomp-filter.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index a8d472a63ccb..2831e9d1083c 100644
+--- a/sandbox-seccomp-filter.c
++++ b/sandbox-seccomp-filter.c
+@@ -50,6 +50,9 @@
+ #include <elf.h>
+ 
+ #include <asm/unistd.h>
++#ifdef __s390__
++#include <asm/zcrypt.h>
++#endif
+ 
+ #include <errno.h>
+ #include <signal.h>
+-- 
+2.15.1
+

diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
index 0dbe3c7fa22b3deed40633bd1f61450d4b4f7751..83dcb1db429be5735c497c4010a51b66f4744fe2 100644 (file)
--- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
@@ -132,6 +132,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
        epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
        epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch
+       epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch
        use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
        use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
        use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch