New upstream release (8.1p1)

1 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/revert-ipqos-defaults.patch b/debian/patches/revert-ipqos-defaults.patch
index d524dc34f..34743f555 100644
--- a/debian/patches/revert-ipqos-defaults.patch
+++ b/debian/patches/revert-ipqos-defaults.patch
@@ -1,4 +1,4 @@
-From f08fbfbaad10ae0bd9f057de8e18071e588146a6 Mon Sep 17 00:00:00 2001
+From efef12825b9582c1710da3b7e50135870963d4f4 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 f35bde6e6..2ba312441 100644
+index 253574ce0..9812b8d98 100644
 --- a/readconf.c
 +++ b/readconf.c
-@@ -2165,9 +2165,9 @@ fill_default_options(Options * options)
+@@ -2174,9 +2174,9 @@ fill_default_options(Options * options)
         if (options->visual_host_key == -1)
                 options->visual_host_key = 0;
         if (options->ip_qos_interactive == -1)
@@ -40,7 +40,7 @@ index f35bde6e6..2ba312441 100644
                 options->request_tty = REQUEST_TTY_AUTO;
         if (options->proxy_use_fdpass == -1)
 diff --git a/servconf.c b/servconf.c
-index 8d2bced52..365e6ff1e 100644
+index 5576098a5..4464d51a5 100644
 --- a/servconf.c
 +++ b/servconf.c
 @@ -423,9 +423,9 @@ fill_default_server_options(ServerOptions *options)
@@ -56,10 +56,10 @@ index 8d2bced52..365e6ff1e 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 a27631ae9..a9f6d906f 100644
+index d27655e15..b71d5ede9 100644
 --- a/ssh_config.5
 +++ b/ssh_config.5
-@@ -1098,11 +1098,9 @@ If one argument is specified, it is used as the packet class unconditionally.
+@@ -1110,11 +1110,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 a27631ae9..a9f6d906f 100644
  .It Cm KbdInteractiveAuthentication
  Specifies whether to use keyboard-interactive authentication.
 diff --git a/sshd_config.5 b/sshd_config.5
-index c0c4ebd66..e5380f5dc 100644
+index 02e29cb6f..ba533af9e 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -886,11 +886,9 @@ If one argument is specified, it is used as the packet class unconditionally.
+@@ -892,11 +892,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