New upstream release (7.0p1).

1 files changed, 14 insertions, 14 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index 3f425f225..9c6fdca0b 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From 302a74ce4e7eb60564410f482cb5778a3dec2e96 Mon Sep 17 00:00:00 2001
+From 25698ed1091d932244f94e7c802dce05c458749a 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: 2015-08-19
+Last-Update: 2015-11-29
 
 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 85eea48..5c5890c 100644
+index 522ad37..46c343f 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -159,6 +159,7 @@ typedef enum {
-        oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
+@@ -160,6 +160,7 @@ typedef enum {
         oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
         oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
+        oPubkeyAcceptedKeyTypes,
 +       oProtocolKeepAlives, oSetupTimeOut,
         oIgnoredUnknownOption, oDeprecated, oUnsupported
  } OpCodes;
  
-@@ -288,6 +289,8 @@ static struct {
-        { "updatehostkeys", oUpdateHostkeys },
+@@ -290,6 +291,8 @@ static struct {
         { "hostbasedkeytypes", oHostbasedKeyTypes },
+        { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
         { "ignoreunknown", oIgnoreUnknown },
 +       { "protocolkeepalives", oProtocolKeepAlives },
 +       { "setuptimeout", oSetupTimeOut },
  
         { NULL, oBadOption }
  };
-@@ -1299,6 +1302,8 @@ parse_int:
+@@ -1304,6 +1307,8 @@ parse_keytypes:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -55,7 +55,7 @@ index 85eea48..5c5890c 100644
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -1858,8 +1863,13 @@ fill_default_options(Options * options)
+@@ -1856,8 +1861,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 85eea48..5c5890c 100644
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index e60a5b4..67e0dff 100644
+index 82dcf0c..f517159 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -233,8 +233,12 @@ Valid arguments are
@@ -89,7 +89,7 @@ index e60a5b4..67e0dff 100644
  The argument must be
  .Dq yes
  or
-@@ -1427,8 +1431,15 @@ from the server,
+@@ -1479,8 +1483,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 e60a5b4..67e0dff 100644
  .It Cm StreamLocalBindMask
  Sets the octal file creation mode mask
  .Pq umask
-@@ -1494,6 +1505,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1546,6 +1557,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 e60a5b4..67e0dff 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 68424f1..1269bbd 100644
+index 712f620..154e87e 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1443,6 +1443,9 @@ This avoids infinitely hanging sessions.
+@@ -1510,6 +1510,9 @@ This avoids infinitely hanging sessions.
  .Pp
  To disable TCP keepalive messages, the value should be set to
  .Dq no .