New upstream release (7.9p1)

1 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index dacff74c3..cdb905b2e 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From f48c4fd12f8ecd275226e357454e45f10c20ac92 Mon Sep 17 00:00:00 2001
+From 96c85e746d4f94c7d2748a200e5817ad8a987918 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:09 +0000
 Subject: Adjust various OpenBSD-specific references in manual pages
@@ -44,7 +44,7 @@ index ef0de0850..149846c8c 100644
  .Sh SEE ALSO
  .Xr ssh-keygen 1 ,
 diff --git a/ssh-keygen.1 b/ssh-keygen.1
-index dd6e7e5a8..33e0bbcc1 100644
+index bfa2eb5f3..da6b5ed76 100644
 --- a/ssh-keygen.1
 +++ b/ssh-keygen.1
 @@ -176,9 +176,7 @@ key in
@@ -78,7 +78,7 @@ index dd6e7e5a8..33e0bbcc1 100644
  It is important that this file contains moduli of a range of bit lengths and
  that both ends of a connection share common moduli.
  .Sh CERTIFICATES
-@@ -864,7 +860,7 @@ on all machines
+@@ -877,7 +873,7 @@ on all machines
  where the user wishes to log in using public key authentication.
  There is no need to keep the contents of this file secret.
  .Pp
@@ -88,10 +88,10 @@ index dd6e7e5a8..33e0bbcc1 100644
  The file format is described in
  .Xr moduli 5 .
 diff --git a/ssh.1 b/ssh.1
-index cb0fdd50e..d41426781 100644
+index 81f29af43..5dfad6daa 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -850,6 +850,10 @@ implements public key authentication protocol automatically,
+@@ -860,6 +860,10 @@ implements public key authentication protocol automatically,
  using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
  The HISTORY section of
  .Xr ssl 8
@@ -133,11 +133,11 @@ index 57a7fd66b..4abc01d66 100644
  .Xr sshd_config 5 ,
  .Xr inetd 8 ,
 diff --git a/sshd_config.5 b/sshd_config.5
-index 96a69ab55..9774831fe 100644
+index 37e6be38f..23f71fd1d 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -384,8 +384,7 @@ then no banner is displayed.
- By default, no banner is displayed.
+@@ -395,8 +395,7 @@ Certificates signed using other algorithms will not be accepted for
+ public key or host-based authentication.
  .It Cm ChallengeResponseAuthentication
  Specifies whether challenge-response authentication is allowed (e.g. via
 -PAM or through authentication styles supported in