svn commit: samba r6783 - in branches/SAMBA_3_0/packaging/Solaris: .

[jht at samba.org]

Author: jht
Date: 2005-05-14 01:21:18 +0000 (Sat, 14 May 2005)
New Revision: 6783

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6783

Log:
Fixes for Solaris 9.
Modified:
   branches/SAMBA_3_0/packaging/Solaris/makepkg.sh
   branches/SAMBA_3_0/packaging/Solaris/pkginfo.master
   branches/SAMBA_3_0/packaging/Solaris/prototype.master
   branches/SAMBA_3_0/packaging/Solaris/samba.init.master


Changeset:
Modified: branches/SAMBA_3_0/packaging/Solaris/makepkg.sh
===================================================================
--- branches/SAMBA_3_0/packaging/Solaris/makepkg.sh	2005-05-13 19:06:00 UTC (rev 6782)
+++ branches/SAMBA_3_0/packaging/Solaris/makepkg.sh	2005-05-14 01:21:18 UTC (rev 6783)
@@ -54,9 +54,11 @@
 		echo f none bin/smbsh 0755 root other
 	fi
 
-	echo "#\n# nss_winbind.so\n#"
+	echo "#\n# nss_winbind.so and nss_wins.so\n#"
 	echo f none /lib/nss_winbind.so.1=lib/nss_winbind.so.1 0755 root other
+	echo f none /lib/nss_wins.so.1=lib/nss_wins.so.1 0755 root other
 	# echo s none /lib/nss_winbind.so.1=/usr/lib/nss_winbind.so.1 0755 root other
+	# echo s none /lib/nss_wins.so.1=/usr/lib/nss_wins.so.1 0755 root other
 	if [ -f lib/pam_winbind.so ]; then
 		echo f none /usr/lib/security/pam_winbind.so=lib/pam_winbind.so 0755 root other
 	fi
@@ -146,6 +148,7 @@
 BINDIR=`bin/smbd -b | grep BINDIR | grep -v SBINDIR |  awk '{print $2}'`
 SWATDIR=`bin/smbd -b | grep SWATDIR | awk '{print $2}'`
 CONFIGFILE=`bin/smbd -b | grep CONFIGFILE | awk '{print $2}'`
+LOCKDIR=`bin/smbd -b | grep LOCKDIR | awk '{print $2}'`
 CONFIGDIR=`dirname $CONFIGFILE`
 LOGFILEBASE=`bin/smbd -b | grep LOGFILEBASE | awk '{print $2}'`
 LIBDIR=`bin/smbd -b | grep LIBDIR | awk '{print $2}'`
@@ -154,8 +157,9 @@
 DOCDIR=$INSTALL_BASE/docs
 
 ## 
-## copy some misc files that are ont done as part of 'make install'
+## copy some misc files that are not done as part of 'make install'
 ##
+cp -fp nsswitch/libnss_wins.so $TMPINSTALLDIR/$LIBDIR/nss_wins.so.1
 cp -fp nsswitch/libnss_winbind.so $TMPINSTALLDIR/$LIBDIR/nss_winbind.so.1
 if [ -f nsswitch/pam_winbind.so ]; then
 	cp -fp nsswitch/pam_winbind.so $TMPINSTALLDIR/$LIBDIR/pam_winbind.so
@@ -198,6 +202,7 @@
 ##
 echo "CONFIGDIR=$CONFIGDIR" >> pkginfo
 echo "LOGFILEBASE=$LOGFILEBASE" >> pkginfo
+echo "LOCKDIR=$LOCKDIR" >> pkginfo
 echo "PIDDIR=$PIDDIR" >> pkginfo
 echo "PRIVATE_DIR=$PRIVATE_DIR" >> pkginfo
 

Modified: branches/SAMBA_3_0/packaging/Solaris/pkginfo.master
===================================================================
--- branches/SAMBA_3_0/packaging/Solaris/pkginfo.master	2005-05-13 19:06:00 UTC (rev 6782)
+++ branches/SAMBA_3_0/packaging/Solaris/pkginfo.master	2005-05-14 01:21:18 UTC (rev 6783)
@@ -8,5 +8,7 @@
 HOTLINE=Please contact your local UNIX support group
 EMAIL=jerry at samba.org
 CLASSES=none
+INTONLY=1
+ISTATES="S s 1 2 3"
+RSTATES="S s 1 2 3"
 BASEDIR=__BASEDIR__
-INTONLY=1

Modified: branches/SAMBA_3_0/packaging/Solaris/prototype.master
===================================================================
--- branches/SAMBA_3_0/packaging/Solaris/prototype.master	2005-05-13 19:06:00 UTC (rev 6782)
+++ branches/SAMBA_3_0/packaging/Solaris/prototype.master	2005-05-14 01:21:18 UTC (rev 6783)
@@ -15,6 +15,7 @@
 d initscript /etc/init.d ? ? ?
 f initscript /etc/init.d/samba=scripts/samba.init 0744 root sys
 d initscript /etc/rc3.d ? ? ?
+f initscript /sbin/samba=scripts/samba.init 0750 root root
 #
 # Stuff to set up SWAT
 #
@@ -27,6 +28,7 @@
 d none docs 755 root other
 d none man 755 root other
 d none $CONFIGDIR 755 root sys
+d none $LOCKDIR 755 root other
 d none $PRIVATE_DIR 700 root sys
 d none sbin 0755 root other
 d none bin 0755 root other

Modified: branches/SAMBA_3_0/packaging/Solaris/samba.init.master
===================================================================
--- branches/SAMBA_3_0/packaging/Solaris/samba.init.master	2005-05-13 19:06:00 UTC (rev 6782)
+++ branches/SAMBA_3_0/packaging/Solaris/samba.init.master	2005-05-14 01:21:18 UTC (rev 6783)
@@ -24,10 +24,14 @@
 'start')
 #
 # Edit these lines to suit your installation (paths, workgroup, host)
+# Add the following parameters to nmbd, smbd, winbindd if needed
+#  (this may be needed for custom file locations)
+#  -D -s$BASE/lib/smb.conf
 #
-   BASE=__BASEDIR__/samba
-   $BASE/bin/smbd -D -s$BASE/lib/smb.conf
-   $BASE/bin/nmbd -D -s$BASE/lib/smb.conf
+   BASE=__BASEDIR__
+   $BASE/sbin/nmbd 
+   $BASE/sbin/smbd 
+   $BASE/sbin/winbindd
    ;;
 'stop')
    killproc nmbd
@@ -37,12 +41,13 @@
 'restart')
    killproc nmbd
    killproc smbd
-   BASE=__BASEDIR__/samba
-   $BASE/bin/smbd -D -s$BASE/lib/smb.conf
-   $BASE/bin/nmbd -D -l$BASE/var/log -s$BASE/lib/smb.conf
+   BASE=__BASEDIR__
+   $BASE/sbin/nmbd
+   $BASE/sbin/smbd
+   $BASE/sbin/winbindd
    ;;
 
 *)
-   echo "Usage: /etc/init.d/samba.server { start | stop | restart }"
+   echo "Usage: /etc/init.d/samba { start | stop | restart }"
    ;;
 esac