r3638: solaris packaging fixes

(This used to be commit 1504b1d05c1a62bc0be05716805a3cb223d09c09)

4 files changed, 25 insertions, 33 deletions

diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh
index a8195e0755..7f8c4b6d71 100644
--- a/packaging/Solaris/makepkg.sh
+++ b/packaging/Solaris/makepkg.sh
@@ -8,7 +8,7 @@
 
 INSTALL_BASE=/opt/samba
 
-SBINPROS="smbd nmbd winbindd swat"
+SBINPROGS="smbd nmbd winbindd swat"
 BINPROGS="findsmb nmblookup pdbedit rpcclient smbclient smbcquotas smbspool smbtar tdbbackup testparm wbinfo net ntlm_auth profiles smbcacls smbcontrol smbpasswd smbstatus smbtree tdbdump testprns"
 MSGFILES="de.msg en.msg fr.msg it.msg ja.msg nl.msg pl.msg tr.msg"
 VFSLIBS="audit.so default_quota.so extd_audit.so full_audit.so readonly.so shadow_copy.so cap.so expand_msdfs.so fake_perms.so netatalk.so recycle.so"
@@ -34,12 +34,12 @@ add_dynamic_entries()
  	for file in $MSGFILES; do
 		echo f none lib/$file 0644 root other
 	done
- 	for file in $VFSLIBS; do
-		echo f none lib/vfs/$file 0755 root other
-	done
  	for file in $DATFILES; do
 		echo f none lib/$file 0644 root other
 	done
+ 	for file in $VFSLIBS; do
+		echo f none lib/vfs/$file 0755 root other
+	done
  	for file in $CHARSETLIBS; do
 		echo f none lib/charset/$file 0755 root other
 	done
@@ -53,26 +53,22 @@ add_dynamic_entries()
 	echo f none bin/smbsh 0755 root other
 
 	echo "#\n# nss_winbind.so\n#"
-	echo f none /usr/lib/nss_winbind.so.1=lib/libnss_winbind.so 0755 root other
-	echo s none /lib/nss_winbind.so.1=../usr/lib/nss_winbind.so.1 0755 root other
+	echo f none /lib/nss_winbind.so.1=lib/nss_winbind.so.1 0755 root other
+	# echo s none /lib/nss_winbind.so.1=/usr/lib/nss_winbind.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
 
-	# Add the manpages
 	echo "#\n# man pages \n#"
-	echo d none /usr ? ? ?
-	echo d none /usr/share ? ? ?
-	echo d none /usr/share/man ? ? ?
 
 	# Create directories for man page sections if nonexistent
 	cd man
 	for i in 1 2 3 4 5 6 7 8 9; do
-		manpages=`ls *.$i 2>/dev/null`
+		manpages=`ls man$i 2>/dev/null`
 		if [ $? -eq 0 ]; then
-			echo d none /usr/share/man/man$i ? ? ?
+			echo d none man/man${i} ? ? ?
 			for manpage in $manpages; do
-				echo f none /usr/share/man/man${i}/${manpage}=docs/manpages/$manpage 0644 root other
+				echo f none man/man${i}/${manpage} 0644 root other
 			done
 		fi
 	done
@@ -94,7 +90,7 @@ add_dynamic_entries()
 	done
 
 	# Create entries for docs for the beginner
-	echo s none docs/using_samba=$BASEDIR/swat/help/using_samba
+	echo 's none docs/using_samba=$BASEDIR/swat/using_samba'
 	for file in docs/*pdf; do
 		echo f none $file 0644 root other
 	done
@@ -104,7 +100,7 @@ add_dynamic_entries()
 ## BEGIN MAIN 
 #####################################################################
 
-TMPINSTALLDIR=$HOME/build
+TMPINSTALLDIR=/export/build
 
 # Try to guess the distribution base..
 CURR_DIR=`pwd`
@@ -157,7 +153,7 @@ DOCDIR=$INSTALL_BASE/docs
 ## 
 ## copy some misc files that are ont done as part of 'make install'
 ##
-cp -fp nsswitch/libnss_winbind.so $TMPINSTALLDIR/$LIBDIR/libnss_winbind.so
+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
 fi
@@ -194,14 +190,9 @@ done
 ##
 ## Start building the prototype file
 ##
-echo "SBINDIR=sbin" >> pkginfo
-echo "BINDIR=bin" >> pkginfo
-echo "SWATDIR=swat" >> pkginfo
 echo "CONFIGDIR=$CONFIGDIR" >> pkginfo
 echo "LOGFILEBASE=$LOGFILEBASE" >> pkginfo
-echo "LIBDIR=lib" >> pkginfo
 echo "PIDDIR=$PIDDIR" >> pkginfo
-echo "DOCDIR=docs" >> pkginfo
 echo "PRIVATE_DIR=$PRIVATE_DIR" >> pkginfo
 
 cp prototype.master prototype
diff --git a/packaging/Solaris/postinstall b/packaging/Solaris/postinstall
index 9a21ae659c..3586d9bc9e 100644
--- a/packaging/Solaris/postinstall
+++ b/packaging/Solaris/postinstall
@@ -6,8 +6,8 @@ INSTALLATION COMPLETE.
 All files comprising the Samba Server have been installed.
 
 You can configure Samba by creating a configuration file at 
-${BASEDIR}/samba/lib/smb.conf. For details on configuration, 
-refer to the Samba man pages under ${PKG_INSTALL_ROOT}/usr/share/man 
+${CONFIGDIR}/smb.conf. For details on configuration, 
+refer to the Samba man pages under ${BASEDIR}/man 
 and the documentation at ${BASEDIR}/samba/docs.
 ___________________________________________________________________________
 
diff --git a/packaging/Solaris/prototype.master b/packaging/Solaris/prototype.master
index 7d15b7d8ae..67dd3eb0fd 100644
--- a/packaging/Solaris/prototype.master
+++ b/packaging/Solaris/prototype.master
@@ -24,16 +24,17 @@ e swat /etc/inet/inetd.conf=scripts/inetd.conf ? ? ?
 #
 # Create the samba subtree.
 #
-d none $DOCDIR 755 root other
+d none docs 755 root other
+d none man 755 root other
 d none $CONFIGDIR 755 root sys
 d none $PRIVATE_DIR 700 root sys
-d none $SBINDIR 0755 root other
-d none $BINDIR 0755 root other
-d none $LIBDIR 0755 root other
-d none $LIBDIR/charset 0755 root other
-d none $LIBDIR/vfs 0755 root other
+d none sbin 0755 root other
+d none bin 0755 root other
+d none lib 0755 root other
+d none lib/charset 0755 root other
+d none lib/vfs 0755 root other
 d none include 0755 root other
-d none $SWATDIR 0755 root other
+d none swat 0755 root other
 d none $LOGFILEBASE 0755 root other
 d none $PIDDIR 0755 root other
 #
diff --git a/packaging/Solaris/smb.conf.default b/packaging/Solaris/smb.conf.default
index 5c06c445b3..cdc958bc0e 100644
--- a/packaging/Solaris/smb.conf.default
+++ b/packaging/Solaris/smb.conf.default
@@ -43,9 +43,9 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-   #log file = /var/log/samba/log.%m
-# all information in one file
-   log file = /var/log/samba/log.smbd
+   # log file = /var/log/samba/log.%m
+# all log information in one file
+   log file = /var/log/samba/smbd.log
 
 # Put a capping on the size of the log files (in Kb).
    max log size = 50