| 1 |
commit: 16d75c9f2126651d2d65ab9bdbd7dacfbe1065c8 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 12 13:30:34 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 12 13:30:34 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d75c9f |
| 7 |
|
| 8 |
net-misc/openssh: Exclude s390-seccomp.patch w/ USE=X509 - already in X509 patch set |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/644252 |
| 11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 12 |
|
| 13 |
net-misc/openssh/openssh-7.5_p1-r3.ebuild | 4 ++-- |
| 14 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild |
| 17 |
index 1f173bc6211..a3c62aa567f 100644 |
| 18 |
--- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild |
| 19 |
+++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2017 Gentoo Foundation |
| 22 |
+# Copyright 1999-2018 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI="5" |
| 26 |
@@ -132,7 +132,7 @@ src_prepare() { |
| 27 |
epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch |
| 28 |
epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch |
| 29 |
epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch |
| 30 |
- epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch |
| 31 |
+ use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252 |
| 32 |
use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*} |
| 33 |
use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch |
| 34 |
use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch |
Archives