diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 07:43:30 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 07:58:45 +0000 |
| commit | ee36a7a2c19100654dcdef3da424cdda3a15c437 (patch) | |
| tree | c32b574c3c7876358e61be1110f40408dedbf7e7 /debian/patches/package-versioning.patch | |
| parent | Merging upstream version 1:9.8p1. (diff) | |
| download | openssh-ee36a7a2c19100654dcdef3da424cdda3a15c437.tar.xz openssh-ee36a7a2c19100654dcdef3da424cdda3a15c437.zip | |
Merging debian version 1:9.8p1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/package-versioning.patch')
| -rw-r--r-- | debian/patches/package-versioning.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch index 1a81e91..dd905fc 100644 --- a/debian/patches/package-versioning.patch +++ b/debian/patches/package-versioning.patch @@ -1,4 +1,4 @@ -From eb68bf3cb81031d4a765b9c7745842bb49b7b3bb Mon Sep 17 00:00:00 2001 +From 4d194d912805d3314bd610cca3eca2e6a927ab7f 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 @@ -18,10 +18,10 @@ Patch-Name: package-versioning.patch 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kex.c b/kex.c -index e4a2362bd..4e988e39b 100644 +index fd018021e..744fb27fb 100644 --- a/kex.c +++ b/kex.c -@@ -1563,7 +1563,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, +@@ -1257,7 +1257,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms, if (version_addendum != NULL && *version_addendum == '\0') version_addendum = NULL; if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%s%s%s\r\n", @@ -31,11 +31,11 @@ index e4a2362bd..4e988e39b 100644 version_addendum == NULL ? "" : version_addendum)) != 0) { oerrno = errno; diff --git a/version.h b/version.h -index 052a5817b..0124a77d3 100644 +index 81b7645a7..3b43b47e5 100644 --- a/version.h +++ b/version.h @@ -3,4 +3,9 @@ - #define SSH_VERSION "OpenSSH_9.7" + #define SSH_VERSION "OpenSSH_9.8" #define SSH_PORTABLE "p1" -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |