summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-06-12 00:44:35 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-06-12 00:46:57 +0200
commit987bc3f518ed55f6e888a0c6c40182b956e9935c (patch)
tree16f0a3b48b98f2b91d7b6969f0ebe6256b294f34 /net-misc/openssh/openssh-7.5_p1-r4.ebuild
parentsys-kernel/gentoo-sources: (diff)
downloadgentoo-987bc3f518ed55f6e888a0c6c40182b956e9935c.tar.gz
gentoo-987bc3f518ed55f6e888a0c6c40182b956e9935c.tar.bz2
gentoo-987bc3f518ed55f6e888a0c6c40182b956e9935c.zip
net-misc/openssh: disable conch interopt tests
Bug: https://bugs.gentoo.org/605446 Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'net-misc/openssh/openssh-7.5_p1-r4.ebuild')
-rw-r--r--net-misc/openssh/openssh-7.5_p1-r4.ebuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
index 5574b9b318ca..3deb8a130f70 100644
--- a/net-misc/openssh/openssh-7.5_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
@@ -130,6 +130,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+ epatch "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch
use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252