New upstream release (7.5p1)

1 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index ff3f5f42d..b8483b4e9 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
-From 2b53482aec037f0747198f19e449f51d921acd30 Mon Sep 17 00:00:00 2001
+From 78fc8282e021b0236697caedb612cab78831755f 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 c02cdf63..d1091cbd 100644
+index 70fac682..4d92d174 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1927,7 +1927,7 @@ fill_default_options(Options * options)
+@@ -1950,7 +1950,7 @@ fill_default_options(Options * options)
         if (options->forward_x11 == -1)
                 options->forward_x11 = 0;
         if (options->forward_x11_trusted == -1)
@@ -114,7 +114,7 @@ index 4e879cd2..093c8366 100644
 +    HashKnownHosts yes
 +    GSSAPIAuthentication yes
 diff --git a/ssh_config.5 b/ssh_config.5
-index 8698c28e..26f983a3 100644
+index 093ea8a7..fc13fa51 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -74,6 +74,22 @@ Since the first obtained value for each parameter is used, more
@@ -140,7 +140,7 @@ index 8698c28e..26f983a3 100644
  The file contains keyword-argument pairs, one per line.
  Lines starting with
  .Ql #
-@@ -711,11 +727,12 @@ elapsed.
+@@ -715,11 +731,12 @@ elapsed.
  .It Cm ForwardX11Trusted
  If this option is set to
  .Cm yes ,
@@ -155,7 +155,7 @@ index 8698c28e..26f983a3 100644
  from stealing or tampering with data belonging to trusted X11
  clients.
 diff --git a/sshd_config b/sshd_config
-index 00e5a728..13cbe2c6 100644
+index c01dd656..f68edf36 100644
 --- a/sshd_config
 +++ b/sshd_config
 @@ -58,8 +58,9 @@ AuthorizedKeysFile    .ssh/authorized_keys
@@ -190,7 +190,7 @@ index 00e5a728..13cbe2c6 100644
  #PrintLastLog yes
  #TCPKeepAlive yes
  #UseLogin no
-@@ -110,8 +111,11 @@ AuthorizedKeysFile .ssh/authorized_keys
+@@ -109,8 +110,11 @@ AuthorizedKeysFile .ssh/authorized_keys
  # no default banner path
  #Banner none
  
@@ -204,7 +204,7 @@ index 00e5a728..13cbe2c6 100644
  # Example of overriding settings on a per-user basis
  #Match User anoncvs
 diff --git a/sshd_config.5 b/sshd_config.5
-index e45a8937..703a9cdd 100644
+index 603c2ba7..cc5d9fb0 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
 @@ -57,6 +57,28 @@ Arguments may optionally be enclosed in double quotes