packages: openssh/openssh.spec, openssh/ssh-copy-id-arg-fix.patch (NEW) - f...

[glen]

Author: glen                         Date: Sat Jan 29 11:35:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix ssh-copy-id -i arg support

---- Files affected:
packages/openssh:
   openssh.spec (1.348 -> 1.349) , ssh-copy-id-arg-fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.348 packages/openssh/openssh.spec:1.349
--- packages/openssh/openssh.spec:1.348	Tue Jan 25 19:21:33 2011
+++ packages/openssh/openssh.spec	Sat Jan 29 12:35:02 2011
@@ -30,7 +30,7 @@
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
 Version:	5.7p1
-Release:	3
+Release:	4
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
@@ -59,6 +59,7 @@
 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,6 +518,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %if "%{pld_release}" == "ac"
 # fix for missing x11.pc
@@ -762,6 +764,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.349  2011/01/29 11:35:02  glen
+- fix ssh-copy-id -i arg support
+
 Revision 1.348  2011/01/25 18:21:33  arekm
 rel 3; Drop obsolete /proc/pid/oom_adj. New /proc/pid/oom_score_adj uses totally different values, so adjust val for it.
 

================================================================
Index: packages/openssh/ssh-copy-id-arg-fix.patch
diff -u /dev/null packages/openssh/ssh-copy-id-arg-fix.patch:1.1
--- /dev/null	Sat Jan 29 12:35:07 2011
+++ packages/openssh/ssh-copy-id-arg-fix.patch	Sat Jan 29 12:35:02 2011
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.348&r2=1.349&f=u