21 files changed, 36 insertions, 30 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index d096efccd..011e71d0a 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-f62d1568c95ad1ad193b95d61e6e93baf8b935a0
-f62d1568c95ad1ad193b95d61e6e93baf8b935a0
+cda04ac1f5c69710187e602043758063479c3c65
+cda04ac1f5c69710187e602043758063479c3c65
 6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874
 6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874
 openssh_7.5p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 57b7520ea..5c618e385 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ openssh (1:7.5p1-6) UNRELEASED; urgency=medium
   [ Dimitri John Ledkov ]
   * Drop upstart system and user jobs (closes: #872851).
 
+  [ Chris Lamb ]
+  * Quote IP address in suggested "ssh-keygen -f" calls (closes: #872643).
+
  -- Colin Watson <cjwatson@debian.org>  Mon, 26 Jun 2017 10:09:28 +0100
 
 openssh (1:7.5p1-5) unstable; urgency=medium
diff --git a/debian/patches/authorized-keys-man-symlink.patch b/debian/patches/authorized-keys-man-symlink.patch
index 1875385e8..9287f84e2 100644
--- a/debian/patches/authorized-keys-man-symlink.patch
+++ b/debian/patches/authorized-keys-man-symlink.patch
@@ -1,4 +1,4 @@
-From 983412e0c80c406705e3c65402868b0d15d8695b Mon Sep 17 00:00:00 2001
+From 603fd07727100d4d95d4ac2853a160878cf16b66 Mon Sep 17 00:00:00 2001
 From: Tomas Pospisek <tpo_deb@sourcepole.ch>
 Date: Sun, 9 Feb 2014 16:10:07 +0000
 Subject: Install authorized_keys(5) as a symlink to sshd(8)
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
index 784cdf746..0939035cd 100644
--- a/debian/patches/debian-banner.patch
+++ b/debian/patches/debian-banner.patch
@@ -1,4 +1,4 @@
-From ddf05e4adc7feda2421bdf641bab79b76c1a918e Mon Sep 17 00:00:00 2001
+From 0eb0f49c5c32940fd192ef98e0d13bf5407da27b Mon Sep 17 00:00:00 2001
 From: Kees Cook <kees@debian.org>
 Date: Sun, 9 Feb 2014 16:10:06 +0000
 Subject: Add DebianBanner server configuration option
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index 9cac5ba1c..d65ed45fa 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
-From 2a56febeeeb301ce75748d175e35268f45790377 Mon Sep 17 00:00:00 2001
+From cf60afd3438c444e20b114fbd799168002c74aae Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:18 +0000
 Subject: Various Debian-specific configuration changes
diff --git a/debian/patches/doc-hash-tab-completion.patch b/debian/patches/doc-hash-tab-completion.patch
index 7af55869b..cc30ec4b5 100644
--- a/debian/patches/doc-hash-tab-completion.patch
+++ b/debian/patches/doc-hash-tab-completion.patch
@@ -1,4 +1,4 @@
-From 0d5ad9fa8d9270ddaaed964edac35b99e7eed067 Mon Sep 17 00:00:00 2001
+From b0c0c72ecdbef4ae020bbe17b47f1f616253722d Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:11 +0000
 Subject: Document that HashKnownHosts may break tab-completion
diff --git a/debian/patches/fix-incoming-compression-statistics.patch b/debian/patches/fix-incoming-compression-statistics.patch
index 482787e82..d948d67bc 100644
--- a/debian/patches/fix-incoming-compression-statistics.patch
+++ b/debian/patches/fix-incoming-compression-statistics.patch
@@ -1,4 +1,4 @@
-From f62d1568c95ad1ad193b95d61e6e93baf8b935a0 Mon Sep 17 00:00:00 2001
+From cda04ac1f5c69710187e602043758063479c3c65 Mon Sep 17 00:00:00 2001
 From: Russell Coker <russell@coker.com.au>
 Date: Tue, 6 Jun 2017 15:00:20 +0100
 Subject: Fix incoming compression statistics
diff --git a/debian/patches/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch
index f4047c43b..5bfea56e9 100644
--- a/debian/patches/gnome-ssh-askpass2-icon.patch
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -1,4 +1,4 @@
-From fb48aada85eeeca2c0c90dcfd126463b6e77a441 Mon Sep 17 00:00:00 2001
+From 28b830b6c22317c039ec2b2070fcd94bc3cf0477 Mon Sep 17 00:00:00 2001
 From: Vincent Untz <vuntz@ubuntu.com>
 Date: Sun, 9 Feb 2014 16:10:16 +0000
 Subject: Give the ssh-askpass-gnome window a default icon
diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch
index f2274cb7f..a425efa55 100644
--- a/debian/patches/mention-ssh-keygen-on-keychange.patch
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -1,19 +1,20 @@
-From 315c5a460b33d076edc27a41b0e790ea73cc3b9d Mon Sep 17 00:00:00 2001
+From 78963ce671198209cadd01ebb0aa20ae4fac22d6 Mon Sep 17 00:00:00 2001
 From: Scott Moser <smoser@ubuntu.com>
 Date: Sun, 9 Feb 2014 16:10:03 +0000
 Subject: Mention ssh-keygen in ssh fingerprint changed warning
 
+Author: Chris Lamb <lamby@debian.org>
 Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607
-Last-Update: 2015-09-08
+Last-Update: 2017-08-22
 
 Patch-Name: mention-ssh-keygen-on-keychange.patch
 ---
- sshconnect.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ sshconnect.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/sshconnect.c b/sshconnect.c
-index 7f169a8f..66c495f4 100644
+index 7f169a8f..881b0886 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
 @@ -1080,9 +1080,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
@@ -25,18 +26,19 @@ index 7f169a8f..66c495f4 100644
                                 error("Offending key for IP in %s:%lu",
                                     ip_found->file, ip_found->line);
 +                               error("  remove with:");
-+                               error("  ssh-keygen -f \"%s\" -R %s",
++                               error("  ssh-keygen -f \"%s\" -R \"%s\"",
 +                                   ip_found->file, ip);
 +                       }
                 }
                 /* The host key has changed. */
                 warn_changed_key(host_key);
-@@ -1090,6 +1094,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
+@@ -1090,6 +1094,9 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                     user_hostfiles[0]);
                 error("Offending %s key in %s:%lu", key_type(host_found->key),
                     host_found->file, host_found->line);
 +               error("  remove with:");
-+               error("  ssh-keygen -f \"%s\" -R %s", host_found->file, host);
++               error("  ssh-keygen -f \"%s\" -R \"%s\"",
++                   host_found->file, host);
  
                 /*
                  * If strict host key checking is in use, the user will have
diff --git a/debian/patches/no-dsa-host-key-by-default.patch b/debian/patches/no-dsa-host-key-by-default.patch
index d301e387a..92f9d7c61 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 12b741fba8a8430c32b8b48e5427504e97d48625 Mon Sep 17 00:00:00 2001
+From 5fc5168dde0c840bf743058d235193fc27e61cab 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
diff --git a/debian/patches/no-openssl-version-status.patch b/debian/patches/no-openssl-version-status.patch
index 03d1dbd59..63a226284 100644
--- a/debian/patches/no-openssl-version-status.patch
+++ b/debian/patches/no-openssl-version-status.patch
@@ -1,4 +1,4 @@
-From a4fa272fdeee5d56d94e0a6aac5c5b3ee4f73ce2 Mon Sep 17 00:00:00 2001
+From 1780065057642803e173730f6e2162943ae54302 Mon Sep 17 00:00:00 2001
 From: Kurt Roeckx <kurt@roeckx.be>
 Date: Sun, 9 Feb 2014 16:10:14 +0000
 Subject: Don't check the status field of the OpenSSL version
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index 94574e321..2a5a2e466 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From 22fa108c15a43eb80d5fa7114208ab813019954e Mon Sep 17 00:00:00 2001
+From 10138a01a89b20e851d85bd040e289d47b9815b0 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
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch
index 1a1036fa8..566761b3a 100644
--- a/debian/patches/package-versioning.patch
+++ b/debian/patches/package-versioning.patch
@@ -1,4 +1,4 @@
-From 8f127a3c84d2eae8d1fb5529887c880c22c5cf75 Mon Sep 17 00:00:00 2001
+From 24262015f741a40c9374b15d24c23b8e98b7b7ae Mon Sep 17 00:00:00 2001
 From: Matthew Vernon <matthew@debian.org>
 Date: Sun, 9 Feb 2014 16:10:05 +0000
 Subject: Include the Debian version in our identification
@@ -19,7 +19,7 @@ Patch-Name: package-versioning.patch
  3 files changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/sshconnect.c b/sshconnect.c
-index 66c495f4..120f0945 100644
+index 881b0886..d9ed5910 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
 @@ -526,10 +526,10 @@ send_client_banner(int connection_out, int minor1)
diff --git a/debian/patches/regress-integrity-robust.patch b/debian/patches/regress-integrity-robust.patch
index 4ef0f1b5f..fe8a321c3 100644
--- a/debian/patches/regress-integrity-robust.patch
+++ b/debian/patches/regress-integrity-robust.patch
@@ -1,4 +1,4 @@
-From 989ce98a71063acb2a13f35977b962125c07d1b2 Mon Sep 17 00:00:00 2001
+From 11f55875afff41aa1f1732ff138c9f76dc2a0afa Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 1 Jan 2017 15:21:10 +0000
 Subject: Make integrity tests more robust against timeouts
diff --git a/debian/patches/restore-authorized_keys2.patch b/debian/patches/restore-authorized_keys2.patch
index 888f45489..8ef01fe57 100644
--- a/debian/patches/restore-authorized_keys2.patch
+++ b/debian/patches/restore-authorized_keys2.patch
@@ -1,4 +1,4 @@
-From b24b239b07ee05d677141592921e74fadbdd16b2 Mon Sep 17 00:00:00 2001
+From 91dbdb5e4e0a34acdf8dbc79ef70c7f3942d4a95 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 5 Mar 2017 02:02:11 +0000
 Subject: Restore reading authorized_keys2 by default
diff --git a/debian/patches/s390-missing-header.patch b/debian/patches/s390-missing-header.patch
index 3789d650f..be7c511b9 100644
--- a/debian/patches/s390-missing-header.patch
+++ b/debian/patches/s390-missing-header.patch
@@ -1,4 +1,4 @@
-From 8f69d359e39fef44d60c12ac105ed5f398ad2599 Mon Sep 17 00:00:00 2001
+From 735a04bf257744fc490581e9d5d7e607e4419579 Mon Sep 17 00:00:00 2001
 From: Damien Miller <djm@mindrot.org>
 Date: Wed, 22 Mar 2017 12:43:02 +1100
 Subject: Missing header on Linux/s390
diff --git a/debian/patches/ssh-agent-setgid.patch b/debian/patches/ssh-agent-setgid.patch
index 72ee695be..188869fe2 100644
--- a/debian/patches/ssh-agent-setgid.patch
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -1,4 +1,4 @@
-From c001f571bd899e59ae81fba7bb8dd69da2b55059 Mon Sep 17 00:00:00 2001
+From 8c1482336efd745a72cbd27ac07977ccb6d8b35b Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:13 +0000
 Subject: Document consequences of ssh-agent being setgid in ssh-agent(1)
diff --git a/debian/patches/ssh-argv0.patch b/debian/patches/ssh-argv0.patch
index b637b7bda..f07a061a1 100644
--- a/debian/patches/ssh-argv0.patch
+++ b/debian/patches/ssh-argv0.patch
@@ -1,4 +1,4 @@
-From dce48f6795b6f0b1d4c2e069f26a21419ba4d575 Mon Sep 17 00:00:00 2001
+From 5be45fb4b0459bbff7b4b5a67c2f754c601155df Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:10 +0000
 Subject: ssh(1): Refer to ssh-argv0(1)
diff --git a/debian/patches/systemd-readiness.patch b/debian/patches/systemd-readiness.patch
index e7511110f..bddc781f2 100644
--- a/debian/patches/systemd-readiness.patch
+++ b/debian/patches/systemd-readiness.patch
@@ -1,4 +1,4 @@
-From 92415b13be2ce917028d1327fb9bb50208d0139e Mon Sep 17 00:00:00 2001
+From 49ea641997b0dce73df3271f10a875cb702729b7 Mon Sep 17 00:00:00 2001
 From: Michael Biebl <biebl@debian.org>
 Date: Mon, 21 Dec 2015 16:08:47 +0000
 Subject: Add systemd readiness notification support
diff --git a/debian/patches/x32-syntax-error.patch b/debian/patches/x32-syntax-error.patch
index 7399bb0d1..c7b7a0a94 100644
--- a/debian/patches/x32-syntax-error.patch
+++ b/debian/patches/x32-syntax-error.patch
@@ -1,4 +1,4 @@
-From 59b1519ddb11cc2393037e97ae806656c6276020 Mon Sep 17 00:00:00 2001
+From 4a6a0dd530022333dccf0e54a4c2827662b14109 Mon Sep 17 00:00:00 2001
 From: Damien Miller <djm@mindrot.org>
 Date: Tue, 21 Mar 2017 08:47:55 +1100
 Subject: Fix syntax error on Linux/X32
diff --git a/sshconnect.c b/sshconnect.c
index 120f09458..d9ed5910b 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1084,7 +1084,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                                 error("Offending key for IP in %s:%lu",
                                     ip_found->file, ip_found->line);
                                 error("  remove with:");
-                                error("  ssh-keygen -f \"%s\" -R %s",
+                                error("  ssh-keygen -f \"%s\" -R \"%s\"",
                                     ip_found->file, ip);
                         }
                 }
@@ -1095,7 +1095,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                 error("Offending %s key in %s:%lu", key_type(host_found->key),
                     host_found->file, host_found->line);
                 error("  remove with:");
-                error("  ssh-keygen -f \"%s\" -R %s", host_found->file, host);
+                error("  ssh-keygen -f \"%s\" -R \"%s\"",
+                    host_found->file, host);
 
                 /*
                  * If strict host key checking is in use, the user will have