[Devil-linux-commit] build/scripts pwlib,1.12,1.12.2.1 squid,1.17.2.2,1.17.2.3 util-linux,1.22,1.22.2.1

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

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

Modified Files:
      Tag: rel-1-2-patches
	pwlib squid util-linux 
Log Message:
- updated Python to 2.3.4
- updated bind to 9.2.4
- updated cdrtools to 2.01
- updated dhcp to 3.0.1
- updated dnsmasq to 2.15
- updated eagle-usb to 1.9.9.1
- updated gnupg to 1.2.6
- updated hdparm to 5.7
- updated httpd to 2.0.51
- updated vlftp to 3.0.9
- updated libpng to 1.2.7
- updated libxml2 to 2.6.14
- updated libxslt to 1.1.11
- updated mysql to 4.0.21
- updated net-snmp to 5.1.2
- updated openh323 to v1_15_1
- updated openswan to 1.0.7
- updated php to 4.3.9
- updated postfix to 2.1.5
- updated pwlib-v1_8_1 to src
- updated python-ldap to 2.0.3
- updated samba to 3.0.7
- updated sed to 4.1.2
- updated sg3_utils to 1.08
- updated squid to 2.5.STABLE6
- updated sudo to 1.6.8p1
- updated util-linux to 2.12e


Index: pwlib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pwlib,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- pwlib	16 Jan 2004 19:22:48 -0000	1.12
+++ pwlib	12 Oct 2004 12:48:44 -0000	1.12.2.1
@@ -32,14 +32,12 @@
 	    if [ "$CONFIG_PWLIB" = "y" ]; then
 		rm -f /usr/lib/libpt_linux_x86_r.so /usr/lib/libpt.so
 		export PWLIBDIR=$PWD
-		test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
 		./configure --prefix=/usr || exit 1
 		# parallel builds fails ($PMAKE)
-		make || exit 1
+		make bothdepend || exit 1
+		make $PMAKE || exit 1
 		strip_debug
 		make install || exit 1
-		mkdir -p $CDDIR/usr/bin
-		cp -p /usr/bin/asnparser /usr/bin/ptlib-config $CDDIR/usr/bin/ || exit 1
 	    fi
         ;;
 

Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- util-linux	27 Apr 2004 01:14:53 -0000	1.22
+++ util-linux	12 Oct 2004 12:48:44 -0000	1.22.2.1
@@ -27,12 +27,14 @@
     build )
 	disable_et_dyn
 		if [ ! -f util-linux-patch.done ]; then
-			if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
-			   echo "patch 2.4 "
-			   bzcat $SRCDIR/util-linux-2.12.diff.bz2 | patch -p1 || exit 1
+			#if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+			#   echo "patch 2.4 "
+			#   bzcat $SRCDIR/util-linux-2.12.diff.bz2 | patch -p1 || exit 1
+			#fi
+			if [ "$CONFIG_LINUX_VERSION" = "2.6" ]; then
+			    echo "patch for adding kernel 2.6 support"
+			    bzcat $SRCDIR/util-linux-2.12-kernel-2.6.patch.bz2 | patch -p1 || exit 1
 			fi
-			echo "patch for adding kernel 2.6 support"
-			bzcat $SRCDIR/util-linux-2.12-kernel-2.6.patch.bz2 | patch -p1 || exit 1
 			touch util-linux-patch.done
 		fi
 		./configure || exit 1

Index: squid
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squid,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -d -r1.17.2.2 -r1.17.2.3
--- squid	4 Sep 2004 15:00:16 -0000	1.17.2.2
+++ squid	12 Oct 2004 12:48:44 -0000	1.17.2.3
@@ -33,9 +33,6 @@
 			pushd helpers/basic_auth/YP/ > /dev/null
 			bzcat $DL_DIR/src/yp_auth.patch.bz2 | patch || exit 1
 			popd > /dev/null
-			pushd helpers/ntlm_auth/SMB > /dev/null
-			bzcat $DL_DIR/src/squid-libntlmssp.c.patch.bz2 | patch || exit 1
-			popd > /dev/null
 			touch .patches.done
 		fi
 		if [ "$CONFIG_LDAP" = "y" ]; then