New upstream release (7.8p1)

Closes: #907534

1 files changed, 13 insertions, 13 deletions

diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index 89bd0a3bd..dacff74c3 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From c3d9231e598560dfe63a56a422439d263a2c3ebe Mon Sep 17 00:00:00 2001
+From f48c4fd12f8ecd275226e357454e45f10c20ac92 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 3525d7d17..39767e621 100644
+index dd6e7e5a8..33e0bbcc1 100644
 --- a/ssh-keygen.1
 +++ b/ssh-keygen.1
 @@ -176,9 +176,7 @@ key in
@@ -67,9 +67,9 @@ index 3525d7d17..39767e621 100644
 -to generate new host keys.
 +This is used by system administration scripts to generate new host keys.
  .It Fl a Ar rounds
- When saving a new-format private key (i.e. an ed25519 key or when the
- .Fl o
-@@ -685,7 +681,7 @@ option.
+ When saving a private key this option specifies the number of KDF
+ (key derivation function) rounds used.
+@@ -677,7 +673,7 @@ option.
  Valid generator values are 2, 3, and 5.
  .Pp
  Screened DH groups may be installed in
@@ -78,7 +78,7 @@ index 3525d7d17..39767e621 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
-@@ -872,7 +868,7 @@ on all machines
+@@ -864,7 +860,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 3525d7d17..39767e621 100644
  The file format is described in
  .Xr moduli 5 .
 diff --git a/ssh.1 b/ssh.1
-index 0ef7c1709..54e21d88a 100644
+index cb0fdd50e..d41426781 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -846,6 +846,10 @@ implements public key authentication protocol automatically,
+@@ -850,6 +850,10 @@ implements public key authentication protocol automatically,
  using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
  The HISTORY section of
  .Xr ssl 8
@@ -103,7 +103,7 @@ index 0ef7c1709..54e21d88a 100644
  .Pp
  The file
 diff --git a/sshd.8 b/sshd.8
-index c8299d5e5..378aeb9f5 100644
+index 57a7fd66b..4abc01d66 100644
 --- a/sshd.8
 +++ b/sshd.8
 @@ -65,7 +65,7 @@ over an insecure network.
@@ -115,7 +115,7 @@ index c8299d5e5..378aeb9f5 100644
  It forks a new
  daemon for each incoming connection.
  The forked daemons handle
-@@ -856,7 +856,7 @@ This file is for host-based authentication (see
+@@ -884,7 +884,7 @@ This file is for host-based authentication (see
  .Xr ssh 1 ) .
  It should only be writable by root.
  .Pp
@@ -124,7 +124,7 @@ index c8299d5e5..378aeb9f5 100644
  Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
  key exchange method.
  The file format is described in
-@@ -954,7 +954,6 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -982,7 +982,6 @@ The content of this file is not sensitive; it can be world-readable.
  .Xr ssh-keyscan 1 ,
  .Xr chroot 2 ,
  .Xr hosts_access 5 ,
@@ -133,10 +133,10 @@ index c8299d5e5..378aeb9f5 100644
  .Xr sshd_config 5 ,
  .Xr inetd 8 ,
 diff --git a/sshd_config.5 b/sshd_config.5
-index 45044a70f..44b918463 100644
+index 96a69ab55..9774831fe 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -383,8 +383,7 @@ then no banner is displayed.
+@@ -384,8 +384,7 @@ then no banner is displayed.
  By default, no banner is displayed.
  .It Cm ChallengeResponseAuthentication
  Specifies whether challenge-response authentication is allowed (e.g. via