New upstream release (7.0p1).

1 files changed, 5 insertions, 5 deletions

diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
index ddec0ec63..e2b40654c 100644
--- a/debian/patches/package-versioning.patch
+++ b/debian/patches/package-versioning.patch
@@ -1,4 +1,4 @@
-From 2c39fe957130704a00871229c53116db4a25e0c3 Mon Sep 17 00:00:00 2001
+From 4e80e6a84e57783718ca225021a597713c44c2a2 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
@@ -36,10 +36,10 @@ index 4aff104..2999061 100644
         if (roaming_atomicio(vwrite, connection_out, client_version_string,
             strlen(client_version_string)) != strlen(client_version_string))
 diff --git a/sshd.c b/sshd.c
-index 9ff9e8b..96e75c6 100644
+index f60c9e0..e3ac37b 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -442,7 +442,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
+@@ -443,7 +443,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
         }
  
         xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
@@ -49,11 +49,11 @@ index 9ff9e8b..96e75c6 100644
             options.version_addendum, newline);
  
 diff --git a/version.h b/version.h
-index b58fbe1..bff2b3b 100644
+index 7a5dbc8..f665356 100644
 --- a/version.h
 +++ b/version.h
 @@ -3,4 +3,9 @@
- #define SSH_VERSION    "OpenSSH_6.9"
+ #define SSH_VERSION    "OpenSSH_7.0"
  
  #define SSH_PORTABLE   "p1"
 -#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE