New upstream release (7.4p1).

1 files changed, 25 insertions, 21 deletions

diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index 1d9efcbbf..8129c1e58 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
-From 4c914ccd85bbf391c4dc61b85e3c178fef465e3f Mon Sep 17 00:00:00 2001
+From 2103d3e5566c54e08a59be750579a249e46747d7 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
@@ -32,10 +32,10 @@ Patch-Name: debian-config.patch
  6 files changed, 72 insertions(+), 4 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index f6b4c8f..5cd51f3 100644
+index c02cdf63..d1091cbd 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1928,7 +1928,7 @@ fill_default_options(Options * options)
+@@ -1927,7 +1927,7 @@ fill_default_options(Options * options)
         if (options->forward_x11 == -1)
                 options->forward_x11 = 0;
         if (options->forward_x11_trusted == -1)
@@ -45,7 +45,7 @@ index f6b4c8f..5cd51f3 100644
                 options->forward_x11_timeout = 1200;
         /*
 diff --git a/ssh.1 b/ssh.1
-index 22e56a7..6aa57c4 100644
+index 22e56a7b..6aa57c46 100644
 --- a/ssh.1
 +++ b/ssh.1
 @@ -785,6 +785,16 @@ directive in
@@ -84,7 +84,7 @@ index 22e56a7..6aa57c4 100644
  Send log information using the
  .Xr syslog 3
 diff --git a/ssh_config b/ssh_config
-index 4e879cd..5190b06 100644
+index 4e879cd2..5190b06b 100644
 --- a/ssh_config
 +++ b/ssh_config
 @@ -17,9 +17,10 @@
@@ -108,7 +108,7 @@ index 4e879cd..5190b06 100644
 +    GSSAPIAuthentication yes
 +    GSSAPIDelegateCredentials no
 diff --git a/ssh_config.5 b/ssh_config.5
-index 30c97a9..c967258 100644
+index 40617be4..8dce757e 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -74,6 +74,22 @@ Since the first obtained value for each parameter is used, more
@@ -131,24 +131,28 @@ index 30c97a9..c967258 100644
 +.Cm GSSAPIAuthentication No yes
 +.El
 +.Pp
- The configuration file has the following format:
+ The file contains keyword-argument pairs, one per line.
+ Lines starting with
+ .Ql #
+@@ -711,11 +727,12 @@ elapsed.
+ .It Cm ForwardX11Trusted
+ If this option is set to
+ .Cm yes ,
++(the Debian-specific default),
+ remote X11 clients will have full access to the original X11 display.
  .Pp
- Empty lines and lines starting with
-@@ -799,7 +815,8 @@ token used for the session will be set to expire after 20 minutes.
- Remote clients will be refused access after this time.
- .Pp
- The default is
--.Dq no .
-+.Dq yes
-+(Debian-specific).
- .Pp
- See the X11 SECURITY extension specification for full details on
- the restrictions imposed on untrusted clients.
+ If this option is set to
+ .Cm no
+-(the default),
++(the upstream default),
+ remote X11 clients will be considered untrusted and prevented
+ from stealing or tampering with data belonging to trusted X11
+ clients.
 diff --git a/sshd_config b/sshd_config
-index 3fe3e01..ec8ff8f 100644
+index 00e5a728..c0b84f8e 100644
 --- a/sshd_config
 +++ b/sshd_config
-@@ -124,7 +124,7 @@ AuthorizedKeysFile  .ssh/authorized_keys
+@@ -111,7 +111,7 @@ AuthorizedKeysFile  .ssh/authorized_keys
  #Banner none
  
  # override default of no subsystems
@@ -158,7 +162,7 @@ index 3fe3e01..ec8ff8f 100644
  # Example of overriding settings on a per-user basis
  #Match User anoncvs
 diff --git a/sshd_config.5 b/sshd_config.5
-index b2b349e..79f2d61 100644
+index e45a8937..d6911a98 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
 @@ -57,6 +57,31 @@ Arguments may optionally be enclosed in double quotes