New upstream release (8.0p1)

1 files changed, 9 insertions, 9 deletions

diff --git a/debian/patches/revert-ipqos-defaults.patch b/debian/patches/revert-ipqos-defaults.patch
index a329b9be1..d0b02d792 100644
--- a/debian/patches/revert-ipqos-defaults.patch
+++ b/debian/patches/revert-ipqos-defaults.patch
@@ -1,4 +1,4 @@
-From 6b56cd57db9061296231f14d537f1ebaf25e8877 Mon Sep 17 00:00:00 2001
+From 7d50f9e5be88179325983a1f58c9d51bb58f025a Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Mon, 8 Apr 2019 10:46:29 +0100
 Subject: Revert "upstream: Update default IPQoS in ssh(1), sshd(8) to DSCP
@@ -24,10 +24,10 @@ Patch-Name: revert-ipqos-defaults.patch
  4 files changed, 8 insertions(+), 12 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
-index 661b8bf40..6d046f063 100644
+index f35bde6e6..2ba312441 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -2133,9 +2133,9 @@ fill_default_options(Options * options)
+@@ -2165,9 +2165,9 @@ fill_default_options(Options * options)
         if (options->visual_host_key == -1)
                 options->visual_host_key = 0;
         if (options->ip_qos_interactive == -1)
@@ -40,10 +40,10 @@ index 661b8bf40..6d046f063 100644
                 options->request_tty = REQUEST_TTY_AUTO;
         if (options->proxy_use_fdpass == -1)
 diff --git a/servconf.c b/servconf.c
-index c5dd617ef..bf2669147 100644
+index 8d2bced52..365e6ff1e 100644
 --- a/servconf.c
 +++ b/servconf.c
-@@ -403,9 +403,9 @@ fill_default_server_options(ServerOptions *options)
+@@ -423,9 +423,9 @@ fill_default_server_options(ServerOptions *options)
         if (options->permit_tun == -1)
                 options->permit_tun = SSH_TUNMODE_NO;
         if (options->ip_qos_interactive == -1)
@@ -56,10 +56,10 @@ index c5dd617ef..bf2669147 100644
                 options->version_addendum = xstrdup("");
         if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1)
 diff --git a/ssh_config.5 b/ssh_config.5
-index 1a8e24bd1..f6c1b3b33 100644
+index a27631ae9..a9f6d906f 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -1055,11 +1055,9 @@ If one argument is specified, it is used as the packet class unconditionally.
+@@ -1098,11 +1098,9 @@ If one argument is specified, it is used as the packet class unconditionally.
  If two values are specified, the first is automatically selected for
  interactive sessions and the second for non-interactive sessions.
  The default is
@@ -74,10 +74,10 @@ index 1a8e24bd1..f6c1b3b33 100644
  .It Cm KbdInteractiveAuthentication
  Specifies whether to use keyboard-interactive authentication.
 diff --git a/sshd_config.5 b/sshd_config.5
-index ba50a30f1..03f813e72 100644
+index c0c4ebd66..e5380f5dc 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -866,11 +866,9 @@ If one argument is specified, it is used as the packet class unconditionally.
+@@ -886,11 +886,9 @@ If one argument is specified, it is used as the packet class unconditionally.
  If two values are specified, the first is automatically selected for
  interactive sessions and the second for non-interactive sessions.
  The default is