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

[chninkel at users.sourceforge.net]

Revision: 10906
          http://gar.svn.sourceforge.net/gar/?rev=10906&view=rev
Author:   chninkel
Date:     2010-09-02 14:27:22 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssh: fixed last configuration migration errors (I think)

Modified Paths:
--------------
    csw/mgar/pkg/openssh/trunk/Makefile
    csw/mgar/pkg/openssh/trunk/files/cswopenssh
    csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml
    csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 14:26:56 UTC (rev 10905)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 14:27:22 UTC (rev 10906)
@@ -53,7 +53,6 @@
 PKGFILES_CSWossh += $(libexecdir)/sftp-server
 PKGFILES_CSWossh += $(sysconfdir)/ssh/sshd_config.CSW
 PKGFILES_CSWossh += $(sysconfdir)/ssh/moduli.CSW
-PKGFILES_CSWossh += $(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED
 PKGFILES_CSWossh += $(localstatedir)/empty
 PKGFILES_CSWossh += $(sysconfdir)/init.d/cswopenssh
 PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
@@ -76,14 +75,15 @@
 PRESERVECONF += $(sysconfdir)/ssh/moduli
 INITSMF = $(sysconfdir)/init.d/cswopenssh
 
-MIGRATE_FILES_CSWossh = moduli sshd_config 
+MIGRATE_FILES_CSWossh = moduli sshd_config
 MIGRATE_FILES_CSWossh += ssh_host_dsa_key ssh_host_dsa_key.pub ssh_host_rsa_key ssh_host_rsa_key.pub ssh_host_key ssh_host_key.pub
-MIGRATE_FILES_CSWossh += shosts.equiv 
-MIGRATE_FILES_CSWossh += sshrc 
+MIGRATE_FILES_CSWossh += shosts.equiv
+MIGRATE_FILES_CSWossh += sshrc
 MIGRATE_FILES_CSWosshclient = ssh_config
 MIGRATE_FILES_CSWosshclient += ssh_known_hosts ssh_known_hosts2
 MIGRATE_FILES_CSWosshclient += ssh_prng_cmds
 MIGRATE_SOURCE_DIR = $(prefix)/etc/ssh
+MIGRATE_DEST_DIR = $(sysconfdir)/ssh
 
 # The openssh package installs the server and the client
 CHECKPKG_OVERRIDES_CSWossh = surplus-dependency|CSWosshclient
@@ -102,6 +102,8 @@
 
 DISTFILES += cswopenssh sshd.smf_wrapper cswopenssh.xml
 
+DISTFILES += THIS_LOCATION_IS_DEPRECATED
+
 LICENSE = LICENCE
 
 # The GSSAPI key exchange patch
@@ -207,7 +209,7 @@
 	# we change some default value in the server config file
 	perl -pi -e 's,/etc/ssh/,$(sysconfdir)/ssh/,g; s,/usr/libexec/,/opt/csw/libexec/,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW"
 	perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" 
-	ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(sysconfdir)/ssh/THIS_LOCATION_IS_DEPRECATED"
+	ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED"
 	@$(MAKECOOKIE)
 
 merge-special-directories:

Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh	2010-09-02 14:26:56 UTC (rev 10905)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh	2010-09-02 14:27:22 UTC (rev 10906)
@@ -12,7 +12,7 @@
 
 PATH=/usr/bin:/opt/csw/bin:/usr/sbin
 
-KEYDIR=/opt/csw/etc/ssh
+KEYDIR=/etc/opt/csw/ssh
 PIDFILE=/var/run/sshd.pid
 case $1 in 
 'start')
@@ -28,7 +28,7 @@
                 fi     
         fi
 
-        [ -x /opt/csw/sbin/sshd ] && [ -f /opt/csw/etc/ssh/sshd_config ] && /opt/csw/sbin/sshd &
+        [ -x /opt/csw/sbin/sshd ] && [ -f /etc/opt/csw/ssh/sshd_config ] && /opt/csw/sbin/sshd &
         ;;
 'stop')
         #

Modified: csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml	2010-09-02 14:26:56 UTC (rev 10905)
+++ csw/mgar/pkg/openssh/trunk/files/cswopenssh.xml	2010-09-02 14:27:22 UTC (rev 10906)
@@ -32,7 +32,7 @@
 				restart_on='restart'
 				type='path'>
 				<service_fmri
-					value='file://localhost/opt/csw/etc/ssh/sshd_config' />
+					value='file://localhost/etc/opt/csw/ssh/sshd_config' />
 			</dependency>
 
 			<dependent
@@ -73,7 +73,7 @@
 				<manpage
 					title='sshd'
 					section='1M'
-					manpath='/opt/csw/man'/>
+					manpath='/opt/csw/share/man'/>
 			</documentation>
 		</template>
 	</service>

Modified: csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2010-09-02 14:26:56 UTC (rev 10905)
+++ csw/mgar/pkg/openssh/trunk/files/sshd.smf_wrapper	2010-09-02 14:27:22 UTC (rev 10906)
@@ -2,7 +2,7 @@
 
 PATH=/usr/bin:/opt/csw/bin:/usr/sbin
 
-KEYDIR=/opt/csw/etc/ssh
+KEYDIR=/etc/opt/csw/ssh
 PIDFILE=/var/run/sshd.pid
 if [ -x /opt/csw/bin/ssh-keygen ]; then
 	if [ ! -f "$KEYDIR/ssh_host_rsa_key" ]; then


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