net-misc/openssh: disable conch interopt tests

Bug: https://bugs.gentoo.org/605446
Package-Manager: Portage-2.3.40, Repoman-2.3.9

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 (file)
index 0000000..a5647ce
--- /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 5574b9b318caf1903bfb3bc02e7817b4bd3696e6..3deb8a130f701eb58de9afc09c4f9c4b728d4a47 100644 (file)
--- 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 01600c378d297f540b0ed6f0d2572b140402a0a7..68ad3c2a2529c88e09cddf7d531aa05d567ae08e 100644 (file)
--- 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 46f1d676f5f39245e2e2a7c82d8d4e5ec0ce5905..4c84767d11694c9853786ac842823c74a8c85d91 100644 (file)
--- 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 e884e0b9d3e681542e5ced3679e97f0add8f435c..8c98892dfd2b68b4bd8506ab8cde40b2499a7d17 100644 (file)
--- 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=()