New upstream release (7.7p1)

1 files changed, 14 insertions, 14 deletions

diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index a3f595752..e90cbe8d9 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
-From 4847e512c0b94c615b838904a5f139a761bee284 Mon Sep 17 00:00:00 2001
+From 279cd9cd9a66daac701328cb0c53863e2bb5ab02 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:18 +0000
 Subject: Various Debian-specific configuration changes
@@ -39,10 +39,10 @@ Patch-Name: debian-config.patch
  6 files changed, 77 insertions(+), 9 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index be3d5873..41f36aa8 100644
+index 50349e23..efcf2d62 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1940,7 +1940,7 @@ fill_default_options(Options * options)
+@@ -1916,7 +1916,7 @@ fill_default_options(Options * options)
         if (options->forward_x11 == -1)
                 options->forward_x11 = 0;
         if (options->forward_x11_trusted == -1)
@@ -52,10 +52,10 @@ index be3d5873..41f36aa8 100644
                 options->forward_x11_timeout = 1200;
         /*
 diff --git a/ssh.1 b/ssh.1
-index 711fe608..f1b01c56 100644
+index f8fc26d2..8a03db95 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -764,6 +764,16 @@ directive in
+@@ -768,6 +768,16 @@ directive in
  .Xr ssh_config 5
  for more information.
  .Pp
@@ -72,7 +72,7 @@ index 711fe608..f1b01c56 100644
  .It Fl x
  Disables X11 forwarding.
  .Pp
-@@ -772,6 +782,17 @@ Enables trusted X11 forwarding.
+@@ -776,6 +786,17 @@ Enables trusted X11 forwarding.
  Trusted X11 forwardings are not subjected to the X11 SECURITY extension
  controls.
  .Pp
@@ -114,7 +114,7 @@ index bcb9f153..1b676fb2 100644
 +    HashKnownHosts yes
 +    GSSAPIAuthentication yes
 diff --git a/ssh_config.5 b/ssh_config.5
-index 1edfe761..2da7029a 100644
+index ca052884..ed6e5d02 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more
@@ -140,7 +140,7 @@ index 1edfe761..2da7029a 100644
  The file contains keyword-argument pairs, one per line.
  Lines starting with
  .Ql #
-@@ -683,11 +699,12 @@ elapsed.
+@@ -690,11 +706,12 @@ elapsed.
  .It Cm ForwardX11Trusted
  If this option is set to
  .Cm yes ,
@@ -155,10 +155,10 @@ index 1edfe761..2da7029a 100644
  from stealing or tampering with data belonging to trusted X11
  clients.
 diff --git a/sshd_config b/sshd_config
-index c01dd656..f68edf36 100644
+index 86263d71..de9cc9fe 100644
 --- a/sshd_config
 +++ b/sshd_config
-@@ -58,8 +58,9 @@ AuthorizedKeysFile    .ssh/authorized_keys
+@@ -57,8 +57,9 @@ AuthorizedKeysFile    .ssh/authorized_keys
  #PasswordAuthentication yes
  #PermitEmptyPasswords no
  
@@ -170,7 +170,7 @@ index c01dd656..f68edf36 100644
  
  # Kerberos options
  #KerberosAuthentication no
-@@ -82,16 +83,16 @@ AuthorizedKeysFile  .ssh/authorized_keys
+@@ -81,16 +82,16 @@ AuthorizedKeysFile  .ssh/authorized_keys
  # If you just want the PAM account and session checks to run without
  # PAM authentication, then enable this but set PasswordAuthentication
  # and ChallengeResponseAuthentication to 'no'.
@@ -190,7 +190,7 @@ index c01dd656..f68edf36 100644
  #PrintLastLog yes
  #TCPKeepAlive yes
  #UseLogin no
-@@ -109,8 +110,11 @@ AuthorizedKeysFile .ssh/authorized_keys
+@@ -108,8 +109,11 @@ AuthorizedKeysFile .ssh/authorized_keys
  # no default banner path
  #Banner none
  
@@ -204,10 +204,10 @@ index c01dd656..f68edf36 100644
  # Example of overriding settings on a per-user basis
  #Match User anoncvs
 diff --git a/sshd_config.5 b/sshd_config.5
-index 79676a95..16be4f62 100644
+index 44b91846..4c7ee425 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -55,6 +55,28 @@ Arguments may optionally be enclosed in double quotes
+@@ -56,6 +56,28 @@ Arguments may optionally be enclosed in double quotes
  .Pq \&"
  in order to represent arguments containing spaces.
  .Pp