New upstream release (7.4p1).

1 files changed, 10 insertions, 10 deletions

diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
index efc629b71..7b14bcc09 100644
--- a/debian/patches/package-versioning.patch
+++ b/debian/patches/package-versioning.patch
@@ -1,4 +1,4 @@
-From c8105413361d3c97b6a2f72c9f1c85da830bed2c Mon Sep 17 00:00:00 2001
+From cdce59c8c54d6d19ca0aa86cb4a62f6df94c7245 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
@@ -19,10 +19,10 @@ Patch-Name: package-versioning.patch
  3 files changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/sshconnect.c b/sshconnect.c
-index fd67727..07dfc9d 100644
+index 1cc556e8..c64c51bb 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -527,10 +527,10 @@ send_client_banner(int connection_out, int minor1)
+@@ -526,10 +526,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",
@@ -36,24 +36,24 @@ index fd67727..07dfc9d 100644
         if (atomicio(vwrite, connection_out, client_version_string,
             strlen(client_version_string)) != strlen(client_version_string))
 diff --git a/sshd.c b/sshd.c
-index 76306da..e873557 100644
+index 5a3f796d..39e4699c 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -443,7 +443,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
-        }
+@@ -378,7 +378,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
+        char remote_version[256];       /* Must be at least as big as buf. */
  
         xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
--           major, minor, SSH_VERSION,
-+           major, minor, SSH_RELEASE,
+-           PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
++           PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
             *options.version_addendum == '\0' ? "" : " ",
             options.version_addendum, newline);
  
 diff --git a/version.h b/version.h
-index 617ab62..fb81655 100644
+index 269ebcda..850a2f7d 100644
 --- a/version.h
 +++ b/version.h
 @@ -3,4 +3,9 @@
- #define SSH_VERSION    "OpenSSH_7.3"
+ #define SSH_VERSION    "OpenSSH_7.4"
  
  #define SSH_PORTABLE   "p1"
 -#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE