[Devil-linux-commit] build/scripts clamav,1.10,1.11 perl,1.32,1.33 shadow,1.16,1.17 squidguard,1.2,1.3 util-linux,1.24,1.25

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

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

Modified Files:
	clamav perl shadow squidguard util-linux 
Log Message:
- DL now works fine again on 32 MB systems
- unpacking of /var now uses less memory during uncompression
- save-config now uses less memory during compression
- removed squidguard blacklist
  (has to be freshly downloaded anyway)
- removed clamav virus signatures
  (has to be freshly downloaded anyway)
- added perl GD library v2.16
- updated gcc to v3.3.4
- updated util-linux to v2.12b
- updated tar to v1.14
- updated shadow to v4.0.4.1
- updated readline to v5.0
- updated perl to v5.8.5
- updated patch-o-matic-ng to v20040823
- updated openldap to v2.2.15
- updated ncurses to v5.4
- updated linux to v2.6.8.1
- updated iproute2 to v2.6.9-ss040831
- updated binutils to v2.15.91.0.2
- updated bash to v3.0
- updated Python to v2.3.4


Index: squidguard
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/squidguard,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- squidguard	30 Mar 2004 00:31:57 -0000	1.2
+++ squidguard	6 Sep 2004 20:31:33 -0000	1.3
@@ -45,7 +45,6 @@
 			mkdir -p $WORKDIR/tmp/usr/share/doc/squidguard || exit 1
 			# Create the db directory
 			mkdir -p $WORKDIR/tmp/var/lib/squidguard/demo || exit 1
-			cp -r ../squidguard-blacklist/* $WORKDIR/tmp/var/lib/squidguard/demo
 			cp src/squidGuard $WORKDIR/tmp/usr/bin/
 			cp doc/* $WORKDIR/tmp/usr/share/doc/squidguard
 			cp -r samples $WORKDIR/tmp/usr/share/doc/squidguard

Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- util-linux	11 Jul 2004 14:35:25 -0000	1.24
+++ util-linux	6 Sep 2004 20:31:33 -0000	1.25
@@ -26,16 +26,20 @@
 case $1 in
     build )
 		disable_et_dyn
-		test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
-		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
-			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
+		#test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
+		#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
+		#	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
+		
+		# (from LFS) GCC-3.4.1 miscompiles sfdisk if the default optimisation level is used. The following command prevents the problematic optimisation pass from being used.
+		#sed -i -e 's%^include ../MCONFIG%&\n\nCFLAGS:=$(CFLAGS) -fno-unit-at-a-time%' fdisk/Makefile
+		
 		./configure || exit 1
 		replace_str defines.h "#define ENABLE_NLS" ""
 		if [ "$CONFIG_GCC_ET_DYN" = "y" ]; then

Index: clamav
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/clamav,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- clamav	25 Jul 2004 22:52:39 -0000	1.10
+++ clamav	6 Sep 2004 20:31:33 -0000	1.11
@@ -52,9 +52,9 @@
 		rm -rf $WORKDIR/tmp/usr/include || exit 1
 		rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
 		copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
-		chmod -R 700 $WORKDIR/tmp/var/lib/clamav || exit 1
-		chown -R clamav $WORKDIR/tmp/var/lib/clamav || exit 1
-		copy_files $WORKDIR/tmp/var $CDDIR/ || exit 1
+		mkdir -p $CDDIR/var/lib/clamav || exit 1
+		chmod -R 700 $CDDIR/var/lib/clamav || exit 1
+		chown -R clamav $CDDIR/var/lib/clamav || exit 1
 		rm -rf $WORKDIR/tmp || exit 1
 
 		cp -dp $MYDIR/scripts/clamav $ETCDIR/etc/init.d/ || exit 1

Index: shadow
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/shadow,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- shadow	14 Jan 2004 21:31:36 -0000	1.16
+++ shadow	6 Sep 2004 20:31:33 -0000	1.17
@@ -45,10 +45,8 @@
 		chmod 700 $WORKDIR/tmp/bin/login || exit 1
 		chmod 4550 $WORKDIR/tmp/bin/su || exit 1
 		chgrp wheel $WORKDIR/tmp/bin/su || exit 1
-		chmod -c go-rx $WORKDIR/tmp/usr/sbin/{chpasswd,dpasswd,group*,grp[cu]*,logoutd,mkpasswd,newusers,pw[cu]*,user*,vipw} || exit 1
-		rm $WORKDIR/tmp/bin/vipw || exit 1
+		chmod -c go-rx $WORKDIR/tmp/usr/sbin/{chpasswd,group*,grp[cu]*,logoutd,mkpasswd,newusers,pw[cu]*,user*} || exit 1
 		mv $WORKDIR/tmp/bin/sg $WORKDIR/tmp/usr/bin || exit 1
-		ln -sf vipw $WORKDIR/tmp/usr/sbin/vigr || exit 1
 		copy_man ./man
 		rm -rf $WORKDIR/tmp/usr/share
 		rm -rf $WORKDIR/tmp/lib/*.a

Index: perl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/perl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- perl	25 Jun 2004 22:32:44 -0000	1.32
+++ perl	6 Sep 2004 20:31:33 -0000	1.33
@@ -91,7 +91,7 @@
 			rm $WORKDIR/tmp/bin/perl || exit 1
 
 			# check here if install fails, you probably upgraded to a new perl release
-			PERLBIN=perl5.8.4
+			PERLBIN=perl5.8.5
 			if [ ! -e $WORKDIR/tmp/bin/$PERLBIN ]; then
 				echo "You need to edit the perl install script"
 				echo "every time you update to a new release"