[Devil-linux-commit] build/scripts samba,1.20,1.21

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv19075/scripts

Modified Files:
	samba 
Log Message:
updated samba to v3


Index: samba
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/samba,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- samba	13 Oct 2003 17:36:09 -0000	1.20
+++ samba	21 Dec 2003 15:53:53 -0000	1.21
@@ -29,13 +29,11 @@
 case $1 in
     build )
 	if [ "$CONFIG_SAMBA" = "y" ]; then
-		bzcat $DL_DIR/src/samba-2*-destdir.patch.bz2 | patch -p1 || exit 1
-		bzcat $DL_DIR/src/samba-2*-glibc.diff.bz2 | patch -p0 || exit 1
 		cd source
-	    ./configure --prefix=/usr --localstatedir=/var --with-configdir=/etc/samba --with-privatedir=/etc/samba --with-lockdir=/etc/samba/lock \
+		./configure --prefix=/usr --localstatedir=/var --with-configdir=/etc/samba --with-privatedir=/etc/samba --with-lockdir=/etc/samba/lock \
 			--with-fhs --with-smbmount --with-libsmbclient --with-ssl --with-syslog --with-utmp --with-msdfs \
 			--with-acl-support --with-winbind --with-quotas --with-vfs --with-smbwrapper \
-			--with-logfilebase=/var/log || exit 1
+			--with-logfilebase=/var/log --with-swatdir=/usr/share/samba/swat || exit 1
 	    make $PMAKE || exit 1
 	    strip_debug
 	fi
@@ -48,6 +46,10 @@
 		mkdir -p $WORKDIR/tmp/usr/{bin,sbin,lib,share} || exit 1
 		mkdir -p $WORKDIR/tmp/usr/share/samba || exit 1
 		make install DESTDIR=$WORKDIR/tmp || exit
+
+		rm -rf $WORKDIR/tmp/sbin/mount.smbfs || exit 1
+		ln -sf /usr/bin/smbmount $WORKDIR/tmp/sbin/mount.smbfs || exit 1
+
 		copy_docs $WORKDIR/tmp
 		rm -rf $WORKDIR/tmp/usr/include || exit 1
 		rm -rf $WORKDIR/tmp/usr/private || exit 1
@@ -57,8 +59,11 @@
 		copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
 		rm -rf $WORKDIR/tmp || exit 1
 		mkdir -p $CDDIR/lib
+
 		cp nsswitch/libnss_winbind.so $CDDIR/lib || exit 1
 		ln -sf libnss_winbind.so $CDDIR/lib/libnss_winbind.so.2 || exit 1
+		cp nsswitch/libnss_wins.so $CDDIR/lib || exit 1
+		ln -sf libnss_wins.so $CDDIR/lib/libnss_wins.so.2 || exit 1
 
 		mkdir -p $ETCDIR/etc/samba || exit 1
 		cp -p ../examples/smb.conf.default $ETCDIR/etc/samba/smb.conf || exit 1