New upstream release (7.0p1).

1 files changed, 8 insertions, 8 deletions

diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index 8c681b9b0..389e8e73f 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From 96ecf95406b8599528e60ccfc5b32b543f74ddc4 Mon Sep 17 00:00:00 2001
+From d4a383b11e186c0db65b9a2779ad5f5889563ceb 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 ef0de08..149846c 100644
  .Sh SEE ALSO
  .Xr ssh-keygen 1 ,
 diff --git a/ssh-keygen.1 b/ssh-keygen.1
-index 9b93666..19bed1e 100644
+index 8c3317b..1a8644e 100644
 --- a/ssh-keygen.1
 +++ b/ssh-keygen.1
 @@ -174,9 +174,7 @@ key in
@@ -88,10 +88,10 @@ index 9b93666..19bed1e 100644
  The file format is described in
  .Xr moduli 5 .
 diff --git a/ssh.1 b/ssh.1
-index c84196f..c3e1266 100644
+index ff80022..4fba77f 100644
 --- a/ssh.1
 +++ b/ssh.1
-@@ -766,6 +766,10 @@ Protocol 1 is restricted to using only RSA keys,
+@@ -853,6 +853,10 @@ Protocol 1 is restricted to using only RSA keys,
  but protocol 2 may use any.
  The HISTORY section of
  .Xr ssl 8
@@ -103,7 +103,7 @@ index c84196f..c3e1266 100644
  .Pp
  The file
 diff --git a/sshd.8 b/sshd.8
-index 5afd10f..2f4d4f3 100644
+index 2105979..42ba596 100644
 --- a/sshd.8
 +++ b/sshd.8
 @@ -67,7 +67,7 @@ over an insecure network.
@@ -115,7 +115,7 @@ index 5afd10f..2f4d4f3 100644
  It forks a new
  daemon for each incoming connection.
  The forked daemons handle
-@@ -864,7 +864,7 @@ This file is for host-based authentication (see
+@@ -861,7 +861,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 5afd10f..2f4d4f3 100644
  Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange".
  The file format is described in
  .Xr moduli 5 .
-@@ -963,7 +963,6 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -960,7 +960,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,7 +133,7 @@ index 5afd10f..2f4d4f3 100644
  .Xr sshd_config 5 ,
  .Xr inetd 8 ,
 diff --git a/sshd_config.5 b/sshd_config.5
-index a5afbc3..355b445 100644
+index 641e1fa..7e40a27 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
 @@ -374,8 +374,7 @@ This option is only available for protocol version 2.