3 files changed, 27 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 5c1a5c11c..8cb2afd10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:6.2p2-4) UNRELEASED; urgency=low
+
+  * Fix non-portable shell in ssh-copy-id (closes: #711162).
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 31 May 2013 16:20:49 +0100
+
 openssh (1:6.2p2-3) unstable; urgency=low
 
   * If the running init daemon is Upstart, then, on the first upgrade to
diff --git a/debian/patches/series b/debian/patches/series
index 6f2da2944..6d6020805 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,6 +26,7 @@ shell-path.patch
 dnssec-sshfp.patch
 auth-log-verbosity.patch
 mention-ssh-keygen-on-keychange.patch
+ssh-copy-id-portable.patch
 
 # Versioning
 package-versioning.patch
diff --git a/debian/patches/ssh-copy-id-portable.patch b/debian/patches/ssh-copy-id-portable.patch
new file mode 100644
index 000000000..9583eab4b
--- /dev/null
+++ b/debian/patches/ssh-copy-id-portable.patch
@@ -0,0 +1,20 @@
+Description: Fix non-portable shell in ssh-copy-id
+Author: Colin Watson <cjwatson@debian.org>
+Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2117
+Bug-Debian: http://bugs.debian.org/711162
+Forwarded: https://bugzilla.mindrot.org/show_bug.cgi?id=2117
+Last-Update: 2013-06-05
+
+Index: b/contrib/ssh-copy-id
+===================================================================
+--- a/contrib/ssh-copy-id
++++ b/contrib/ssh-copy-id
+@@ -165,7 +165,7 @@
+ 
+ eval set -- "$SAVEARGS"
+ 
+-if [ $# == 0 ] ; then
++if [ $# = 0 ] ; then
+   usage
+ fi
+ if [ $# != 1 ] ; then