diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rw-r--r-- | debian/patches/ssh-copy-id-portable.patch | 20 |
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 @@ | |||
1 | openssh (1:6.2p2-4) UNRELEASED; urgency=low | ||
2 | |||
3 | * Fix non-portable shell in ssh-copy-id (closes: #711162). | ||
4 | |||
5 | -- Colin Watson <cjwatson@debian.org> Fri, 31 May 2013 16:20:49 +0100 | ||
6 | |||
1 | openssh (1:6.2p2-3) unstable; urgency=low | 7 | openssh (1:6.2p2-3) unstable; urgency=low |
2 | 8 | ||
3 | * If the running init daemon is Upstart, then, on the first upgrade to | 9 | * 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 | |||
26 | dnssec-sshfp.patch | 26 | dnssec-sshfp.patch |
27 | auth-log-verbosity.patch | 27 | auth-log-verbosity.patch |
28 | mention-ssh-keygen-on-keychange.patch | 28 | mention-ssh-keygen-on-keychange.patch |
29 | ssh-copy-id-portable.patch | ||
29 | 30 | ||
30 | # Versioning | 31 | # Versioning |
31 | package-versioning.patch | 32 | 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 @@ | |||
1 | Description: Fix non-portable shell in ssh-copy-id | ||
2 | Author: Colin Watson <cjwatson@debian.org> | ||
3 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2117 | ||
4 | Bug-Debian: http://bugs.debian.org/711162 | ||
5 | Forwarded: https://bugzilla.mindrot.org/show_bug.cgi?id=2117 | ||
6 | Last-Update: 2013-06-05 | ||
7 | |||
8 | Index: b/contrib/ssh-copy-id | ||
9 | =================================================================== | ||
10 | --- a/contrib/ssh-copy-id | ||
11 | +++ b/contrib/ssh-copy-id | ||
12 | @@ -165,7 +165,7 @@ | ||
13 | |||
14 | eval set -- "$SAVEARGS" | ||
15 | |||
16 | -if [ $# == 0 ] ; then | ||
17 | +if [ $# = 0 ] ; then | ||
18 | usage | ||
19 | fi | ||
20 | if [ $# != 1 ] ; then | ||