New upstream release (7.5p1)

1 files changed, 6 insertions, 6 deletions

diff --git a/debian/patches/no-dsa-host-key-by-default.patch b/debian/patches/no-dsa-host-key-by-default.patch
index bfe6033b1..b20cb22d5 100644
--- a/debian/patches/no-dsa-host-key-by-default.patch
+++ b/debian/patches/no-dsa-host-key-by-default.patch
@@ -1,4 +1,4 @@
-From 3f1016b4535faf6e48aa71e21569aa714a25193f Mon Sep 17 00:00:00 2001
+From 417f561eac9f391661ad23a27f1d711f56566176 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Mon, 16 Jan 2017 13:53:04 +0000
 Subject: Remove ssh_host_dsa_key from HostKey default
@@ -19,7 +19,7 @@ Patch-Name: no-dsa-host-key-by-default.patch
  4 files changed, 6 insertions(+), 11 deletions(-)
 
 diff --git a/servconf.c b/servconf.c
-index 1cee3d6c..202c4506 100644
+index a391cf4b..1a7a5f18 100644
 --- a/servconf.c
 +++ b/servconf.c
 @@ -204,8 +204,6 @@ fill_default_server_options(ServerOptions *options)
@@ -32,7 +32,7 @@ index 1cee3d6c..202c4506 100644
                 options->host_key_files[options->num_host_key_files++] =
                     _PATH_HOST_ECDSA_KEY_FILE;
 diff --git a/sshd.8 b/sshd.8
-index 38a72540..e8f1fde8 100644
+index dd4b8fc3..79a7e080 100644
 --- a/sshd.8
 +++ b/sshd.8
 @@ -167,11 +167,10 @@ This option must be given if
@@ -51,7 +51,7 @@ index 38a72540..e8f1fde8 100644
  the different host key algorithms.
  .It Fl i
 diff --git a/sshd_config b/sshd_config
-index 13cbe2c6..4aea6c72 100644
+index f68edf36..92822959 100644
 --- a/sshd_config
 +++ b/sshd_config
 @@ -16,7 +16,6 @@
@@ -63,10 +63,10 @@ index 13cbe2c6..4aea6c72 100644
  #HostKey /etc/ssh/ssh_host_ed25519_key
  
 diff --git a/sshd_config.5 b/sshd_config.5
-index 703a9cdd..8f8fbb66 100644
+index cc5d9fb0..0747cc8b 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -733,11 +733,10 @@ is not to load any certificates.
+@@ -741,11 +741,10 @@ is not to load any certificates.
  Specifies a file containing a private host key
  used by SSH.
  The defaults are