- fix ssh-copy-id -i arg support

Changed files:
    openssh.spec -> 1.349
    ssh-copy-id-arg-fix.patch -> 1.1

diff --git a/openssh.spec b/openssh.spec
index 0b7a17f91a9f45af0aad80edb64c1f11bc7ac413..5e93dbcb52f8f7f0f049b4aed088218601aeed80 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -29,7 +29,7 @@ Summary(ru.UTF-8):    OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
 Version:       5.7p1
-Release:       3
+Release:       4
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
@@ -58,6 +58,7 @@ 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
@@ -516,6 +517,7 @@ 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
new file mode 100644 (file)
index 0000000..a65aa5e
--- /dev/null
+++ b/ssh-copy-id-arg-fix.patch
@@ -0,0 +1,11 @@
+--- 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