1 files changed, 17 insertions, 17 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index e22410298..84da73ae0 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From bd3d91c378d549aed56246ad4535aea29db04150 Mon Sep 17 00:00:00 2001
+From 043f937820e1152df2c8416f37e6c8d923fc1811 Mon Sep 17 00:00:00 2001
 From: Richard Kettlewell <rjk@greenend.org.uk>
 Date: Sun, 9 Feb 2014 16:09:52 +0000
 Subject: Various keepalive extensions
@@ -26,27 +26,27 @@ Patch-Name: keepalive-extensions.patch
  3 files changed, 34 insertions(+), 4 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index 915a0f7..dab7963 100644
+index 2a1fe8e..e79e355 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -140,6 +140,7 @@ typedef enum {
-        oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
-        oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
-        oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown,
+@@ -150,6 +150,7 @@ typedef enum {
+        oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
+        oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
+        oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
 +       oProtocolKeepAlives, oSetupTimeOut,
         oIgnoredUnknownOption, oDeprecated, oUnsupported
  } OpCodes;
  
-@@ -262,6 +263,8 @@ static struct {
-        { "ipqos", oIPQoS },
-        { "requesttty", oRequestTTY },
+@@ -279,6 +280,8 @@ static struct {
+        { "canonicalizemaxdots", oCanonicalizeMaxDots },
+        { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },
         { "ignoreunknown", oIgnoreUnknown },
 +       { "protocolkeepalives", oProtocolKeepAlives },
 +       { "setuptimeout", oSetupTimeOut },
  
         { NULL, oBadOption }
  };
-@@ -934,6 +937,8 @@ parse_int:
+@@ -1245,6 +1248,8 @@ parse_int:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -55,7 +55,7 @@ index 915a0f7..dab7963 100644
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -1396,8 +1401,13 @@ fill_default_options(Options * options)
+@@ -1724,8 +1729,13 @@ fill_default_options(Options * options)
                 options->rekey_interval = 0;
         if (options->verify_host_key_dns == -1)
                 options->verify_host_key_dns = 0;
@@ -72,10 +72,10 @@ index 915a0f7..dab7963 100644
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index 1fc0a6b..6948680 100644
+index 617a312..b3c5dc6 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -136,8 +136,12 @@ Valid arguments are
+@@ -205,8 +205,12 @@ Valid arguments are
  If set to
  .Dq yes ,
  passphrase/password querying will be disabled.
@@ -89,7 +89,7 @@ index 1fc0a6b..6948680 100644
  The argument must be
  .Dq yes
  or
-@@ -1141,8 +1145,15 @@ from the server,
+@@ -1299,8 +1303,15 @@ from the server,
  will send a message through the encrypted
  channel to request a response from the server.
  The default
@@ -106,7 +106,7 @@ index 1fc0a6b..6948680 100644
  .It Cm StrictHostKeyChecking
  If this flag is set to
  .Dq yes ,
-@@ -1181,6 +1192,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1339,6 +1350,12 @@ Specifies whether the system should send TCP keepalive messages to the
  other side.
  If they are sent, death of the connection or crash of one
  of the machines will be properly noticed.
@@ -120,10 +120,10 @@ index 1fc0a6b..6948680 100644
  connections will die if the route is down temporarily, and some people
  find it annoying.
 diff --git a/sshd_config.5 b/sshd_config.5
-index 525d9c8..e29604a 100644
+index 9aa9eba..39643de 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1147,6 +1147,9 @@ This avoids infinitely hanging sessions.
+@@ -1168,6 +1168,9 @@ This avoids infinitely hanging sessions.
  .Pp
  To disable TCP keepalive messages, the value should be set to
  .Dq no .