disable conch interoperability tests

python-TwistedConch version in PLD appears to be too ancient

diff --git a/openssh-skip-interop-tests.patch b/openssh-skip-interop-tests.patch
new file mode 100644 (file)
index 0000000..d926d35
--- /dev/null
+++ b/openssh-skip-interop-tests.patch
@@ -0,0 +1,20 @@
+diff -urN openssh-8.1p1.orig/regress/Makefile openssh-8.1p1/regress/Makefile
+--- openssh-8.1p1.orig/regress/Makefile        2019-10-17 20:31:40.094507942 +0200
++++ openssh-8.1p1/regress/Makefile     2019-10-17 20:30:38.567986269 +0200
+@@ -225,8 +225,14 @@
+ t-exec-interop:       ${INTEROP_TESTS:=.sh}
+       @if [ "x$?" = "x" ]; then exit 0; fi; \
+       for TEST in ""$?; do \
+-              echo "run test $${TEST}" ... 1>&2; \
+-              (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
++              skip=no; \
++              for t in ""$${SKIP_LTESTS}; do \
++                      if [ "x$${t}.sh" = "x$${TEST}" ]; then skip=yes; fi; \
++              done; \
++              if [ "x$${skip}" = "xno" ]; then \
++                      echo "run test $${TEST}" ... 1>&2; \
++                      (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
++              fi; \
+       done
+ 
+ t-extra:      ${EXTRA_TESTS:=.sh}

diff --git a/openssh.spec b/openssh.spec
index 2da6bbafa025d115ed063b22c26aae0bb2ccadea..5321c057032041d69f8e717407f970ca331c69a1 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -15,6 +15,7 @@
 %bcond_without libseccomp      # use libseccomp for seccomp privsep (requires 3.5 kernel)
 %bcond_with    hpn             # High Performance SSH/SCP - HPN-SSH including Cipher NONE (broken too often)
 %bcond_without tests           # test suite
+%bcond_with    tests_conch     # run conch interoperability tests
 
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
@@ -70,6 +71,7 @@ Patch9:               %{name}-5.2p1-hpn13v6.diff
 Patch10:       %{name}-include.patch
 Patch11:       %{name}-chroot.patch
 Patch12:       openssh-bug-2905.patch
+Patch13:       %{name}-skip-interop-tests.patch
 
 Patch14:       %{name}-bind.patch
 Patch15:       %{name}-disable_ldap.patch
@@ -89,6 +91,9 @@ BuildRequires:        libseccomp-devel
 BuildRequires: openssl-devel >= 1.1.0g
 BuildRequires: pam-devel
 %{?with_gtk:BuildRequires:     pkgconfig}
+%if %{with tests} && %{with tests_conch}
+BuildRequires: python-TwistedConch
+%endif
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.627
 BuildRequires: sed >= 4.0
@@ -536,6 +541,7 @@ openldap-a.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %patch14 -p1
 %{!?with_ldap:%patch15 -p1}
@@ -593,7 +599,10 @@ echo '#define LOGIN_PROGRAM                   "/bin/login"' >>config.h
 %if %{with tests}
 %{__make} -j1 tests \
        TEST_SSH_PORT=$((4242 + ${RANDOM:-$$} % 1000)) \
-       TEST_SSH_TRACE="yes"
+       TEST_SSH_TRACE="yes" \
+%if %{without tests_conch}
+       SKIP_LTESTS="conch-ciphers"
+%endif
 %endif
 
 cd contrib