* New upstream release (http://www.openssh.com/txt/release-6.1).

  - Enable pre-auth sandboxing by default for new installs.
  - Allow "PermitOpen none" to refuse all port-forwarding requests
    (closes: #543683).

1 files changed, 9 insertions, 9 deletions

diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
index 64606e2e9..b396cb116 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
  vulnerable-looking version strings.  (However, see debian-banner.patch.)
 Author: Matthew Vernon <matthew@debian.org>
 Forwarded: not-needed
-Last-Update: 2010-02-28
+Last-Update: 2012-09-07
 
 Index: b/sshconnect.c
 ===================================================================
@@ -24,21 +24,21 @@ Index: b/sshd.c
 ===================================================================
 --- a/sshd.c
 +++ b/sshd.c
-@@ -424,7 +424,7 @@
-                minor = PROTOCOL_MINOR_1;
+@@ -425,7 +425,7 @@
         }
-        snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor,
--           SSH_VERSION, newline);
-+           SSH_RELEASE, newline);
-        server_version_string = xstrdup(buf);
  
-        /* Send our protocol version identification. */
+        xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
+-           major, minor, SSH_VERSION,
++           major, minor, SSH_RELEASE,
+            *options.version_addendum == '\0' ? "" : " ",
+            options.version_addendum, newline);
+ 
 Index: b/version.h
 ===================================================================
 --- a/version.h
 +++ b/version.h
 @@ -3,4 +3,9 @@
- #define SSH_VERSION    "OpenSSH_6.0"
+ #define SSH_VERSION    "OpenSSH_6.1"
  
  #define SSH_PORTABLE   "p1"
 -#define SSH_RELEASE    SSH_VERSION SSH_PORTABLE