New upstream release (8.1p1)

1 files changed, 9 insertions, 9 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index fbfe6a1fb..2f7ac943d 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From 4d8dd12bab7bbc954815d7953a0c86ce1687bd34 Mon Sep 17 00:00:00 2001
+From 26d9fe60e31c78018bdfd49bba1196ea7c44405d 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
@@ -26,7 +26,7 @@ Patch-Name: keepalive-extensions.patch
  3 files changed, 34 insertions(+), 4 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index 29f3bd98d..3d0b6ff90 100644
+index a7fb7ca15..09787c0e5 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -177,6 +177,7 @@ typedef enum {
@@ -46,7 +46,7 @@ index 29f3bd98d..3d0b6ff90 100644
  
         { NULL, oBadOption }
  };
-@@ -1440,6 +1443,8 @@ parse_keytypes:
+@@ -1449,6 +1452,8 @@ parse_keytypes:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -55,7 +55,7 @@ index 29f3bd98d..3d0b6ff90 100644
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -2133,8 +2138,13 @@ fill_default_options(Options * options)
+@@ -2142,8 +2147,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 29f3bd98d..3d0b6ff90 100644
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index c3c8b274a..250c92d04 100644
+index f4668673b..bc04d8d02 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -265,8 +265,12 @@ Valid arguments are
@@ -89,7 +89,7 @@ index c3c8b274a..250c92d04 100644
  The argument must be
  .Cm yes
  or
-@@ -1535,7 +1539,14 @@ from the server,
+@@ -1557,7 +1561,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 c3c8b274a..250c92d04 100644
  .It Cm SetEnv
  Directly specify one or more environment variables and their contents to
  be sent to the server.
-@@ -1615,6 +1626,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1637,6 +1648,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 c3c8b274a..250c92d04 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 2baa6622b..2ef671d1b 100644
+index cec3c3c4e..eec224158 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1597,6 +1597,9 @@ This avoids infinitely hanging sessions.
+@@ -1615,6 +1615,9 @@ This avoids infinitely hanging sessions.
  .Pp
  To disable TCP keepalive messages, the value should be set to
  .Cm no .