commit: 987bc3f518ed55f6e888a0c6c40182b956e9935c Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Jun 11 22:44:35 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Jun 11 22:46:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987bc3f5
net-misc/openssh: disable conch interopt tests Bug: https://bugs.gentoo.org/605446 Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../openssh-7.5_p1-disable-conch-interop-tests.patch | 20 ++++++++++++++++++++ net-misc/openssh/openssh-7.5_p1-r4.ebuild | 1 + net-misc/openssh/openssh-7.6_p1-r4.ebuild | 1 + net-misc/openssh/openssh-7.6_p1-r5.ebuild | 1 + net-misc/openssh/openssh-7.7_p1-r4.ebuild | 1 + 5 files changed, 24 insertions(+) diff --git a/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch b/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch new file mode 100644 index 00000000000..a5647ce9d8d --- /dev/null +++ b/net-misc/openssh/files/openssh-7.5_p1-disable-conch-interop-tests.patch @@ -0,0 +1,20 @@ +Disable conch interop tests which are failing when called +via portage for yet unknown reason and because using conch +seems to be flaky (test is failing when using Python2 but +passing when using Python3). + +Bug: https://bugs.gentoo.org/605446 + +--- a/regress/conch-ciphers.sh ++++ b/regress/conch-ciphers.sh +@@ -3,6 +3,10 @@ + + tid="conch ciphers" + ++# https://bugs.gentoo.org/605446 ++echo "conch interop tests skipped due to Gentoo bug #605446" ++exit 0 ++ + if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then + echo "conch interop tests not enabled" + exit 0 diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild index 5574b9b318c..3deb8a130f7 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 diff --git a/net-misc/openssh/openssh-7.6_p1-r4.ebuild b/net-misc/openssh/openssh-7.6_p1-r4.ebuild index 01600c378d2..68ad3c2a252 100644 --- a/net-misc/openssh/openssh-7.6_p1-r4.ebuild +++ b/net-misc/openssh/openssh-7.6_p1-r4.ebuild @@ -110,6 +110,7 @@ src_prepare() { cp version.h version.h.pristine eapply "${FILESDIR}/${P}-warnings.patch" + eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die diff --git a/net-misc/openssh/openssh-7.6_p1-r5.ebuild b/net-misc/openssh/openssh-7.6_p1-r5.ebuild index 46f1d676f5f..4c84767d116 100644 --- a/net-misc/openssh/openssh-7.6_p1-r5.ebuild +++ b/net-misc/openssh/openssh-7.6_p1-r5.ebuild @@ -111,6 +111,7 @@ src_prepare() { eapply "${FILESDIR}/${P}-warnings.patch" eapply "${FILESDIR}/${P}-permitopen.patch" + eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch # don't break .ssh/authorized_keys2 for fun sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die diff --git a/net-misc/openssh/openssh-7.7_p1-r4.ebuild b/net-misc/openssh/openssh-7.7_p1-r4.ebuild index e884e0b9d3e..8c98892dfd2 100644 --- a/net-misc/openssh/openssh-7.7_p1-r4.ebuild +++ b/net-misc/openssh/openssh-7.7_p1-r4.ebuild @@ -112,6 +112,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch + eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch local PATCHSET_VERSION_MACROS=()
