summaryrefslogtreecommitdiff
path: root/debian/patches/ssh-vulnkey-compat.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-06-07 10:19:24 +0100
committerColin Watson <cjwatson@debian.org>2020-06-07 11:03:12 +0100
commit30337f8b66c66af6b368d1e3c789e75f1247176c (patch)
tree17e0b8652fea31c04faa19ffc4cd088552ee473a /debian/patches/ssh-vulnkey-compat.patch
parentaef2be11c5ea90bc66e774923e6570213e54c195 (diff)
parent39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff)
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'debian/patches/ssh-vulnkey-compat.patch')
-rw-r--r--debian/patches/ssh-vulnkey-compat.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/ssh-vulnkey-compat.patch b/debian/patches/ssh-vulnkey-compat.patch
index 99116e9c4..cc2656bda 100644
--- a/debian/patches/ssh-vulnkey-compat.patch
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -1,4 +1,4 @@
1From 11d571f137c76d8c2e38b1c1a537b04cc279f8e3 Mon Sep 17 00:00:00 2001 1From 6ed578a01fd61f9c930ef46cfefc467203ddd6c0 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com> 2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:09:50 +0000 3Date: Sun, 9 Feb 2014 16:09:50 +0000
4Subject: Accept obsolete ssh-vulnkey configuration options 4Subject: Accept obsolete ssh-vulnkey configuration options
@@ -17,7 +17,7 @@ Patch-Name: ssh-vulnkey-compat.patch
17 2 files changed, 2 insertions(+) 17 2 files changed, 2 insertions(+)
18 18
19diff --git a/readconf.c b/readconf.c 19diff --git a/readconf.c b/readconf.c
20index da8022dd0..0fc996871 100644 20index fb585e248..2ccc48572 100644
21--- a/readconf.c 21--- a/readconf.c
22+++ b/readconf.c 22+++ b/readconf.c
23@@ -191,6 +191,7 @@ static struct { 23@@ -191,6 +191,7 @@ static struct {
@@ -29,7 +29,7 @@ index da8022dd0..0fc996871 100644
29 { "useroaming", oDeprecated }, 29 { "useroaming", oDeprecated },
30 { "usersh", oDeprecated }, 30 { "usersh", oDeprecated },
31diff --git a/servconf.c b/servconf.c 31diff --git a/servconf.c b/servconf.c
32index 191575a16..bf3cd84a4 100644 32index f38ba9e44..ff5b9436c 100644
33--- a/servconf.c 33--- a/servconf.c
34+++ b/servconf.c 34+++ b/servconf.c
35@@ -656,6 +656,7 @@ static struct { 35@@ -656,6 +656,7 @@ static struct {