| 1 |
commit: a5f421f69f9d54cb9f3137ba0bf3e3d4a67bdd68 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 10 08:34:05 2018 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 10 08:34:05 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f421f6 |
| 7 |
|
| 8 |
net-misc/openssh: add upstream fix for building on s390 |
| 9 |
|
| 10 |
.../files/openssh-7.5_p1-s390-seccomp.patch | 27 ++++++++++++++++++++++ |
| 11 |
net-misc/openssh/openssh-7.5_p1-r3.ebuild | 1 + |
| 12 |
2 files changed, 28 insertions(+) |
| 13 |
|
| 14 |
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 |
| 15 |
new file mode 100644 |
| 16 |
index 00000000000..d7932003f8f |
| 17 |
--- /dev/null |
| 18 |
+++ b/net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch |
| 19 |
@@ -0,0 +1,27 @@ |
| 20 |
+From 58b8cfa2a062b72139d7229ae8de567f55776f24 Mon Sep 17 00:00:00 2001 |
| 21 |
+From: Damien Miller <djm@×××××××.org> |
| 22 |
+Date: Wed, 22 Mar 2017 12:43:02 +1100 |
| 23 |
+Subject: [PATCH] Missing header on Linux/s390 |
| 24 |
+ |
| 25 |
+Patch from Jakub Jelen |
| 26 |
+--- |
| 27 |
+ sandbox-seccomp-filter.c | 3 +++ |
| 28 |
+ 1 file changed, 3 insertions(+) |
| 29 |
+ |
| 30 |
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c |
| 31 |
+index a8d472a63ccb..2831e9d1083c 100644 |
| 32 |
+--- a/sandbox-seccomp-filter.c |
| 33 |
++++ b/sandbox-seccomp-filter.c |
| 34 |
+@@ -50,6 +50,9 @@ |
| 35 |
+ #include <elf.h> |
| 36 |
+ |
| 37 |
+ #include <asm/unistd.h> |
| 38 |
++#ifdef __s390__ |
| 39 |
++#include <asm/zcrypt.h> |
| 40 |
++#endif |
| 41 |
+ |
| 42 |
+ #include <errno.h> |
| 43 |
+ #include <signal.h> |
| 44 |
+-- |
| 45 |
+2.15.1 |
| 46 |
+ |
| 47 |
|
| 48 |
diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild |
| 49 |
index 0dbe3c7fa22..83dcb1db429 100644 |
| 50 |
--- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild |
| 51 |
+++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild |
| 52 |
@@ -132,6 +132,7 @@ src_prepare() { |
| 53 |
epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch |
| 54 |
epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch |
| 55 |
epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch |
| 56 |
+ epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch |
| 57 |
use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} |
| 58 |
use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch |
| 59 |
use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch |
Archives