New upstream release (7.4p1).

1 files changed, 13 insertions, 13 deletions

diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
index 14ab7d34f..11378586d 100644
--- a/debian/patches/keepalive-extensions.patch
+++ b/debian/patches/keepalive-extensions.patch
@@ -1,4 +1,4 @@
-From 67c34f23edbcd0f39ebc2aadae9d33950bd1f98a Mon Sep 17 00:00:00 2001
+From 8f60ff6d23d4a1f8c347cf4b95267e00116f74fa 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 c0b7822..3a6c67b 100644
+index c1c3aae0..3efba242 100644
 --- a/readconf.c
 +++ b/readconf.c
 @@ -173,6 +173,7 @@ typedef enum {
@@ -46,7 +46,7 @@ index c0b7822..3a6c67b 100644
  
         { NULL, oBadOption }
  };
-@@ -1403,6 +1406,8 @@ parse_keytypes:
+@@ -1402,6 +1405,8 @@ parse_keytypes:
                 goto parse_flag;
  
         case oServerAliveInterval:
@@ -55,7 +55,7 @@ index c0b7822..3a6c67b 100644
                 intptr = &options->server_alive_interval;
                 goto parse_time;
  
-@@ -2048,8 +2053,13 @@ fill_default_options(Options * options)
+@@ -2047,8 +2052,13 @@ fill_default_options(Options * options)
                 options->rekey_interval = 0;
         if (options->verify_host_key_dns == -1)
                 options->verify_host_key_dns = 0;
@@ -72,12 +72,12 @@ index c0b7822..3a6c67b 100644
                 options->server_alive_count_max = 3;
         if (options->control_master == -1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index 707d0e1..efc265a 100644
+index a7703fc7..32fd100d 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -268,8 +268,12 @@ The default is
+@@ -250,8 +250,12 @@ Valid arguments are
  If set to
- .Dq yes ,
+ .Cm yes ,
  passphrase/password querying will be disabled.
 +In addition, the
 +.Cm ServerAliveInterval
@@ -87,9 +87,9 @@ index 707d0e1..efc265a 100644
 +is present to supply the password,
 +and where it is desirable to detect a broken network swiftly.
  The argument must be
- .Dq yes
+ .Cm yes
  or
-@@ -1624,7 +1628,14 @@ from the server,
+@@ -1485,7 +1489,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 707d0e1..efc265a 100644
  .It Cm StreamLocalBindMask
  Sets the octal file creation mode mask
  .Pq umask
-@@ -1690,6 +1701,12 @@ Specifies whether the system should send TCP keepalive messages to the
+@@ -1544,6 +1555,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,13 +119,13 @@ index 707d0e1..efc265a 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 3b4cba9..e05cdbe 100644
+index dd765b39..283ba889 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -1530,6 +1530,9 @@ This avoids infinitely hanging sessions.
+@@ -1427,6 +1427,9 @@ This avoids infinitely hanging sessions.
  .Pp
  To disable TCP keepalive messages, the value should be set to
- .Dq no .
+ .Cm no .
 +.Pp
 +This option was formerly called
 +.Cm KeepAlive .