1 files changed, 19 insertions, 18 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index 2f7ac943d..734118a19 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From 26d9fe60e31c78018bdfd49bba1196ea7c44405d Mon Sep 17 00:00:00 2001
+From 3558be2914c0127489faae40ce2eae66142c3287 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-10-19
+Last-Update: 2020-02-21
 
 Patch-Name: keepalive-extensions.patch
 ---
@@ -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 a7fb7ca15..09787c0e5 100644
+index 0fc996871..2399208f8 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -177,6 +177,7 @@ typedef enum {
-        oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
+@@ -176,6 +176,7 @@ typedef enum {
         oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
         oPubkeyAcceptedKeyTypes, oCASignatureAlgorithms, oProxyJump,
+        oSecurityKeyProvider,
 +       oProtocolKeepAlives, oSetupTimeOut,
         oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported
  } OpCodes;
  
 @@ -326,6 +327,8 @@ static struct {
-        { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
         { "ignoreunknown", oIgnoreUnknown },
         { "proxyjump", oProxyJump },
+        { "securitykeyprovider", oSecurityKeyProvider },
 +       { "protocolkeepalives", oProtocolKeepAlives },
 +       { "setuptimeout", oSetupTimeOut },
  
         { NULL, oBadOption }
  };
-@@ -1449,6 +1452,8 @@ parse_keytypes:
+@@ -1495,6 +1498,8 @@ parse_keytypes:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -55,7 +55,7 @@ index a7fb7ca15..09787c0e5 100644
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -2142,8 +2147,13 @@ fill_default_options(Options * options)
+@@ -2198,8 +2203,13 @@ fill_default_options(Options * options)
                 options->rekey_interval = 0;
         if (options->verify_host_key_dns == -1)
                 options->verify_host_key_dns = 0;
@@ -72,24 +72,25 @@ index a7fb7ca15..09787c0e5 100644
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index f4668673b..bc04d8d02 100644
+index 3f4906972..3079db19b 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -265,8 +265,12 @@ Valid arguments are
- If set to
+@@ -266,9 +266,13 @@ If set to
  .Cm yes ,
- passphrase/password querying will be disabled.
+ user interaction such as password prompts and host key confirmation requests
+ will be disabled.
 +In addition, the
 +.Cm ServerAliveInterval
 +option will be set to 300 seconds by default (Debian-specific).
  This option is useful in scripts and other batch jobs where no user
--is present to supply the password.
-+is present to supply the password,
+ is present to interact with
+-.Xr ssh 1 .
++.Xr ssh 1 ,
 +and where it is desirable to detect a broken network swiftly.
  The argument must be
  .Cm yes
  or
-@@ -1557,7 +1561,14 @@ from the server,
+@@ -1593,7 +1597,14 @@ from the server,
  will send a message through the encrypted
  channel to request a response from the server.
  The default
@@ -105,7 +106,7 @@ index f4668673b..bc04d8d02 100644
  .It Cm SetEnv
  Directly specify one or more environment variables and their contents to
  be sent to the server.
-@@ -1637,6 +1648,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1673,6 +1684,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 +120,10 @@ index f4668673b..bc04d8d02 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 cec3c3c4e..eec224158 100644
+index f6b41a2f8..ebd09f891 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1615,6 +1615,9 @@ This avoids infinitely hanging sessions.
+@@ -1668,6 +1668,9 @@ This avoids infinitely hanging sessions.
  .Pp
  To disable TCP keepalive messages, the value should be set to
  .Cm no .