1 files changed, 19 insertions, 19 deletions

diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index 2a5a2e466..9297decd6 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From 10138a01a89b20e851d85bd040e289d47b9815b0 Mon Sep 17 00:00:00 2001
+From 7e53354725eeb002e6126a73fd5f294ed9f9b03e 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
@@ -10,7 +10,7 @@ No single bug reference for this patch, but history includes:
  https://bugs.launchpad.net/bugs/456660 (ssl(8))
 
 Forwarded: not-needed
-Last-Update: 2014-10-07
+Last-Update: 2017-10-04
 
 Patch-Name: openbsd-docs.patch
 ---
@@ -44,10 +44,10 @@ index ef0de085..149846c8 100644
  .Sh SEE ALSO
  .Xr ssh-keygen 1 ,
 diff --git a/ssh-keygen.1 b/ssh-keygen.1
-index ce2213c7..01711dff 100644
+index 5f1ec09b..dfbc65dd 100644
 --- a/ssh-keygen.1
 +++ b/ssh-keygen.1
-@@ -178,9 +178,7 @@ key in
+@@ -176,9 +176,7 @@ key in
  .Pa ~/.ssh/id_ed25519
  or
  .Pa ~/.ssh/id_rsa .
@@ -58,18 +58,18 @@ index ce2213c7..01711dff 100644
  .Pp
  Normally this program generates the key and asks for a file in which
  to store the private key.
-@@ -227,9 +225,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519)
- for which host keys
- do not exist, generate the host keys with the default key file path,
- an empty passphrase, default bits for the key type, and default comment.
+@@ -229,9 +227,7 @@ If
+ .Fl f
+ has also been specified, its argument is used as a prefix to the
+ default path for the resulting host key files.
 -This is used by
 -.Pa /etc/rc
 -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 any SSH protocol
- 2 key when the
-@@ -644,7 +640,7 @@ option.
+ When saving a new-format private key (i.e. an ed25519 key or when the
+ .Fl o
+@@ -676,7 +672,7 @@ option.
  Valid generator values are 2, 3, and 5.
  .Pp
  Screened DH groups may be installed in
@@ -78,7 +78,7 @@ index ce2213c7..01711dff 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
-@@ -843,7 +839,7 @@ on all machines
+@@ -863,7 +859,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 ce2213c7..01711dff 100644
  The file format is described in
  .Xr moduli 5 .
 diff --git a/ssh.1 b/ssh.1
-index feef81a5..b1f128c2 100644
+index 3cc94688..2a2aab30 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -877,6 +877,10 @@ implements public key authentication protocol automatically,
+@@ -842,6 +842,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 feef81a5..b1f128c2 100644
  .Pp
  The file
 diff --git a/sshd.8 b/sshd.8
-index 989dd4bf..6355178f 100644
+index 2ed523a2..02c5e1df 100644
 --- a/sshd.8
 +++ b/sshd.8
 @@ -65,7 +65,7 @@ over an insecure network.
@@ -115,7 +115,7 @@ index 989dd4bf..6355178f 100644
  It forks a new
  daemon for each incoming connection.
  The forked daemons handle
-@@ -836,7 +836,7 @@ This file is for host-based authentication (see
+@@ -850,7 +850,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 989dd4bf..6355178f 100644
  Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
  key exchange method.
  The file format is described in
-@@ -936,7 +936,6 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -950,7 +950,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 989dd4bf..6355178f 100644
  .Xr sshd_config 5 ,
  .Xr inetd 8 ,
 diff --git a/sshd_config.5 b/sshd_config.5
-index 5f316481..603c2ba7 100644
+index 41e8c939..79676a95 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -372,8 +372,7 @@ then no banner is displayed.
+@@ -382,8 +382,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