[csw-devel] SF.net SVN: gar:[8893] csw/mgar/pkg/openssh/trunk

[chninkel at users.sourceforge.net]

Revision: 8893
          http://gar.svn.sourceforge.net/gar/?rev=8893&view=rev
Author:   chninkel
Date:     2010-02-28 17:02:05 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
openssh: added ssh-copy-id

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/Makefile
    csw/mgar/pkg/openssh/trunk/checksums
    csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype
    csw/mgar/pkg/openssh/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-02-28 16:58:21 UTC (rev 8892)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-02-28 17:02:05 UTC (rev 8893)
@@ -124,8 +124,12 @@
 	@$(MAKECOOKIE)
 
 # adding documentation files
-post-merge: merge-config-files merge-doc-files merge-init-files
+post-merge: merge-config-files merge-doc-files merge-init-files merge-contrib-files
 
+merge-contrib-files:
+	ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id"
+	ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id.1" "$(PKGROOT)/$(mandir)/man1/ssh-copy-id.1"
+
 merge-init-files:
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswopenssh" "$(PKGROOT)/etc/opt/csw/init.d/cswopenssh"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswopenssh.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswopenssh.xml"

Modified: csw/mgar/pkg/openssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssh/trunk/checksums	2010-02-28 16:58:21 UTC (rev 8892)
+++ csw/mgar/pkg/openssh/trunk/checksums	2010-02-28 17:02:05 UTC (rev 8893)
@@ -1,11 +1,11 @@
 1d3d6d477c09e59c514e637fa3a2f7a4  CSWossh.checkinstall
 0993813fa5c752215f892cb67c86816f  CSWossh.preinstall
 59bf25f92d3660aa7e65fb6bdc85e72f  CSWossh.prototype
-cbe3d9921fca3130e42db09914c6ea07  CSWosshclient.prototype
+c0782f6ddcddf2ba7e9635a41a3a0166  CSWosshclient.prototype
 1d3d6d477c09e59c514e637fa3a2f7a4  CSWosshlpk.checkinstall
 0993813fa5c752215f892cb67c86816f  CSWosshlpk.preinstall
 22ffa2a9b7bf310d58d3b299805a41b1  CSWosshlpk.prototype
-5323516aa6c7714d03473a0879599fc5  changelog.CSW
+2d1343a75521f5db657da9ad5a6d8dca  changelog.CSW
 9153031524651a18e7edaed4637aa769  contrib-openssh-lpk-5.2p1-0.3.9.patch
 a5ebb2e3fdaa06c3c9edba55aac5f83b  cswopenssh
 8e765642349b6321d01b33e95304e113  cswopenssh.xml

Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype	2010-02-28 16:58:21 UTC (rev 8892)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype	2010-02-28 17:02:05 UTC (rev 8893)
@@ -4,6 +4,7 @@
 f none /opt/csw/bin/ssh 0755 root bin
 f none /opt/csw/bin/ssh-add 0755 root bin
 f none /opt/csw/bin/ssh-agent 0755 root bin
+f none /opt/csw/bin/ssh-copy-id 0755 root bin
 f none /opt/csw/bin/ssh-keygen 0755 root bin
 f none /opt/csw/bin/ssh-keyscan 0755 root bin
 d none /opt/csw/etc/ssh 0755 root bin
@@ -31,6 +32,7 @@
 s none /opt/csw/share/man/man1/slogin.1=./ssh.1
 f none /opt/csw/share/man/man1/ssh-add.1 0644 root bin
 f none /opt/csw/share/man/man1/ssh-agent.1 0644 root bin
+f none /opt/csw/share/man/man1/ssh-copy-id.1 0644 root bin
 f none /opt/csw/share/man/man1/ssh-keygen.1 0644 root bin
 f none /opt/csw/share/man/man1/ssh-keyscan.1 0644 root bin
 f none /opt/csw/share/man/man1/ssh.1 0644 root bin

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-02-28 16:58:21 UTC (rev 8892)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-02-28 17:02:05 UTC (rev 8893)
@@ -1,5 +1,11 @@
-openssh (5.3p1,REV=2008.12.16) unstable
+openssh (5.3p1,REV=2010.02.28) unstable
 
+  * Added ssh-copy-id contrib script (Closes: #4306)
+
+ -- Yann Rouillard <yann at opencsw.org>  Sun, 28 Feb 2010 17:03:52 +0100
+
+openssh (5.3p1,REV=2009.12.14) unstable
+
   * Package rebuild to solve an incorrect upload in the repository tree.
   * Changed package version numbering scheme.
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.