diff options
Diffstat (limited to 'debian/patches/package-versioning.patch')
-rw-r--r-- | debian/patches/package-versioning.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch index 0d851e68c..db144f505 100644 --- a/debian/patches/package-versioning.patch +++ b/debian/patches/package-versioning.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 326b09bce8058629980cc92f289fd7912269eb98 Mon Sep 17 00:00:00 2001 | 1 | From 52359fc0d6ee73ee6e24332b2777dc8abdaed652 Mon Sep 17 00:00:00 2001 |
2 | From: Matthew Vernon <matthew@debian.org> | 2 | From: Matthew Vernon <matthew@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:05 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:05 +0000 |
4 | Subject: Include the Debian version in our identification | 4 | Subject: Include the Debian version in our identification |
@@ -19,10 +19,10 @@ Patch-Name: package-versioning.patch | |||
19 | 3 files changed, 8 insertions(+), 3 deletions(-) | 19 | 3 files changed, 8 insertions(+), 3 deletions(-) |
20 | 20 | ||
21 | diff --git a/sshconnect.c b/sshconnect.c | 21 | diff --git a/sshconnect.c b/sshconnect.c |
22 | index 7ce2716c..3280b310 100644 | 22 | index 58f9eac8..15d8b807 100644 |
23 | --- a/sshconnect.c | 23 | --- a/sshconnect.c |
24 | +++ b/sshconnect.c | 24 | +++ b/sshconnect.c |
25 | @@ -517,7 +517,7 @@ send_client_banner(int connection_out, int minor1) | 25 | @@ -638,7 +638,7 @@ send_client_banner(int connection_out, int minor1) |
26 | { | 26 | { |
27 | /* Send our own protocol version identification. */ | 27 | /* Send our own protocol version identification. */ |
28 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", | 28 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", |
@@ -32,10 +32,10 @@ index 7ce2716c..3280b310 100644 | |||
32 | strlen(client_version_string)) != strlen(client_version_string)) | 32 | strlen(client_version_string)) != strlen(client_version_string)) |
33 | fatal("write: %.100s", strerror(errno)); | 33 | fatal("write: %.100s", strerror(errno)); |
34 | diff --git a/sshd.c b/sshd.c | 34 | diff --git a/sshd.c b/sshd.c |
35 | index af1ec337..eccf81bb 100644 | 35 | index 6d911c19..9a7f5495 100644 |
36 | --- a/sshd.c | 36 | --- a/sshd.c |
37 | +++ b/sshd.c | 37 | +++ b/sshd.c |
38 | @@ -378,7 +378,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) | 38 | @@ -384,7 +384,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) |
39 | char remote_version[256]; /* Must be at least as big as buf. */ | 39 | char remote_version[256]; /* Must be at least as big as buf. */ |
40 | 40 | ||
41 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", | 41 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", |
@@ -45,11 +45,11 @@ index af1ec337..eccf81bb 100644 | |||
45 | options.version_addendum); | 45 | options.version_addendum); |
46 | 46 | ||
47 | diff --git a/version.h b/version.h | 47 | diff --git a/version.h b/version.h |
48 | index e093f623..b7c5ad2a 100644 | 48 | index ea52b26f..a3fa6e0b 100644 |
49 | --- a/version.h | 49 | --- a/version.h |
50 | +++ b/version.h | 50 | +++ b/version.h |
51 | @@ -3,4 +3,9 @@ | 51 | @@ -3,4 +3,9 @@ |
52 | #define SSH_VERSION "OpenSSH_7.6" | 52 | #define SSH_VERSION "OpenSSH_7.7" |
53 | 53 | ||
54 | #define SSH_PORTABLE "p1" | 54 | #define SSH_PORTABLE "p1" |
55 | -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE | 55 | -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |