New upstream release (6.8p1).

1 files changed, 17 insertions, 17 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index 15acabc0e..0adfbd2b5 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From bd3abc2f732da3a61e4158b915480808957a4357 Mon Sep 17 00:00:00 2001
+From 7efad61f1e562f504a5ff3fb0ae90ac05a208e66 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: 2014-10-07
+Last-Update: 2015-08-19
 
 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 bc879eb..337818c 100644
+index 278fe15..1d2d596 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -153,6 +153,7 @@ typedef enum {
-        oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
+@@ -159,6 +159,7 @@ typedef enum {
         oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
-        oStreamLocalBindMask, oStreamLocalBindUnlink,
+        oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
+        oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
 +       oProtocolKeepAlives, oSetupTimeOut,
         oIgnoredUnknownOption, oDeprecated, oUnsupported
  } OpCodes;
  
-@@ -278,6 +279,8 @@ static struct {
-        { "streamlocalbindmask", oStreamLocalBindMask },
-        { "streamlocalbindunlink", oStreamLocalBindUnlink },
+@@ -288,6 +289,8 @@ static struct {
+        { "updatehostkeys", oUpdateHostkeys },
+        { "hostbasedkeytypes", oHostbasedKeyTypes },
         { "ignoreunknown", oIgnoreUnknown },
 +       { "protocolkeepalives", oProtocolKeepAlives },
 +       { "setuptimeout", oSetupTimeOut },
  
         { NULL, oBadOption }
  };
-@@ -1271,6 +1274,8 @@ parse_int:
+@@ -1299,6 +1302,8 @@ parse_int:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -55,7 +55,7 @@ index bc879eb..337818c 100644
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -1791,8 +1796,13 @@ fill_default_options(Options * options)
+@@ -1858,8 +1863,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 bc879eb..337818c 100644
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index 01f1f7f..ea92ea8 100644
+index dd35dd8..250c0d1 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -205,8 +205,12 @@ Valid arguments are
+@@ -233,8 +233,12 @@ Valid arguments are
  If set to
  .Dq yes ,
  passphrase/password querying will be disabled.
@@ -89,7 +89,7 @@ index 01f1f7f..ea92ea8 100644
  The argument must be
  .Dq yes
  or
-@@ -1336,8 +1340,15 @@ from the server,
+@@ -1420,8 +1424,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 01f1f7f..ea92ea8 100644
  .It Cm StreamLocalBindMask
  Sets the octal file creation mode mask
  .Pq umask
-@@ -1403,6 +1414,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1487,6 +1498,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 01f1f7f..ea92ea8 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 c8b43da..2843048 100644
+index 0331496..d14576e 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1307,6 +1307,9 @@ This avoids infinitely hanging sessions.
+@@ -1392,6 +1392,9 @@ This avoids infinitely hanging sessions.
  .Pp
  To disable TCP keepalive messages, the value should be set to
  .Dq no .