New upstream release (8.1p1)

1 files changed, 9 insertions, 9 deletions

diff --git a/debian/patches/conch-old-privkey-format.patch b/debian/patches/conch-old-privkey-format.patch
index 3eaac8054..25c16526b 100644
--- a/debian/patches/conch-old-privkey-format.patch
+++ b/debian/patches/conch-old-privkey-format.patch
@@ -1,4 +1,4 @@
-From a20835ce2f9899305421bc478ba29d6524e89433 Mon Sep 17 00:00:00 2001
+From 46352085d71fe406537828a1cee3c2ce896eccb9 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Thu, 30 Aug 2018 00:58:56 +0100
 Subject: Work around conch interoperability failure
@@ -8,7 +8,7 @@ Twisted Conch fails to read private keys in the new format
 can be fixed in Twisted.
 
 Forwarded: not-needed
-Last-Update: 2019-06-14
+Last-Update: 2019-10-09
 
 Patch-Name: conch-old-privkey-format.patch
 ---
@@ -18,20 +18,20 @@ Patch-Name: conch-old-privkey-format.patch
  3 files changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/regress/Makefile b/regress/Makefile
-index 781400fd0..491a3a46a 100644
+index 34c47e8cb..17e0a06e8 100644
 --- a/regress/Makefile
 +++ b/regress/Makefile
-@@ -114,7 +114,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \
+@@ -119,7 +119,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \
                 rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
                 scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
-                sftp-server.sh sftp.log ssh-log-wrapper.sh \
+                sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \
 -               ssh-rsa_oldfmt \
 +               ssh-rsa_oldfmt ssh-rsa_oldfmt.pub \
-                ssh.log ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
+                ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
                 ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \
                 sshd_config.orig sshd_proxy sshd_proxy.* sshd_proxy_bak \
 diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
-index 51e3b705f..fa24552b0 100644
+index 6678813a2..6ff5da20b 100644
 --- a/regress/conch-ciphers.sh
 +++ b/regress/conch-ciphers.sh
 @@ -16,7 +16,7 @@ for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \
@@ -44,10 +44,10 @@ index 51e3b705f..fa24552b0 100644
             127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY}
         if [ $? -ne 0 ]; then
 diff --git a/regress/test-exec.sh b/regress/test-exec.sh
-index efde6a173..83c7d02e6 100644
+index 508b93284..5e48bfbe3 100644
 --- a/regress/test-exec.sh
 +++ b/regress/test-exec.sh
-@@ -500,6 +500,18 @@ REGRESS_INTEROP_CONCH=no
+@@ -510,6 +510,18 @@ REGRESS_INTEROP_CONCH=no
  if test -x "$CONCH" ; then
         REGRESS_INTEROP_CONCH=yes
  fi