summaryrefslogtreecommitdiff
path: root/debian/patches/package-versioning.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-16 14:04:24 +0100
committerColin Watson <cjwatson@debian.org>2013-05-16 14:04:24 +0100
commit031d51614426a5d5ad42f971831df373f5d6e6d8 (patch)
tree6a66dc70fd3444ea8064f25256bd2fccdce6e3cd /debian/patches/package-versioning.patch
parent43587d4ea4349c7b98edcde117f37e6ca2e1b674 (diff)
parent328b60656f29db6306994d7498dede386ec2d1c3 (diff)
* New upstream release (http://www.openssh.com/txt/release-6.2p2):
- Only warn for missing identity files that were explicitly specified (closes: #708275). - Fix bug in contributed contrib/ssh-copy-id script that could result in "rm *" being called on mktemp failure (closes: #708419).
Diffstat (limited to 'debian/patches/package-versioning.patch')
-rw-r--r--debian/patches/package-versioning.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
index c337ad671..b922a185b 100644
--- a/debian/patches/package-versioning.patch
+++ b/debian/patches/package-versioning.patch
@@ -5,13 +5,13 @@ Description: Include the Debian version in our identification
5 vulnerable-looking version strings. (However, see debian-banner.patch.) 5 vulnerable-looking version strings. (However, see debian-banner.patch.)
6Author: Matthew Vernon <matthew@debian.org> 6Author: Matthew Vernon <matthew@debian.org>
7Forwarded: not-needed 7Forwarded: not-needed
8Last-Update: 2013-05-07 8Last-Update: 2013-05-16
9 9
10Index: b/sshconnect.c 10Index: b/sshconnect.c
11=================================================================== 11===================================================================
12--- a/sshconnect.c 12--- a/sshconnect.c
13+++ b/sshconnect.c 13+++ b/sshconnect.c
14@@ -435,10 +435,10 @@ 14@@ -442,10 +442,10 @@
15 /* Send our own protocol version identification. */ 15 /* Send our own protocol version identification. */
16 if (compat20) { 16 if (compat20) {
17 xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", 17 xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
@@ -44,7 +44,7 @@ Index: b/version.h
44@@ -3,4 +3,9 @@ 44@@ -3,4 +3,9 @@
45 #define SSH_VERSION "OpenSSH_6.2" 45 #define SSH_VERSION "OpenSSH_6.2"
46 46
47 #define SSH_PORTABLE "p1" 47 #define SSH_PORTABLE "p2"
48-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE 48-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
49+#define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE 49+#define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE
50+#ifdef SSH_EXTRAVERSION 50+#ifdef SSH_EXTRAVERSION