diff options
author | Colin Watson <cjwatson@debian.org> | 2015-12-03 17:05:31 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2015-12-03 17:07:25 +0000 |
commit | 72ad2a8d69daa14c8e91283e9aa8be38099cd473 (patch) | |
tree | 1aca64273a78c4f077ed2236ce63387f97d8d456 /debian/patches/debian-config.patch | |
parent | 7e19629e278bdcd6cb1885da7a26110f12724030 (diff) | |
parent | c975d37df187e00832d6b6070731b8a8c16a6f56 (diff) |
Drop SSH1 keepalive patch. Now that SSH1 is disabled at compile-time, it's been rejected upstream and there isn't much point carrying it any more.
Diffstat (limited to 'debian/patches/debian-config.patch')
-rw-r--r-- | debian/patches/debian-config.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index ddc9de44a..7a78e5765 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 733c4de05612fe398ac3dc7d31d318d7012fda05 Mon Sep 17 00:00:00 2001 | 1 | From c975d37df187e00832d6b6070731b8a8c16a6f56 Mon Sep 17 00:00:00 2001 |
2 | From: Colin Watson <cjwatson@debian.org> | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:18 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:18 +0000 |
4 | Subject: Various Debian-specific configuration changes | 4 | Subject: Various Debian-specific configuration changes |
@@ -107,7 +107,7 @@ index 228e5ab..c9386aa 100644 | |||
107 | + GSSAPIAuthentication yes | 107 | + GSSAPIAuthentication yes |
108 | + GSSAPIDelegateCredentials no | 108 | + GSSAPIDelegateCredentials no |
109 | diff --git a/ssh_config.5 b/ssh_config.5 | 109 | diff --git a/ssh_config.5 b/ssh_config.5 |
110 | index 680ca17..981197d 100644 | 110 | index d4928b8..81b9b74 100644 |
111 | --- a/ssh_config.5 | 111 | --- a/ssh_config.5 |
112 | +++ b/ssh_config.5 | 112 | +++ b/ssh_config.5 |
113 | @@ -74,6 +74,22 @@ Since the first obtained value for each parameter is used, more | 113 | @@ -74,6 +74,22 @@ Since the first obtained value for each parameter is used, more |