[Devil-linux-commit] build/scripts LVM2,1.3,1.4 bind,1.28,1.29 squid,1.15,1.16

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

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26081/scripts

Modified Files:
	LVM2 bind squid 
Log Message:
- updated bind to v9.2.3 (Heiko / Oliver Jehle)
- fixed error building squid without LDAP support (Heiko / Martin Glazer)
- added support for LVM2 to mountfs script (Heiko / Oliver Jehle)
- added sys directory when kernel 2.6 is used (Heiko + Oliver Jehle)


Index: LVM2
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/LVM2,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- LVM2	17 Jan 2004 01:15:39 -0000	1.3
+++ LVM2	13 Mar 2004 00:18:35 -0000	1.4
@@ -1,7 +1,6 @@
 #!/bin/bash
 # $Source$
-# $Revision$
-# $Date$
+# $Revision$ # $Date$
 #
 # http://www.devil-linux.org
 
@@ -34,7 +33,7 @@
 		# patch the device mapper into 2.4
 		#
 		if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
-			./configure --with-kernel-dir=../linux-2.4.24
+			./configure --with-kernel-dir=../linux-2.4.*/
    			patch -p1 -d ../linux-2.4.24 <`pwd`/patches/linux-2.4.22-devmapper-ioctl.patch || exit 1
    			patch -p1 -d ../linux-2.4.24 <`pwd`/patches/linux-2.4.22-VFS-lock.patch || exit 1
 			set_kernel_option CONFIG_BLK_DEV_DM y
@@ -52,15 +51,11 @@
         ;;
     install )
 	if [ "$CONFIG_LVM2" = "y" ]; then
-		TMPDIR=$WORKDIR/lvm2-tmp
-		mkdir -p $TMPDIR
 		pushd `pwd`
 		cd ../device-mapper*
-		make install DESTDIR=$TMPDIR || exit 1
+		make install DESTDIR=$CDDIR || exit 1
 		popd	
-		make install DESTDIR=$TMPDIR || exit 1
-		copy_files $TMPDIR/  $CDDIR/
-		rm -rf $TMPDIR
+		make install DESTDIR=$CDDIR || exit 1
 	fi
     	;;
 

Index: bind
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/bind,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- bind	11 Jan 2004 14:43:04 -0000	1.28
+++ bind	13 Mar 2004 00:18:35 -0000	1.29
@@ -28,11 +28,13 @@
 case $1 in
     build )
 	if [ "$CONFIG_ISC_BIND" = "y" ]; then
-		./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-openssl=/usr/ssl --enable-threads --with-libtool || exit 1
+		./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-openssl=/usr/ssl --enable-libbind --enable-threads --with-libtool || exit 1
 		make depend || exit 1
 		#make $PMAKE all || exit 1
 		make all || exit 1
 		strip_debug
+		# install to base system... because of library install of libdns
+		make install || exit 1
 	fi
 	;;
 
@@ -58,8 +60,13 @@
 		echo "#empty file" > $ETCDIR/etc/named.conf || exit 1
 		rm -rf $WORKDIR/tmp || exit 1
 
-		useradd -u 44 -g nogroup -s /bin/false named || exit 1
-
+		getent passwd named >/dev/null
+		rc=$?	
+		if [ "$rc" == "0" ]; then
+			echo "user already exist"
+		else
+			useradd -u 44 -g nogroup -s /bin/false named || exit 1
+		fi 
 		echo "# Start Bind Name Server?" >> $CONFIGFILE
 		echo "START_NAMED=no" >> $CONFIGFILE
 		echo >> $CONFIGFILE

Index: squid
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squid,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- squid	11 Jan 2004 14:43:05 -0000	1.15
+++ squid	13 Mar 2004 00:18:35 -0000	1.16
@@ -24,6 +24,7 @@
 source $MYDIR/settings
 
 MYNAME=SQUID
+AUTH_HELPERS="MSNT NCSA SMB YP getpwnam multi-domain-NTLM winbind"
 
 case $1 in
     build )
@@ -34,11 +35,15 @@
 			popd > /dev/null
 			touch .yp-patch.done
 		fi
+		if [ "$CONFIG_LDAP" = "y" ]; then
+			AUTH_HELPERS="${AUTH_HELPERS} LDAP"
+		fi
+			
 		./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/sbin --libexecdir=/usr/sbin \
 			--datadir=/usr/share/squid --localstatedir=/var/squid --sharedstatedir=/var/squid \
 			--enable-delay-pools --enable-useragent-log --enable-referer-log --enable-arp-acl \
 			--enable-ssl --with-openssl --enable-htcp --enable-linux-netfilter \
-			--enable-basic-auth-helpers="LDAP MSNT NCSA SMB YP getpwnam multi-domain-NTLM winbind" \
+			--enable-basic-auth-helpers="$AUTH_HELPERS" \
 			--enable-default-err-language=English --enable-err-languages="English" || exit 1
 		# --enable-snmp
 		make $PMAKE all || exit 1