1 files changed, 18 insertions, 18 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index 680701f3d..15acabc0e 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From 81540b7886fdc73c7be304706ea33d6d87b5fc81 Mon Sep 17 00:00:00 2001
+From bd3abc2f732da3a61e4158b915480808957a4357 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: 2013-09-14
+Last-Update: 2014-10-07
 
 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 bcd8cad..6409937 100644
+index bc879eb..337818c 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -151,6 +151,7 @@ typedef enum {
-        oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
+@@ -153,6 +153,7 @@ typedef enum {
         oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots,
         oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs,
+        oStreamLocalBindMask, oStreamLocalBindUnlink,
 +       oProtocolKeepAlives, oSetupTimeOut,
         oIgnoredUnknownOption, oDeprecated, oUnsupported
  } OpCodes;
  
-@@ -274,6 +275,8 @@ static struct {
-        { "canonicalizemaxdots", oCanonicalizeMaxDots },
-        { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },
+@@ -278,6 +279,8 @@ static struct {
+        { "streamlocalbindmask", oStreamLocalBindMask },
+        { "streamlocalbindunlink", oStreamLocalBindUnlink },
         { "ignoreunknown", oIgnoreUnknown },
 +       { "protocolkeepalives", oProtocolKeepAlives },
 +       { "setuptimeout", oSetupTimeOut },
  
         { NULL, oBadOption }
  };
-@@ -1247,6 +1250,8 @@ parse_int:
+@@ -1271,6 +1274,8 @@ parse_int:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -55,7 +55,7 @@ index bcd8cad..6409937 100644
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -1746,8 +1751,13 @@ fill_default_options(Options * options)
+@@ -1791,8 +1796,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 bcd8cad..6409937 100644
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index 473971e..3172fd4 100644
+index 01f1f7f..ea92ea8 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -205,8 +205,12 @@ Valid arguments are
@@ -89,7 +89,7 @@ index 473971e..3172fd4 100644
  The argument must be
  .Dq yes
  or
-@@ -1305,8 +1309,15 @@ from the server,
+@@ -1336,8 +1340,15 @@ from the server,
  will send a message through the encrypted
  channel to request a response from the server.
  The default
@@ -103,10 +103,10 @@ index 473971e..3172fd4 100644
 +and
 +.Cm SetupTimeOut
 +are Debian-specific compatibility aliases for this option.
- .It Cm StrictHostKeyChecking
- If this flag is set to
- .Dq yes ,
-@@ -1345,6 +1356,12 @@ Specifies whether the system should send TCP keepalive messages to the
+ .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
  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 473971e..3172fd4 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 ceed88a..2164d58 100644
+index c8b43da..2843048 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1183,6 +1183,9 @@ This avoids infinitely hanging sessions.
+@@ -1307,6 +1307,9 @@ This avoids infinitely hanging sessions.
  .Pp
  To disable TCP keepalive messages, the value should be set to
  .Dq no .