1 files changed, 32 insertions, 20 deletions

diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index 981cdd697..d02e8ffcb 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,16 +1,28 @@
-Description: Add DebianBanner server configuration option
- Setting this to "no" causes sshd to omit the Debian revision from its
- initial protocol handshake, for those scared by package-versioning.patch.
-Author: Kees Cook <kees@debian.org>
+From 8a75df792931443e868e574408ed1666208a28c2 Mon Sep 17 00:00:00 2001
+From: Kees Cook <kees@debian.org>
+Date: Sun, 9 Feb 2014 16:10:06 +0000
+Subject: Add DebianBanner server configuration option
+
+Setting this to "no" causes sshd to omit the Debian revision from its
+initial protocol handshake, for those scared by package-versioning.patch.
+
 Bug-Debian: http://bugs.debian.org/562048
 Forwarded: not-needed
 Last-Update: 2013-09-14
 
-Index: b/servconf.c
-===================================================================
+Patch-Name: debian-banner.patch
+---
+ servconf.c    | 9 +++++++++
+ servconf.h    | 2 ++
+ sshd.c        | 3 ++-
+ sshd_config.5 | 5 +++++
+ 4 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/servconf.c b/servconf.c
+index 9155a8b..a2928ff 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -157,6 +157,7 @@
+@@ -157,6 +157,7 @@ initialize_server_options(ServerOptions *options)
         options->ip_qos_interactive = -1;
         options->ip_qos_bulk = -1;
         options->version_addendum = NULL;
@@ -18,7 +30,7 @@ Index: b/servconf.c
  }
  
  void
-@@ -310,6 +311,8 @@
+@@ -310,6 +311,8 @@ fill_default_server_options(ServerOptions *options)
                 options->ip_qos_bulk = IPTOS_THROUGHPUT;
         if (options->version_addendum == NULL)
                 options->version_addendum = xstrdup("");
@@ -27,7 +39,7 @@ Index: b/servconf.c
         /* Turn privilege separation on by default */
         if (use_privsep == -1)
                 use_privsep = PRIVSEP_NOSANDBOX;
-@@ -360,6 +363,7 @@
+@@ -360,6 +363,7 @@ typedef enum {
         sKexAlgorithms, sIPQoS, sVersionAddendum,
         sAuthorizedKeysCommand, sAuthorizedKeysCommandUser,
         sAuthenticationMethods, sHostKeyAgent,
@@ -35,7 +47,7 @@ Index: b/servconf.c
         sDeprecated, sUnsupported
  } ServerOpCodes;
  
-@@ -501,6 +505,7 @@
+@@ -501,6 +505,7 @@ static struct {
         { "authorizedkeyscommanduser", sAuthorizedKeysCommandUser, SSHCFG_ALL },
         { "versionaddendum", sVersionAddendum, SSHCFG_GLOBAL },
         { "authenticationmethods", sAuthenticationMethods, SSHCFG_ALL },
@@ -43,7 +55,7 @@ Index: b/servconf.c
         { NULL, sBadOption, 0 }
  };
  
-@@ -1648,6 +1653,10 @@
+@@ -1648,6 +1653,10 @@ process_server_config_line(ServerOptions *options, char *line,
                 }
                 return 0;
  
@@ -54,11 +66,11 @@ Index: b/servconf.c
         case sDeprecated:
                 logit("%s line %d: Deprecated option %s",
                     filename, linenum, arg);
-Index: b/servconf.h
-===================================================================
+diff --git a/servconf.h b/servconf.h
+index f655c5b..fd72ce2 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -188,6 +188,8 @@
+@@ -188,6 +188,8 @@ typedef struct {
  
         u_int   num_auth_methods;
         char   *auth_methods[MAX_AUTH_METHODS];
@@ -67,11 +79,11 @@ Index: b/servconf.h
  }       ServerOptions;
  
  /* Information about the incoming connection as used by Match */
-Index: b/sshd.c
-===================================================================
+diff --git a/sshd.c b/sshd.c
+index 7efa7ef..6b988fe 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -440,7 +440,8 @@
+@@ -440,7 +440,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
         }
  
         xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
@@ -81,11 +93,11 @@ Index: b/sshd.c
             *options.version_addendum == '\0' ? "" : " ",
             options.version_addendum, newline);
  
-Index: b/sshd_config.5
-===================================================================
+diff --git a/sshd_config.5 b/sshd_config.5
+index 510cc7c..eaf8d01 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -404,6 +404,11 @@
+@@ -404,6 +404,11 @@ or
  .Dq no .
  The default is
  .Dq delayed .