New upstream release (8.2p1)

1 files changed, 9 insertions, 9 deletions

diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index acb4e3ce9..e5c690915 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
-From 9a713cd4bbaef5ad4f1d28c1718fb6960ac257b3 Mon Sep 17 00:00:00 2001
+From cc80ecc65d57a9e68ce84d67bcfece281ffa0e9f 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, 80 insertions(+), 9 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index 16d2729dd..253574ce0 100644
+index 7f251dd4a..e82024678 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -2037,7 +2037,7 @@ fill_default_options(Options * options)
+@@ -2087,7 +2087,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 16d2729dd..253574ce0 100644
                 options->forward_x11_timeout = 1200;
         /*
 diff --git a/ssh.1 b/ssh.1
-index 24530e511..44a00d525 100644
+index b33a8049f..a8967c2f8 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -795,6 +795,16 @@ directive in
+@@ -809,6 +809,16 @@ directive in
  .Xr ssh_config 5
  for more information.
  .Pp
@@ -72,7 +72,7 @@ index 24530e511..44a00d525 100644
  .It Fl x
  Disables X11 forwarding.
  .Pp
-@@ -803,6 +813,20 @@ Enables trusted X11 forwarding.
+@@ -817,6 +827,20 @@ Enables trusted X11 forwarding.
  Trusted X11 forwardings are not subjected to the X11 SECURITY extension
  controls.
  .Pp
@@ -117,7 +117,7 @@ index 1ff999b68..6dd6ecf87 100644
 +    HashKnownHosts yes
 +    GSSAPIAuthentication yes
 diff --git a/ssh_config.5 b/ssh_config.5
-index 4b42aab9d..d27655e15 100644
+index c6eaa63e7..5c90d3e02 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
 @@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more
@@ -143,7 +143,7 @@ index 4b42aab9d..d27655e15 100644
  The file contains keyword-argument pairs, one per line.
  Lines starting with
  .Ql #
-@@ -721,11 +737,12 @@ elapsed.
+@@ -729,11 +745,12 @@ elapsed.
  .It Cm ForwardX11Trusted
  If this option is set to
  .Cm yes ,
@@ -207,7 +207,7 @@ index 2c48105f8..ed8272f6d 100644
  # Example of overriding settings on a per-user basis
  #Match User anoncvs
 diff --git a/sshd_config.5 b/sshd_config.5
-index 270805060..02e29cb6f 100644
+index 25f4b8117..b8bea2ad7 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
 @@ -56,6 +56,28 @@ Arguments may optionally be enclosed in double quotes