[csw-devel] SF.net SVN: gar:[4004] csw/mgar/pkg/openssh/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sat Mar 28 01:24:03 CET 2009
Revision: 4004
http://gar.svn.sourceforge.net/gar/?rev=4004&view=rev
Author: chninkel
Date: 2009-03-28 00:24:03 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
openssh: updated Makefile for garv2
Modified Paths:
--------------
csw/mgar/pkg/openssh/trunk/Makefile
csw/mgar/pkg/openssh/trunk/checksums
csw/mgar/pkg/openssh/trunk/files/CSWossh.gspec
csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec
csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype
csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.gspec
csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype
Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile 2009-03-27 23:37:15 UTC (rev 4003)
+++ csw/mgar/pkg/openssh/trunk/Makefile 2009-03-28 00:24:03 UTC (rev 4004)
@@ -88,20 +88,29 @@
# adding documentation files
post-install: customize_ssh_config
+ ginstall $(WORKDIR_FIRSTMOD)/*.conf $(WORKDIR)/
+ ginstall -D $(WORKDIR_FIRSTMOD)/openssh $(PKGROOT)/etc/init.d/openssh
+ ginstall -D $(WORKDIR_FIRSTMOD)/sshd_config $(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW
+ ginstall -D $(WORKDIR_FIRSTMOD)/openssh_restart_workaround.sh $(PKGROOT)/$(sharedstatedir)/openssh/openssh_restart_workaround.sh
+
ifdef LPK
- mkdir -p $(DESTDIR)/$(docdir)/openssh_lpk/
- cd $(WORKSRC) && ginstall $(DOCFILES) $(DESTDIR)/$(docdir)/openssh_lpk/
+ mkdir -p $(PKGROOT)/$(docdir)/openssh_lpk/
+ cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/openssh_lpk/
+ ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/openssh_lpk/
else
- mkdir -p $(DESTDIR)/$(docdir)/openssh/
- cd $(WORKSRC) && ginstall $(DOCFILES) $(DESTDIR)/$(docdir)/openssh/
- mkdir -p $(DESTDIR)/$(docdir)/openssh_client/
- cd $(WORKSRC) && ginstall $(DOCFILES) $(DESTDIR)/$(docdir)/openssh_client/
+ mkdir -p $(PKGROOT)/$(docdir)/openssh/
+ cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/openssh/
+ ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/openssh/
+ mkdir -p $(PKGROOT)/$(docdir)/openssh_client/
+ cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/openssh_client/
+ cd $(WORKSRC_FIRSTMOD) && ginstall $(DOCFILES) $(PKGROOT)/$(docdir)/openssh_client/
+ ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/openssh_client/
endif
customize_ssh_config:
# Correction des chemins
- sed -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g' -e 's,/usr/libexec/,/opt/csw/libexec/,g' "$(DESTDIR)/$(sysconfdir)/ssh/sshd_config"
- sed -e 's,^ *# *UsePAM *.*,UsePAM yes,g' -e 's,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(DESTDIR)/$(sysconfdir)/ssh/sshd_config"
+ sed -e 's,/etc/ssh/,/opt/csw/etc/ssh/,g' -e 's,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config"
+ sed -e 's,^ *# *UsePAM *.*,UsePAM yes,g' -e 's,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config"
SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
Modified: csw/mgar/pkg/openssh/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssh/trunk/checksums 2009-03-27 23:37:15 UTC (rev 4003)
+++ csw/mgar/pkg/openssh/trunk/checksums 2009-03-28 00:24:03 UTC (rev 4004)
@@ -7,15 +7,15 @@
8e23e1f856f36e8e084a9283d22a7cbf download/svc-cswopenssh
547a915f1712c35dc79dc41378001ca9 download/cswopenssh.xml
fd50a65230ec1ead7949e8500844b0bf download/openssh
-d1c2c49bcd3b65a601946e8316b0b018 download/CSWossh.gspec
+e62e5c0ba0dc79449789ecb63e2aa9d0 download/CSWossh.gspec
6e91d098018d7e1855b626ea463b8a29 download/CSWossh.depend
1d3d6d477c09e59c514e637fa3a2f7a4 download/CSWossh.checkinstall
0993813fa5c752215f892cb67c86816f download/CSWossh.preinstall
e9e93bfda8a883bca632c712d9c359f6 download/CSWossh.postinstall
-0251175f92d2ec655f033cfdf58aa0d8 download/CSWossh.prototype
-17fca1c009ef012c158b7051dd0f2b5a download/CSWosshclient.gspec
+3378c7fb3d60254747df3642dde7b5d3 download/CSWossh.prototype
+f756587e423d2fad4f910ed78fa5f10d download/CSWosshclient.gspec
1055c346c01d99d09572d978fad10256 download/CSWosshclient.depend
-3446a3185dddc9a63b28c588685c629e download/CSWosshclient.prototype
+137254f217b342ed6dd8a5cc31033dec download/CSWosshclient.prototype
bd0f690fbb3abcbffe7924ae3016c8c3 download/openssh_restart_workaround.sh
bb77f4010f030d85f143b3d149aa6a69 download/openssh-5.2p1-gsskex-20081003.patch
4b3e79120b60e8f25be5141eba53cac5 download/don_t_use_TIOCSCTTY.patch
Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.gspec
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.gspec 2009-03-27 23:37:15 UTC (rev 4003)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.gspec 2009-03-28 00:24:03 UTC (rev 4004)
@@ -1,6 +1,6 @@
%var bitname openssh
%var pkgname CSWossh
%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENCE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENCE
%var SERVICE_CONF_FILES /opt/csw/etc/ssh/sshd_config
%include url file://%{PKGLIB}/smf_enabled.gspec
Modified: csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2009-03-27 23:37:15 UTC (rev 4003)
+++ csw/mgar/pkg/openssh/trunk/files/CSWossh.prototype 2009-03-28 00:24:03 UTC (rev 4004)
@@ -1,14 +1,14 @@
i i.conf=i.conf
i r.conf=r.conf
-f none /etc/init.d/openssh=openssh 0755 root bin
-f none /opt/csw/etc/ssh/sshd_config.CSW=sshd_config 0744 root bin
+f none /etc/init.d/openssh 0755 root bin
+f none /opt/csw/etc/ssh/sshd_config.CSW 0744 root bin
e conf /opt/csw/etc/ssh/moduli 0644 root bin
d none /opt/csw/libexec 0755 root bin
f none /opt/csw/libexec/sftp-server 0755 root bin
f none /opt/csw/sbin/sshd 0755 root bin
f none /opt/csw/share/Ssh.bin 0644 root bin
d none /opt/csw/share/doc/openssh 0755 root bin
-f none /opt/csw/share/doc/openssh/changelog.CSW=changelog.CSW 0644 root bin
+f none /opt/csw/share/doc/openssh/changelog.CSW 0644 root bin
f none /opt/csw/share/doc/openssh/CREDITS 0644 root bin
f none /opt/csw/share/doc/openssh/ChangeLog 0644 root bin
f none /opt/csw/share/doc/openssh/ChangeLog.gssapi 0644 root bin
@@ -27,5 +27,5 @@
f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin
f none /opt/csw/share/man/man8/sshd.8 0644 root bin
d none /opt/csw/share/openssh 0755 root bin
-f none /opt/csw/share/openssh/openssh_restart_workaround.sh=openssh_restart_workaround.sh 0755 root bin
+f none /opt/csw/share/openssh/openssh_restart_workaround.sh 0755 root bin
d none /var/empty
Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec 2009-03-27 23:37:15 UTC (rev 4003)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.gspec 2009-03-28 00:24:03 UTC (rev 4004)
@@ -1,4 +1,4 @@
%var bitname openssh_client
%var pkgname CSWosshclient
%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENCE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENCE
Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2009-03-27 23:37:15 UTC (rev 4003)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshclient.prototype 2009-03-28 00:24:03 UTC (rev 4004)
@@ -12,7 +12,7 @@
d none /opt/csw/libexec 0755 root bin
f none /opt/csw/libexec/ssh-keysign 4711 root bin
d none /opt/csw/share/doc/openssh_client 0755 root bin
-f none /opt/csw/share/doc/openssh_client/changelog.CSW=changelog.CSW 0644 root bin
+f none /opt/csw/share/doc/openssh_client/changelog.CSW 0644 root bin
f none /opt/csw/share/doc/openssh_client/CREDITS 0644 root bin
f none /opt/csw/share/doc/openssh_client/ChangeLog 0644 root bin
f none /opt/csw/share/doc/openssh_client/ChangeLog.gssapi 0644 root bin
Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.gspec
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.gspec 2009-03-27 23:37:15 UTC (rev 4003)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.gspec 2009-03-28 00:24:03 UTC (rev 4004)
@@ -1,7 +1,7 @@
%var bitname openssh_lpk
%var pkgname CSWosshlpk
%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENCE
+%copyright url file://%{WORKSRC_FIRSTMOD}/LICENCE
%var SERVICE_CONF_FILES /opt/csw/etc/ssh/sshd_config
%var RC_INIT_SCRIPT cswopenssh
%var SMF_MANIFEST cswopenssh.xml
Modified: csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2009-03-27 23:37:15 UTC (rev 4003)
+++ csw/mgar/pkg/openssh/trunk/files/CSWosshlpk.prototype 2009-03-28 00:24:03 UTC (rev 4004)
@@ -1,13 +1,13 @@
i i.conf=i.conf
i r.conf=r.conf
-f none /opt/csw/etc/ssh/sshd_config.CSW=sshd_config 0744 root bin
+f none /opt/csw/etc/ssh/sshd_config.CSW 0744 root bin
e conf /opt/csw/etc/ssh/moduli 0644 root bin
d none /opt/csw/libexec 0755 root bin
f none /opt/csw/libexec/sftp-server 0755 root bin
f none /opt/csw/sbin/sshd 0755 root bin
f none /opt/csw/share/Ssh.bin 0644 root bin
d none /opt/csw/share/doc/openssh_lpk 0755 root bin
-f none /opt/csw/share/doc/openssh_lpk/changelog.CSW=changelog.CSW 0644 root bin
+f none /opt/csw/share/doc/openssh_lpk/changelog.CSW 0644 root bin
f none /opt/csw/share/doc/openssh_lpk/CREDITS 0644 root bin
f none /opt/csw/share/doc/openssh_lpk/ChangeLog 0644 root bin
f none /opt/csw/share/doc/openssh_lpk/ChangeLog.gssapi 0644 root bin
@@ -30,5 +30,5 @@
f none /opt/csw/share/man/man8/sftp-server.8 0644 root bin
f none /opt/csw/share/man/man8/sshd.8 0644 root bin
d none /opt/csw/share/openssh 0755 root bin
-f none /opt/csw/share/openssh/openssh_restart_workaround.sh=openssh_restart_workaround.sh 0755 root bin
+f none /opt/csw/share/openssh/openssh_restart_workaround.sh 0755 root bin
d none /var/empty
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list