diff options
Diffstat (limited to 'debian/patches/conch-old-privkey-format.patch')
-rw-r--r-- | debian/patches/conch-old-privkey-format.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/conch-old-privkey-format.patch b/debian/patches/conch-old-privkey-format.patch index 90bb3e995..40fe32898 100644 --- a/debian/patches/conch-old-privkey-format.patch +++ b/debian/patches/conch-old-privkey-format.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1d2a55436d4b556269f42ad5f7e16608b5a8ed74 Mon Sep 17 00:00:00 2001 | 1 | From 9c01e0ae9889c05bfe68b2f1f1c5e5019e63ff0b 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,7 +18,7 @@ Patch-Name: conch-old-privkey-format.patch | |||
18 | 3 files changed, 16 insertions(+), 3 deletions(-) | 18 | 3 files changed, 16 insertions(+), 3 deletions(-) |
19 | 19 | ||
20 | diff --git a/regress/Makefile b/regress/Makefile | 20 | diff --git a/regress/Makefile b/regress/Makefile |
21 | index 647b4a049..6e462a4f6 100644 | 21 | index 925edf71a..6fdfcc8ca 100644 |
22 | --- a/regress/Makefile | 22 | --- a/regress/Makefile |
23 | +++ b/regress/Makefile | 23 | +++ b/regress/Makefile |
24 | @@ -110,8 +110,9 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ | 24 | @@ -110,8 +110,9 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ |
@@ -47,10 +47,10 @@ index 199d863a0..c7df19fd4 100644 | |||
47 | 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} | 47 | 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY} |
48 | if [ $? -ne 0 ]; then | 48 | if [ $? -ne 0 ]; then |
49 | diff --git a/regress/test-exec.sh b/regress/test-exec.sh | 49 | diff --git a/regress/test-exec.sh b/regress/test-exec.sh |
50 | index 40d46e3cd..1bbd47f25 100644 | 50 | index b8e2009de..08338121b 100644 |
51 | --- a/regress/test-exec.sh | 51 | --- a/regress/test-exec.sh |
52 | +++ b/regress/test-exec.sh | 52 | +++ b/regress/test-exec.sh |
53 | @@ -504,6 +504,18 @@ REGRESS_INTEROP_CONCH=no | 53 | @@ -500,6 +500,18 @@ REGRESS_INTEROP_CONCH=no |
54 | if test -x "$CONCH" ; then | 54 | if test -x "$CONCH" ; then |
55 | REGRESS_INTEROP_CONCH=yes | 55 | REGRESS_INTEROP_CONCH=yes |
56 | fi | 56 | fi |