1 files changed, 12 insertions, 12 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index fc052ea73..4207302c3 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From 2c0a1fef2aaf16c5b97694139239797f0ea33d27 Mon Sep 17 00:00:00 2001
+From 7ba31c6ff505278fb9f33b695605ca3a093caba2 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
@@ -16,7 +16,7 @@ keepalives.
 Author: Ian Jackson <ian@chiark.greenend.org.uk>
 Author: Matthew Vernon <matthew@debian.org>
 Author: Colin Watson <cjwatson@debian.org>
-Last-Update: 2018-08-24
+Last-Update: 2018-10-19
 
 Patch-Name: keepalive-extensions.patch
 ---
@@ -26,18 +26,18 @@ Patch-Name: keepalive-extensions.patch
  3 files changed, 34 insertions(+), 4 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index 6e26ba32d..3fd0fe7b7 100644
+index 5e655e924..052d4b1ac 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -175,6 +175,7 @@ typedef enum {
         oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
         oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
-        oPubkeyAcceptedKeyTypes, oProxyJump,
+        oPubkeyAcceptedKeyTypes, oCASignatureAlgorithms, oProxyJump,
 +       oProtocolKeepAlives, oSetupTimeOut,
         oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported
  } OpCodes;
  
-@@ -321,6 +322,8 @@ static struct {
+@@ -322,6 +323,8 @@ static struct {
         { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
         { "ignoreunknown", oIgnoreUnknown },
         { "proxyjump", oProxyJump },
@@ -46,7 +46,7 @@ index 6e26ba32d..3fd0fe7b7 100644
  
         { NULL, oBadOption }
  };
-@@ -1401,6 +1404,8 @@ parse_keytypes:
+@@ -1415,6 +1418,8 @@ parse_keytypes:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -55,7 +55,7 @@ index 6e26ba32d..3fd0fe7b7 100644
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -2075,8 +2080,13 @@ fill_default_options(Options * options)
+@@ -2101,8 +2106,13 @@ fill_default_options(Options * options)
                 options->rekey_interval = 0;
         if (options->verify_host_key_dns == -1)
                 options->verify_host_key_dns = 0;
@@ -72,7 +72,7 @@ index 6e26ba32d..3fd0fe7b7 100644
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index 5b99921b4..86ada128e 100644
+index 16c79368a..54e143c93 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -247,8 +247,12 @@ Valid arguments are
@@ -89,7 +89,7 @@ index 5b99921b4..86ada128e 100644
  The argument must be
  .Cm yes
  or
-@@ -1463,7 +1467,14 @@ from the server,
+@@ -1485,7 +1489,14 @@ from the server,
  will send a message through the encrypted
  channel to request a response from the server.
  The default
@@ -105,7 +105,7 @@ index 5b99921b4..86ada128e 100644
  .It Cm SetEnv
  Directly specify one or more environment variables and their contents to
  be sent to the server.
-@@ -1543,6 +1554,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1565,6 +1576,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.
@@ -119,10 +119,10 @@ index 5b99921b4..86ada128e 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 a0ac717c7..0fbbccbde 100644
+index 985eef5a2..e7e55dd71 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1566,6 +1566,9 @@ This avoids infinitely hanging sessions.
+@@ -1577,6 +1577,9 @@ This avoids infinitely hanging sessions.
  .Pp
  To disable TCP keepalive messages, the value should be set to
  .Cm no .