diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /debian/patches/package-versioning.patch | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
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 b922a185b..2be45ebf8 100644 --- a/debian/patches/package-versioning.patch +++ b/debian/patches/package-versioning.patch | |||
@@ -5,7 +5,7 @@ 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.) |
6 | Author: Matthew Vernon <matthew@debian.org> | 6 | Author: Matthew Vernon <matthew@debian.org> |
7 | Forwarded: not-needed | 7 | Forwarded: not-needed |
8 | Last-Update: 2013-05-16 | 8 | Last-Update: 2013-09-14 |
9 | 9 | ||
10 | Index: b/sshconnect.c | 10 | Index: b/sshconnect.c |
11 | =================================================================== | 11 | =================================================================== |
@@ -28,7 +28,7 @@ Index: b/sshd.c | |||
28 | =================================================================== | 28 | =================================================================== |
29 | --- a/sshd.c | 29 | --- a/sshd.c |
30 | +++ b/sshd.c | 30 | +++ b/sshd.c |
31 | @@ -434,7 +434,7 @@ | 31 | @@ -440,7 +440,7 @@ |
32 | } | 32 | } |
33 | 33 | ||
34 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", | 34 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", |
@@ -42,9 +42,9 @@ Index: b/version.h | |||
42 | --- a/version.h | 42 | --- a/version.h |
43 | +++ b/version.h | 43 | +++ 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.3" |
46 | 46 | ||
47 | #define SSH_PORTABLE "p2" | 47 | #define SSH_PORTABLE "p1" |
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 |