* 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, 8 insertions, 8 deletions

diff --git a/debian/patches/ssh1-keepalive.patch b/debian/patches/ssh1-keepalive.patch
index 87211e8a3..de61e1dd9 100644
--- a/debian/patches/ssh1-keepalive.patch
+++ b/debian/patches/ssh1-keepalive.patch
@@ -1,13 +1,13 @@
 Description: Partial server keep-alive implementation for SSH1
 Author: Colin Watson <cjwatson@debian.org>
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1712
-Last-Update: 2013-05-07
+Last-Update: 2013-09-14
 
 Index: b/clientloop.c
 ===================================================================
 --- a/clientloop.c
 +++ b/clientloop.c
-@@ -565,16 +565,21 @@
+@@ -563,16 +563,21 @@
  static void
  server_alive_check(void)
  {
@@ -38,20 +38,20 @@ Index: b/clientloop.c
  }
  
  /*
-@@ -636,7 +641,7 @@
+@@ -634,7 +639,7 @@
          */
  
         timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */
--       if (options.server_alive_interval > 0 && compat20)
-+       if (options.server_alive_interval > 0)
+-       if (options.server_alive_interval > 0 && compat20) {
++       if (options.server_alive_interval > 0) {
                 timeout_secs = options.server_alive_interval;
-        set_control_persist_exit_time();
-        if (control_persist_exit_time > 0) {
+                server_alive_time = now + options.server_alive_interval;
+        }
 Index: b/ssh_config.5
 ===================================================================
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -1102,7 +1102,10 @@
+@@ -1130,7 +1130,10 @@
  .Cm ServerAliveCountMax
  is left at the default, if the server becomes unresponsive,
  ssh will disconnect after approximately 45 seconds.