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

[chninkel at users.sourceforge.net]

Revision: 10901
          http://gar.svn.sourceforge.net/gar/?rev=10901&view=rev
Author:   chninkel
Date:     2010-09-02 12:46:26 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
openssh: moved conf from /opt/csw/etc to /etc/opt/csw

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

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 10:13:43 UTC (rev 10900)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2010-09-02 12:46:26 UTC (rev 10901)
@@ -36,12 +36,12 @@
 CATALOGNAME_CSWossh = openssh
 SPKG_DESC_CSWossh = OpenSSH Secure Shell server 
 RUNTIME_DEP_PKGS_CSWossh = CSWosslrt CSWtcpwrap CSWzlib CSWkrb5lib CSWosshclient
-SPKG_CLASSES_CSWossh = none cswpreserveconf cswinitsmf
+SPKG_CLASSES_CSWossh = none cswmigrateconf cswpreserveconf cswinitsmf
 
 CATALOGNAME_CSWosshclient = openssh_client
 SPKG_DESC_CSWosshclient = OpenSSH Secure Shell client 
 RUNTIME_DEP_PKGS_CSWosshclient = CSWosslrt CSWzlib CSWkrb5lib 
-SPKG_CLASSES_CSWosshclient = none cswpreserveconf
+SPKG_CLASSES_CSWosshclient = none cswmigrateconf cswpreserveconf
 
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
 
@@ -53,9 +53,9 @@
 PKGFILES_CSWossh += $(libexecdir)/sftp-server
 PKGFILES_CSWossh += $(sysconfdir)/ssh/sshd_config.CSW
 PKGFILES_CSWossh += $(sysconfdir)/ssh/moduli.CSW
-PKGFILES_CSWossh += /var/empty
-PKGFILES_CSWossh += /etc$(prefix)/init.d/cswopenssh
-PKGFILES_CSWossh += /var$(prefix)/svc/manifest/network/cswopenssh.xml
+PKGFILES_CSWossh += $(localstatedir)/empty
+PKGFILES_CSWossh += $(sysconfdir)/init.d/cswopenssh
+PKGFILES_CSWossh += $(localstatedir)/svc/manifest/network/cswopenssh.xml
 
 PKGFILES_CSWosshclient = $(bindir)/.*
 PKGFILES_CSWosshclient += $(docdir)/openssh_client/.*
@@ -69,11 +69,14 @@
 PROTOTYPE_FILES_setuid = $(libexecdir)/ssh-keysign
 PROTOTYPE_PERMS_setuid = 4711
 
+PRESERVECONF = $(sysconfdir)/ssh/sshd_config
+PRESERVECONF += $(sysconfdir)/ssh/ssh_config
+PRESERVECONF += $(sysconfdir)/ssh/moduli
+INITSMF = $(sysconfdir)/init.d/cswopenssh
 
-PRESERVECONF = /opt/csw/etc/ssh/sshd_config
-PRESERVECONF += /opt/csw/etc/ssh/ssh_config
-PRESERVECONF += /opt/csw/etc/ssh/moduli
-INITSMF = /etc/opt/csw/init.d/cswopenssh
+MIGRATE_FILES_CSWossh = module sshd_config
+MIGRATE_FILES_CSWosshclient = ssh_config
+MIGRATE_SOURCE_DIR = $(prefix)/etc/ssh
 
 # The openssh package installs the server and the client
 CHECKPKG_OVERRIDES_CSWossh = surplus-dependency|CSWosshclient
@@ -116,12 +119,20 @@
 
 ##### Build and installation information #####
 
+
+# to support shared /opt/csw setup
+# see http://wiki.opencsw.org/shared-opt-csw-setup
+localstatedir 	= /var$(prefix)
+sysconfdir 	= /etc$(prefix)
+
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-kerberos5=$(prefix)
 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/ssh
 CONFIGURE_ARGS += --with-solaris-contracts
 CONFIGURE_ARGS += --with-pam
 CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix)
+CONFIGURE_ARGS += --with-privsep-path=$(localstatedir)/empty
 
 TEST_SCRIPTS	=
 
@@ -192,5 +203,5 @@
 	@$(MAKECOOKIE)
 
 merge-special-directories:
-	ginstall -d $(PKGROOT)/var/empty
+	ginstall -d $(PKGROOT)$(localstatedir)/empty
 	ginstall -d $(PKGROOT)$(sysconfdir)/CSWossh

Modified: csw/mgar/pkg/openssh/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-09-02 10:13:43 UTC (rev 10900)
+++ csw/mgar/pkg/openssh/trunk/files/changelog.CSW	2010-09-02 12:46:26 UTC (rev 10901)
@@ -3,6 +3,9 @@
   * New upstream release.
   * Removed patch applied upstream (derelativise_path_bugfix.patch 
   and dont_derelativise_authorizedkeysfile_option.patch).
+  * Moved conf from /opt/csw/etc to /etc/opt/csw.
+  * Moved privilege separation directory from /var/empty to
+  /var/opt/csw/var/empty.
   * [Build system] Switched to dynamic prototype.
 
  -- Yann Rouillard <yann at opencsw.org>  Wed, 01 Sep 2010 23:25:24 +0200


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