* New upstream release (LP: #535029).

  - After a transition period of about 10 years, this release disables SSH
    protocol 1 by default.  Clients and servers that need to use the
    legacy protocol must explicitly enable it in ssh_config / sshd_config
    or on the command-line.
  - Remove the libsectok/OpenSC-based smartcard code and add support for
    PKCS#11 tokens.  This support is enabled by default in the Debian
    packaging, since it now doesn't involve additional library
    dependencies (closes: #231472, LP: #16918).
  - Add support for certificate authentication of users and hosts using a
    new, minimal OpenSSH certificate format (closes: #482806).
  - Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
  - Add the ability to revoke keys in sshd(8) and ssh(1).  (For the Debian
    package, this overlaps with the key blacklisting facility added in
    openssh 1:4.7p1-9, but with different file formats and slightly
    different scopes; for the moment, I've roughly merged the two.)
  - Various multiplexing improvements, including support for requesting
    port-forwardings via the multiplex protocol (closes: #360151).
  - Allow setting an explicit umask on the sftp-server(8) commandline to
    override whatever default the user has (closes: #496843).
  - Many sftp client improvements, including tab-completion, more options,
    and recursive transfer support for get/put (LP: #33378).  The old
    mget/mput commands never worked properly and have been removed
    (closes: #270399, #428082).
  - Do not prompt for a passphrase if we fail to open a keyfile, and log
    the reason why the open failed to debug (closes: #431538).
  - Prevent sftp from crashing when given a "-" without a command.  Also,
    allow whitespace to follow a "-" (closes: #531561).

1 files changed, 13 insertions, 13 deletions

diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch
index 04ea64d34..3ed46c8f8 100644
--- a/debian/patches/syslog-level-silent.patch
+++ b/debian/patches/syslog-level-silent.patch
@@ -18,7 +18,7 @@ Index: b/clientloop.c
 ===================================================================
 --- a/clientloop.c
 +++ b/clientloop.c
-@@ -1533,7 +1533,7 @@
+@@ -1536,7 +1536,7 @@
          * In interactive mode (with pseudo tty) display a message indicating
          * that the connection has been closed.
          */
@@ -63,20 +63,20 @@ Index: b/mux.c
 ===================================================================
 --- a/mux.c
 +++ b/mux.c
-@@ -721,7 +721,7 @@
+@@ -1553,7 +1553,7 @@
         } else
-                debug2("Received exit status from master %d", exitval[0]);
+                debug2("Received exit status from master %d", exitval);
  
 -       if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
 +       if (tty_flag && options.log_level > SYSLOG_LEVEL_QUIET)
                 fprintf(stderr, "Shared connection to %s closed.\r\n", host);
  
-        exit(exitval[0]);
+        exit(exitval);
 Index: b/sftp-server.8
 ===================================================================
 --- a/sftp-server.8
 +++ b/sftp-server.8
-@@ -64,7 +64,7 @@
+@@ -74,7 +74,7 @@
  Specifies which messages will be logged by
  .Nm .
  The possible values are:
@@ -89,7 +89,7 @@ Index: b/ssh.1
 ===================================================================
 --- a/ssh.1
 +++ b/ssh.1
-@@ -500,6 +500,11 @@
+@@ -504,6 +504,11 @@
  .It Fl q
  Quiet mode.
  Causes most warning and diagnostic messages to be suppressed.
@@ -105,8 +105,8 @@ Index: b/ssh.c
 ===================================================================
 --- a/ssh.c
 +++ b/ssh.c
-@@ -389,7 +389,12 @@
-                        }
+@@ -421,7 +421,12 @@
+                        options.exit_on_forward_failure = 1;
                         break;
                 case 'q':
 -                       options.log_level = SYSLOG_LEVEL_QUIET;
@@ -119,7 +119,7 @@ Index: b/ssh.c
                         break;
                 case 'e':
                         if (optarg[0] == '^' && optarg[2] == 0 &&
-@@ -592,7 +597,7 @@
+@@ -624,7 +629,7 @@
                 tty_flag = 0;
         /* Do not allocate a tty if stdin is not a tty. */
         if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) {
@@ -132,7 +132,7 @@ Index: b/ssh_config.5
 ===================================================================
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -685,7 +685,7 @@
+@@ -698,7 +698,7 @@
  Gives the verbosity level that is used when logging messages from
  .Xr ssh 1 .
  The possible values are:
@@ -145,7 +145,7 @@ Index: b/sshd.8
 ===================================================================
 --- a/sshd.8
 +++ b/sshd.8
-@@ -207,9 +207,12 @@
+@@ -217,9 +217,12 @@
  option override command-line ports.
  .It Fl q
  Quiet mode.
@@ -163,7 +163,7 @@ Index: b/sshd.c
 ===================================================================
 --- a/sshd.c
 +++ b/sshd.c
-@@ -1355,7 +1355,12 @@
+@@ -1370,7 +1370,12 @@
                         /* ignored */
                         break;
                 case 'q':
@@ -181,7 +181,7 @@ Index: b/sshd_config.5
 ===================================================================
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -567,7 +567,7 @@
+@@ -575,7 +575,7 @@
  Gives the verbosity level that is used when logging messages from
  .Xr sshd 8 .
  The possible values are: