1 files changed, 45 insertions, 32 deletions

diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index d005bdc2e..e706b4a02 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,30 +1,43 @@
-Description: Various Debian-specific configuration changes
- ssh: Enable ForwardX11Trusted, returning to earlier semantics which cause
- fewer problems with existing setups (http://bugs.debian.org/237021).
- .
- ssh: Set 'SendEnv LANG LC_*' by default (http://bugs.debian.org/264024).
- .
- ssh: Enable HashKnownHosts by default to try to limit the spread of ssh
- worms.
- .
- ssh: Enable GSSAPIAuthentication and disable GSSAPIDelegateCredentials by
- default.
- .
- sshd: Refer to /usr/share/doc/openssh-server/README.Debian.gz alongside
- PermitRootLogin default.
- .
- Document all of this, along with several sshd defaults set in
- debian/openssh-server.postinst.
-Author: Colin Watson <cjwatson@debian.org>
+From bb5616c94d6d6b97890e90dd01a7ad07c663dc0b 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
+
+ssh: Enable ForwardX11Trusted, returning to earlier semantics which cause
+fewer problems with existing setups (http://bugs.debian.org/237021).
+
+ssh: Set 'SendEnv LANG LC_*' by default (http://bugs.debian.org/264024).
+
+ssh: Enable HashKnownHosts by default to try to limit the spread of ssh
+worms.
+
+ssh: Enable GSSAPIAuthentication and disable GSSAPIDelegateCredentials by
+default.
+
+sshd: Refer to /usr/share/doc/openssh-server/README.Debian.gz alongside
+PermitRootLogin default.
+
+Document all of this, along with several sshd defaults set in
+debian/openssh-server.postinst.
+
 Author: Russ Allbery <rra@debian.org>
 Forwarded: not-needed
 Last-Update: 2013-09-14
 
-Index: b/readconf.c
-===================================================================
+Patch-Name: debian-config.patch
+---
+ readconf.c    |  2 +-
+ ssh_config    |  7 ++++++-
+ ssh_config.5  | 19 ++++++++++++++++++-
+ sshd_config   |  1 +
+ sshd_config.5 | 27 +++++++++++++++++++++++++++
+ 5 files changed, 53 insertions(+), 3 deletions(-)
+
+diff --git a/readconf.c b/readconf.c
+index 389de7d..2778176 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -1298,7 +1298,7 @@
+@@ -1298,7 +1298,7 @@ fill_default_options(Options * options)
         if (options->forward_x11 == -1)
                 options->forward_x11 = 0;
         if (options->forward_x11_trusted == -1)
@@ -33,8 +46,8 @@ Index: b/readconf.c
         if (options->forward_x11_timeout == -1)
                 options->forward_x11_timeout = 1200;
         if (options->exit_on_forward_failure == -1)
-Index: b/ssh_config
-===================================================================
+diff --git a/ssh_config b/ssh_config
+index 3234321..064b593 100644
 --- a/ssh_config
 +++ b/ssh_config
 @@ -17,9 +17,10 @@
@@ -57,11 +70,11 @@ Index: b/ssh_config
 +    HashKnownHosts yes
 +    GSSAPIAuthentication yes
 +    GSSAPIDelegateCredentials no
-Index: b/ssh_config.5
-===================================================================
+diff --git a/ssh_config.5 b/ssh_config.5
+index 5bca932..127540a 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -71,6 +71,22 @@
+@@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more
  host-specific declarations should be given near the beginning of the
  file, and general defaults at the end.
  .Pp
@@ -84,7 +97,7 @@ Index: b/ssh_config.5
  The configuration file has the following format:
  .Pp
  Empty lines and lines starting with
-@@ -501,7 +517,8 @@
+@@ -501,7 +517,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
@@ -94,8 +107,8 @@ Index: b/ssh_config.5
  .Pp
  See the X11 SECURITY extension specification for full details on
  the restrictions imposed on untrusted clients.
-Index: b/sshd_config
-===================================================================
+diff --git a/sshd_config b/sshd_config
+index 9450141..9cfe28d 100644
 --- a/sshd_config
 +++ b/sshd_config
 @@ -40,6 +40,7 @@
@@ -106,11 +119,11 @@ Index: b/sshd_config
  #PermitRootLogin yes
  #StrictModes yes
  #MaxAuthTries 6
-Index: b/sshd_config.5
-===================================================================
+diff --git a/sshd_config.5 b/sshd_config.5
+index ec4851a..faf93fc 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -57,6 +57,33 @@
+@@ -57,6 +57,33 @@ Arguments may optionally be enclosed in double quotes
  .Pq \&"
  in order to represent arguments containing spaces.
  .Pp