- revert; ssh-copy-id -i idfile hostname still works (mislooked something i suppose)

Changed files:
    openssh.spec -> 1.350
    ssh-copy-id-arg-fix.patch -> 1.2

diff --git a/openssh.spec b/openssh.spec
index 5e93dbcb52f8f7f0f049b4aed088218601aeed80..9e12edbfd2417b987061e91831475dfa05a673a2 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -58,7 +58,6 @@ Patch10:      %{name}-include.patch
 Patch11:       %{name}-chroot.patch
 # http://people.debian.org/~cjwatson/%{name}-blacklist.diff
 Patch12:       %{name}-blacklist.diff
-Patch13:       ssh-copy-id-arg-fix.patch
 URL:           http://www.openssh.com/
 BuildRequires: %{__perl}
 BuildRequires: autoconf
@@ -517,7 +516,6 @@ openldap-a.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 
 %if "%{pld_release}" == "ac"
 # fix for missing x11.pc

diff --git a/ssh-copy-id-arg-fix.patch b/ssh-copy-id-arg-fix.patch
deleted file mode 100644 (file)
index a65aa5e..0000000
--- a/ssh-copy-id-arg-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openssh-5.7p1/contrib/ssh-copy-id~ 2011-01-25 20:27:50.000000000 +0200
-+++ openssh-5.7p1/contrib/ssh-copy-id  2011-01-29 13:02:29.597909848 +0200
-@@ -10,7 +10,7 @@
- if [ "-i" = "$1" ]; then
-   shift
-   # check if we have 2 parameters left, if so the first is the new ID file
--  if [ -n "$2" ]; then
-+  if [ -n "$1" ]; then
-     if expr "$1" : ".*\.pub" > /dev/null ; then
-       ID_FILE="$1"
-     else