summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/fix-regress-putty-transfer.patch37
-rw-r--r--debian/patches/series1
2 files changed, 38 insertions, 0 deletions
diff --git a/debian/patches/fix-regress-putty-transfer.patch b/debian/patches/fix-regress-putty-transfer.patch
new file mode 100644
index 000000000..cfec3a9d2
--- /dev/null
+++ b/debian/patches/fix-regress-putty-transfer.patch
@@ -0,0 +1,37 @@
1From bd081a1ae125c7c6b2cfec89746d1298a306ad78 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Tue, 16 Jan 2018 17:38:36 +0000
4Subject: Fix putty-transfer regression test
5
6The test key file is still called putty.rsa2, not putty.rsa.
7
8Forwarded: no
9Last-Update: 2018-01-16
10
11Patch-Name: fix-regress-putty-transfer.patch
12---
13 regress/putty-transfer.sh | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh
17index 32c79f9e..57e46540 100644
18--- a/regress/putty-transfer.sh
19+++ b/regress/putty-transfer.sh
20@@ -15,7 +15,7 @@ for c in 0 1 ; do
21 ${OBJ}/.putty/sessions/compression_$c
22 echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k
23 env HOME=$PWD ${PLINK} -load compression_$c -batch \
24- -i putty.rsa cat ${DATA} > ${COPY}
25+ -i putty.rsa2 cat ${DATA} > ${COPY}
26 if [ $? -ne 0 ]; then
27 fail "ssh cat $DATA failed"
28 fi
29@@ -26,7 +26,7 @@ for c in 0 1 ; do
30 rm -f ${COPY}
31 dd if=$DATA obs=${s} 2> /dev/null | \
32 env HOME=$PWD ${PLINK} -load compression_$c \
33- -batch -i putty.rsa \
34+ -batch -i putty.rsa2 \
35 "cat > ${COPY}"
36 if [ $? -ne 0 ]; then
37 fail "ssh cat $DATA failed"
diff --git a/debian/patches/series b/debian/patches/series
index 7b9d0e39b..01aa2c87c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ seccomp-s390-flock-ipc.patch
27seccomp-getuid-geteuid.patch 27seccomp-getuid-geteuid.patch
28seccomp-s390-ioctl-ep11-crypto.patch 28seccomp-s390-ioctl-ep11-crypto.patch
29permitopen-argument-handling.patch 29permitopen-argument-handling.patch
30fix-regress-putty-transfer.patch