New upstream release (7.0p1).

1 files changed, 16 insertions, 16 deletions

diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index cbbe6b790..35659cd33 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
-From 692e965f7be2a33a6fecc392a2cb8023977f9c31 Mon Sep 17 00:00:00 2001
+From bb18ca3880d333834c89f535032cdf12bc362fdf Mon Sep 17 00:00:00 2001
 From: Kees Cook <kees@debian.org>
 Date: Sun, 9 Feb 2014 16:10:06 +0000
 Subject: Add DebianBanner server configuration option
@@ -8,7 +8,7 @@ initial protocol handshake, for those scared by package-versioning.patch.
 
 Bug-Debian: http://bugs.debian.org/562048
 Forwarded: not-needed
-Last-Update: 2015-08-19
+Last-Update: 2015-11-29
 
 Patch-Name: debian-banner.patch
 ---
@@ -19,10 +19,10 @@ Patch-Name: debian-banner.patch
  4 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/servconf.c b/servconf.c
-index 8a5bd7b..fe3e311 100644
+index ed3a88d..a778f44 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -169,6 +169,7 @@ initialize_server_options(ServerOptions *options)
+@@ -171,6 +171,7 @@ initialize_server_options(ServerOptions *options)
         options->ip_qos_bulk = -1;
         options->version_addendum = NULL;
         options->fingerprint_hash = -1;
@@ -36,10 +36,10 @@ index 8a5bd7b..fe3e311 100644
                 options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
 +       if (options->debian_banner == -1)
 +               options->debian_banner = 1;
-        /* Turn privilege separation on by default */
-        if (use_privsep == -1)
-                use_privsep = PRIVSEP_NOSANDBOX;
-@@ -419,6 +422,7 @@ typedef enum {
+ 
+        if (kex_assemble_names(KEX_SERVER_ENCRYPT, &options->ciphers) != 0 ||
+            kex_assemble_names(KEX_SERVER_MAC, &options->macs) != 0 ||
+@@ -430,6 +433,7 @@ typedef enum {
         sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
         sStreamLocalBindMask, sStreamLocalBindUnlink,
         sAllowStreamLocalForwarding, sFingerprintHash,
@@ -47,7 +47,7 @@ index 8a5bd7b..fe3e311 100644
         sDeprecated, sUnsupported
  } ServerOpCodes;
  
-@@ -565,6 +569,7 @@ static struct {
+@@ -577,6 +581,7 @@ static struct {
         { "streamlocalbindunlink", sStreamLocalBindUnlink, SSHCFG_ALL },
         { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },
         { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
@@ -55,7 +55,7 @@ index 8a5bd7b..fe3e311 100644
         { NULL, sBadOption, 0 }
  };
  
-@@ -1850,6 +1855,10 @@ process_server_config_line(ServerOptions *options, char *line,
+@@ -1867,6 +1872,10 @@ process_server_config_line(ServerOptions *options, char *line,
                         options->fingerprint_hash = value;
                 break;
  
@@ -67,10 +67,10 @@ index 8a5bd7b..fe3e311 100644
                 logit("%s line %d: Deprecated option %s",
                     filename, linenum, arg);
 diff --git a/servconf.h b/servconf.h
-index b99b270..ba7b739 100644
+index 778ba17..161fa37 100644
 --- a/servconf.h
 +++ b/servconf.h
-@@ -196,6 +196,8 @@ typedef struct {
+@@ -197,6 +197,8 @@ typedef struct {
         char   *auth_methods[MAX_AUTH_METHODS];
  
         int     fingerprint_hash;
@@ -80,10 +80,10 @@ index b99b270..ba7b739 100644
  
  /* Information about the incoming connection as used by Match */
 diff --git a/sshd.c b/sshd.c
-index 96e75c6..7886d0e 100644
+index e3ac37b..d9f5199 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -442,7 +442,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
+@@ -443,7 +443,8 @@ sshd_exchange_identification(int sock_in, int sock_out)
         }
  
         xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
@@ -94,10 +94,10 @@ index 96e75c6..7886d0e 100644
             options.version_addendum, newline);
  
 diff --git a/sshd_config.5 b/sshd_config.5
-index 1269bbd..a5afbc3 100644
+index 154e87e..641e1fa 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -528,6 +528,11 @@ or
+@@ -533,6 +533,11 @@ or
  .Dq no .
  The default is
  .Dq delayed .