New upstream release (6.9p1).

1 files changed, 7 insertions, 7 deletions

diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index f5b96f4a1..97971707f 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From 96c2797aaa79d687e75dc56f40f7102131d87fb1 Mon Sep 17 00:00:00 2001
+From 3303a9d037ae9b62e5af01f467d8053cbd9c8410 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
@@ -88,7 +88,7 @@ index 9b93666..19bed1e 100644
  The file format is described in
  .Xr moduli 5 .
 diff --git a/ssh.1 b/ssh.1
-index 53c711a..04de6cf 100644
+index c84196f..c3e1266 100644
 --- a/ssh.1
 +++ b/ssh.1
 @@ -766,6 +766,10 @@ Protocol 1 is restricted to using only RSA keys,
@@ -103,7 +103,7 @@ index 53c711a..04de6cf 100644
  .Pp
  The file
 diff --git a/sshd.8 b/sshd.8
-index fc2154c..8dba6cf 100644
+index 5afd10f..2f4d4f3 100644
 --- a/sshd.8
 +++ b/sshd.8
 @@ -67,7 +67,7 @@ over an insecure network.
@@ -115,7 +115,7 @@ index fc2154c..8dba6cf 100644
  It forks a new
  daemon for each incoming connection.
  The forked daemons handle
-@@ -862,7 +862,7 @@ This file is for host-based authentication (see
+@@ -864,7 +864,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 fc2154c..8dba6cf 100644
  Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange".
  The file format is described in
  .Xr moduli 5 .
-@@ -961,7 +961,6 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -963,7 +963,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 fc2154c..8dba6cf 100644
  .Xr sshd_config 5 ,
  .Xr inetd 8 ,
 diff --git a/sshd_config.5 b/sshd_config.5
-index ec58635..453d741 100644
+index a5afbc3..355b445 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -322,8 +322,7 @@ This option is only available for protocol version 2.
+@@ -374,8 +374,7 @@ This option is only available for protocol version 2.
  By default, no banner is displayed.
  .It Cm ChallengeResponseAuthentication
  Specifies whether challenge-response authentication is allowed (e.g. via