[csw-devel] SF.net SVN: gar:[16206] csw/mgar/pkg/samba/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Nov 17 16:38:07 CET 2011


Revision: 16206
          http://gar.svn.sourceforge.net/gar/?rev=16206&view=rev
Author:   dmichelsen
Date:     2011-11-17 15:38:07 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
samba: Add rc-script, relocate config-dir and private-dir

Modified Paths:
--------------
    csw/mgar/pkg/samba/trunk/Makefile
    csw/mgar/pkg/samba/trunk/files/cswsamba

Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile	2011-11-17 10:42:24 UTC (rev 16205)
+++ csw/mgar/pkg/samba/trunk/Makefile	2011-11-17 15:38:07 UTC (rev 16206)
@@ -1,3 +1,7 @@
+# TBD:
+# - smb.conf is searched in /opt/csw/lib/64/smb.conf instead of /etc/opt/csw/samba/smb.conf
+# - secrets.tdb is searched in /opt/csw/private/secrets.tdb instead of /etc/opt/csw/samba/private/secrets.tdb
+
 NAME = samba
 VERSION = 3.6.1
 CATEGORIES = apps
@@ -113,6 +117,8 @@
 CONFIGURE_SCRIPTS = $(WORKSRC)/source3/configure
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --enable-socket-wrapper
+CONFIGURE_ARGS += --with-privatedir=$(sysconfdir)/samba/private
+CONFIGURE_ARGS += --with-configdir=$(sysconfdir)/samba
 
 CONFIGURE_ARGS-64 +=  --disable-cups
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
@@ -127,6 +133,8 @@
 
 INSTALL_SCRIPTS = $(WORKSRC)/source3/Makefile
 
+INITSMF = /etc/opt/csw/init.d/cswsamba
+
 include gar/category.mk
 
 # Use this hack until this bug has been fixed:
@@ -141,3 +149,6 @@
 	-perl -pi -e 's!/\@INCLUDE_des\@//!,-I$(includedir),,!' \
 		$(WORKSRC)/source3/configure
 
+post-merge:
+	ginstall -d $(PKGROOT)/etc/opt/csw/init.d
+	ginstall $(WORKDIR)/cswsamba $(PKGROOT)/etc/opt/csw/init.d/cswsamba

Modified: csw/mgar/pkg/samba/trunk/files/cswsamba
===================================================================
--- csw/mgar/pkg/samba/trunk/files/cswsamba	2011-11-17 10:42:24 UTC (rev 16205)
+++ csw/mgar/pkg/samba/trunk/files/cswsamba	2011-11-17 15:38:07 UTC (rev 16206)
@@ -1,10 +1,15 @@
 #!/bin/sh
 
+#RC_KNUM 03         # Number used for kill script symlink, e.g. K20cswfoo
+#RC_SNUM 89         # Number used for start script symlink, e.g. S80cswfoo
+#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
+#RC_SLEV 3          # Run levels that should have a start script symlink
+
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export PATH
 
-SMBCONF=/opt/csw/etc/samba/smb.conf
-KRBCONF=/etc/krb5.conf
+SMBCONF=/etc/opt/csw/samba/smb.conf
+KRBCONF=/etc/opt/csw/krb5.conf
 export SMBCONF
 export KRBCONF
 
@@ -24,11 +29,10 @@
 	;;
 	stop)
 		echo "Stopping Samba..."
-		kill "`cat /opt/csw/var/locks/smbd.pid`"
-		kill "`cat /opt/csw/var/locks/nmbd.pid`"
+		kill "`cat /var/opt/csw/locks/smbd.pid`"
+		kill "`cat /var/opt/csw/locks/nmbd.pid`"
 		if [ -f $KRBCONF ]; then
 		    echo "Stopping Winbind..."
-		    kill "`cat /opt/csw/var/locks/winbindd.pid`"
 		fi    
 	;;
 	restart)

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