diff options
author | Colin Watson <cjwatson@debian.org> | 2020-10-20 14:12:31 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-10-20 14:12:31 +0100 |
commit | e371906fbbbbc11b0dced8fd4e0d258eb489d7c1 (patch) | |
tree | 4d0d8d2afd52572deb7910e29ff5a334b2bcf702 /debian/patches/package-versioning.patch | |
parent | e429009cde648a41479cd1b60ce972760a2bdabc (diff) | |
parent | 3728919292c05983372954d27426f7d966813139 (diff) |
New upstream release (8.4p1)
Diffstat (limited to 'debian/patches/package-versioning.patch')
-rw-r--r-- | debian/patches/package-versioning.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch index a560ae940..daa1473db 100644 --- a/debian/patches/package-versioning.patch +++ b/debian/patches/package-versioning.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d66c30698f807ab95aee7ea4a882c192884df047 Mon Sep 17 00:00:00 2001 | 1 | From 707144d399b9fc959a4f6be3fd8e239c208c88ff 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 |
@@ -18,7 +18,7 @@ Patch-Name: package-versioning.patch | |||
18 | 2 files changed, 7 insertions(+), 2 deletions(-) | 18 | 2 files changed, 7 insertions(+), 2 deletions(-) |
19 | 19 | ||
20 | diff --git a/kex.c b/kex.c | 20 | diff --git a/kex.c b/kex.c |
21 | index 144dee512..0e64bf760 100644 | 21 | index 751cfc710..ce7bb5b3b 100644 |
22 | --- a/kex.c | 22 | --- a/kex.c |
23 | +++ b/kex.c | 23 | +++ b/kex.c |
24 | @@ -1243,7 +1243,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, | 24 | @@ -1243,7 +1243,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, |
@@ -31,11 +31,11 @@ index 144dee512..0e64bf760 100644 | |||
31 | version_addendum == NULL ? "" : version_addendum)) != 0) { | 31 | version_addendum == NULL ? "" : version_addendum)) != 0) { |
32 | oerrno = errno; | 32 | oerrno = errno; |
33 | diff --git a/version.h b/version.h | 33 | diff --git a/version.h b/version.h |
34 | index a2eca3ec8..158eaee70 100644 | 34 | index c2f9c55bb..480cd59e1 100644 |
35 | --- a/version.h | 35 | --- a/version.h |
36 | +++ b/version.h | 36 | +++ b/version.h |
37 | @@ -3,4 +3,9 @@ | 37 | @@ -3,4 +3,9 @@ |
38 | #define SSH_VERSION "OpenSSH_8.3" | 38 | #define SSH_VERSION "OpenSSH_8.4" |
39 | 39 | ||
40 | #define SSH_PORTABLE "p1" | 40 | #define SSH_PORTABLE "p1" |
41 | -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE | 41 | -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |