From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7657138331 for ; Wed, 10 Jan 2018 08:35:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B27F2E0959; Wed, 10 Jan 2018 08:35:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90E13E0959 for ; Wed, 10 Jan 2018 08:35:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A285335C43 for ; Wed, 10 Jan 2018 08:35:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88330133 for ; Wed, 10 Jan 2018 08:35:00 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1515573245.a5f421f69f9d54cb9f3137ba0bf3e3d4a67bdd68.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/, net-misc/openssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-7.5_p1-s390-seccomp.patch net-misc/openssh/openssh-7.5_p1-r3.ebuild X-VCS-Directories: net-misc/openssh/files/ net-misc/openssh/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: a5f421f69f9d54cb9f3137ba0bf3e3d4a67bdd68 X-VCS-Branch: master Date: Wed, 10 Jan 2018 08:35:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: de20f21c-e01b-403b-acfe-90c346f4fc83 X-Archives-Hash: 70afbe94c8d7ba479736b5f2d5c8c50f commit: a5f421f69f9d54cb9f3137ba0bf3e3d4a67bdd68 Author: Mike Frysinger gentoo org> AuthorDate: Wed Jan 10 08:34:05 2018 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Jan 10 08:34:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f421f6 net-misc/openssh: add upstream fix for building on s390 .../files/openssh-7.5_p1-s390-seccomp.patch | 27 ++++++++++++++++++++++ net-misc/openssh/openssh-7.5_p1-r3.ebuild | 1 + 2 files changed, 28 insertions(+) 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 index 00000000000..d7932003f8f --- /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 +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 + + #include ++#ifdef __s390__ ++#include ++#endif + + #include + #include +-- +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 0dbe3c7fa22..83dcb1db429 100644 --- 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