1 files changed, 25 insertions, 14 deletions

diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
index 392afc073..df97fa40f 100644
--- a/debian/patches/package-versioning.patch
+++ b/debian/patches/package-versioning.patch
@@ -1,17 +1,28 @@
-Description: Include the Debian version in our identification
- This makes it easier to audit networks for versions patched against
- security vulnerabilities.  It has little detrimental effect, as attackers
- will generally just try attacks rather than bothering to scan for
- vulnerable-looking version strings.  (However, see debian-banner.patch.)
-Author: Matthew Vernon <matthew@debian.org>
+From da3ff9786c4c03b2aac4936b28f06b3c152e230d Mon Sep 17 00:00:00 2001
+From: Matthew Vernon <matthew@debian.org>
+Date: Sun, 9 Feb 2014 16:10:05 +0000
+Subject: Include the Debian version in our identification
+
+This makes it easier to audit networks for versions patched against security
+vulnerabilities.  It has little detrimental effect, as attackers will
+generally just try attacks rather than bothering to scan for
+vulnerable-looking version strings.  (However, see debian-banner.patch.)
+
 Forwarded: not-needed
 Last-Update: 2013-09-14
 
-Index: b/sshconnect.c
-===================================================================
+Patch-Name: package-versioning.patch
+---
+ sshconnect.c | 4 ++--
+ sshd.c       | 2 +-
+ version.h    | 7 ++++++-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/sshconnect.c b/sshconnect.c
+index bda83b2..ad960fd 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -442,10 +442,10 @@
+@@ -442,10 +442,10 @@ send_client_banner(int connection_out, int minor1)
         /* Send our own protocol version identification. */
         if (compat20) {
                 xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
@@ -24,11 +35,11 @@ Index: b/sshconnect.c
         }
         if (roaming_atomicio(vwrite, connection_out, client_version_string,
             strlen(client_version_string)) != strlen(client_version_string))
-Index: b/sshd.c
-===================================================================
+diff --git a/sshd.c b/sshd.c
+index fbe3284..7efa7ef 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -440,7 +440,7 @@
+@@ -440,7 +440,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
         }
  
         xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
@@ -37,8 +48,8 @@ Index: b/sshd.c
             *options.version_addendum == '\0' ? "" : " ",
             options.version_addendum, newline);
  
-Index: b/version.h
-===================================================================
+diff --git a/version.h b/version.h
+index 39033ed..036277d 100644
 --- a/version.h
 +++ b/version.h
 @@ -3,4 +3,9 @@