* 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).

1 files changed, 9 insertions, 10 deletions

diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch
index 206967bc9..a6a842ecd 100644
--- a/debian/patches/auth-log-verbosity.patch
+++ b/debian/patches/auth-log-verbosity.patch
@@ -2,7 +2,7 @@ Description: Quieten logs when multiple from= restrictions are used
 Author: Colin Watson <cjwatson@debian.org>
 Bug-Debian: http://bugs.debian.org/630606
 Forwarded: no
-Last-Update: 2013-05-07
+Last-Update: 2013-09-14
 
 Index: b/auth-options.c
 ===================================================================
@@ -32,7 +32,7 @@ Index: b/auth-options.c
 @@ -288,10 +299,13 @@
                                 /* FALLTHROUGH */
                         case 0:
-                                xfree(patterns);
+                                free(patterns);
 -                               logit("Authentication tried for %.100s with "
 -                                   "correct key but not from a permitted "
 -                                   "host (host=%.200s, ip=%.200s).",
@@ -47,7 +47,7 @@ Index: b/auth-options.c
                                 auth_debug_add("Your host '%.200s' is not "
                                     "permitted to use this key for login.",
                                     remote_host);
-@@ -512,11 +526,14 @@
+@@ -513,11 +527,14 @@
                                         break;
                                 case 0:
                                         /* no match */
@@ -83,7 +83,7 @@ Index: b/auth-rsa.c
 ===================================================================
 --- a/auth-rsa.c
 +++ b/auth-rsa.c
-@@ -175,6 +175,8 @@
+@@ -174,6 +174,8 @@
         if ((f = auth_openkeyfile(file, pw, options.strict_modes)) == NULL)
                 return 0;
  
@@ -96,7 +96,7 @@ Index: b/auth2-pubkey.c
 ===================================================================
 --- a/auth2-pubkey.c
 +++ b/auth2-pubkey.c
-@@ -217,6 +217,7 @@
+@@ -257,6 +257,7 @@
                 restore_uid();
                 return 0;
         }
@@ -104,16 +104,15 @@ Index: b/auth2-pubkey.c
         while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
                 /* Skip leading whitespace. */
                 for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
-@@ -278,6 +279,8 @@
+@@ -318,6 +319,7 @@
         found_key = 0;
-        found = key_new(key_is_cert(key) ? KEY_UNSPEC : key->type);
  
+        found = NULL;
 +       auth_start_parse_options();
-+
         while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) {
                 char *cp, *key_options = NULL;
- 
-@@ -412,6 +415,7 @@
+                if (found != NULL)
+@@ -453,6 +455,7 @@
         if (key_cert_check_authority(key, 0, 1,
             principals_file == NULL ? pw->pw_name : NULL, &reason) != 0)
                 goto fail_reason;