diff options
Diffstat (limited to 'debian/patches/conch-old-privkey-format.patch')
-rw-r--r-- | debian/patches/conch-old-privkey-format.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches/conch-old-privkey-format.patch b/debian/patches/conch-old-privkey-format.patch index ce7dc266e..b04c21060 100644 --- a/debian/patches/conch-old-privkey-format.patch +++ b/debian/patches/conch-old-privkey-format.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2e889a135439e6234502c813fa0ef2eb1fcd733c Mon Sep 17 00:00:00 2001 | 1 | From 311da721c2a5c6d147738e0699fa49d04cd5762a Mon Sep 17 00:00:00 2001 |
2 | From: Colin Watson <cjwatson@debian.org> | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Thu, 30 Aug 2018 00:58:56 +0100 | 3 | Date: Thu, 30 Aug 2018 00:58:56 +0100 |
4 | Subject: Work around conch interoperability failure | 4 | Subject: Work around conch interoperability failure |
@@ -18,10 +18,10 @@ Patch-Name: conch-old-privkey-format.patch | |||
18 | 3 files changed, 14 insertions(+), 2 deletions(-) | 18 | 3 files changed, 14 insertions(+), 2 deletions(-) |
19 | 19 | ||
20 | diff --git a/regress/Makefile b/regress/Makefile | 20 | diff --git a/regress/Makefile b/regress/Makefile |
21 | index 34c47e8cb..17e0a06e8 100644 | 21 | index 774c10d41..01e257a94 100644 |
22 | --- a/regress/Makefile | 22 | --- a/regress/Makefile |
23 | +++ b/regress/Makefile | 23 | +++ b/regress/Makefile |
24 | @@ -119,7 +119,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ | 24 | @@ -120,7 +120,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ |
25 | rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \ | 25 | rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \ |
26 | scp-ssh-wrapper.scp setuid-allowed sftp-server.log \ | 26 | scp-ssh-wrapper.scp setuid-allowed sftp-server.log \ |
27 | sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \ | 27 | sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \ |
@@ -29,7 +29,7 @@ index 34c47e8cb..17e0a06e8 100644 | |||
29 | + ssh-rsa_oldfmt ssh-rsa_oldfmt.pub \ | 29 | + ssh-rsa_oldfmt ssh-rsa_oldfmt.pub \ |
30 | ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \ | 30 | ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \ |
31 | ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \ | 31 | ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \ |
32 | sshd_config.orig sshd_proxy sshd_proxy.* sshd_proxy_bak \ | 32 | sshd_config.* sshd_proxy sshd_proxy.* sshd_proxy_bak \ |
33 | diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh | 33 | diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh |
34 | index 6678813a2..6ff5da20b 100644 | 34 | index 6678813a2..6ff5da20b 100644 |
35 | --- a/regress/conch-ciphers.sh | 35 | --- a/regress/conch-ciphers.sh |
@@ -44,10 +44,10 @@ index 6678813a2..6ff5da20b 100644 | |||
44 | 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} | 44 | 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} |
45 | if [ $? -ne 0 ]; then | 45 | if [ $? -ne 0 ]; then |
46 | diff --git a/regress/test-exec.sh b/regress/test-exec.sh | 46 | diff --git a/regress/test-exec.sh b/regress/test-exec.sh |
47 | index 508b93284..5e48bfbe3 100644 | 47 | index f5e3ee6f5..a3a40719f 100644 |
48 | --- a/regress/test-exec.sh | 48 | --- a/regress/test-exec.sh |
49 | +++ b/regress/test-exec.sh | 49 | +++ b/regress/test-exec.sh |
50 | @@ -510,6 +510,18 @@ REGRESS_INTEROP_CONCH=no | 50 | @@ -573,6 +573,18 @@ REGRESS_INTEROP_CONCH=no |
51 | if test -x "$CONCH" ; then | 51 | if test -x "$CONCH" ; then |
52 | REGRESS_INTEROP_CONCH=yes | 52 | REGRESS_INTEROP_CONCH=yes |
53 | fi | 53 | fi |