[Devil-linux-commit] build/scripts glibc,1.20,1.21 iptables,1.18,1.19

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

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

Modified Files:
	glibc iptables 
Log Message:
- disabled stack smashing protector for iptables
- updated thttpd to v2.24
- some cleanup


Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- glibc	30 Oct 2003 00:02:36 -0000	1.20
+++ glibc	31 Oct 2003 20:18:09 -0000	1.21
@@ -27,11 +27,19 @@
 case $1 in
 	build )
 		tar -xjf $DL_DIR/src/glibc-linuxthreads-*.tar.bz2 || exit 1
-		if [ ! -f devil-linux-glibc-patches.done ]; then
+		if [ ! -f devil-linux-glibc-debian-patches.done ]; then
 			for PATCH in $(grep -v ^# ../glibc-patches/0list)
 			do
 				echo applying patch: $PATCH
-				sh ../glibc-patches/$PATCH.dpatch -patch $(pwd) || exit 1
+				sh ../glibc-debian-patches/$PATCH.dpatch -patch $(pwd) || exit 1
+			done
+			touch devil-linux-glibc-debian-patches.done
+		fi
+		if [ ! -f devil-linux-glibc-patches.done ]; then
+			for PATCH in $(ls ../glibc-patches/*)
+			do
+				echo applying patch: $PATCH
+				patch -i $PATCH -p1 || exit 1
 			done
 			touch devil-linux-glibc-patches.done
 		fi
@@ -41,7 +49,6 @@
 		# unfortunately we can only go as high as the host kernel version
 		KVER=$(uname -r)
 		../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/bin --enable-kernel=$KVER || exit 1
-		echo "cross-compiling = no" > configparms || exit 1
 
 		make $PMAKE || exit 1
 		#make || exit 1

Index: iptables
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iptables,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- iptables	13 Oct 2003 17:36:08 -0000	1.18
+++ iptables	31 Oct 2003 20:18:09 -0000	1.19
@@ -28,6 +28,10 @@
 
 case $1 in
     build )
+	FLAGS="-O2"
+	if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
+		FLAGS="-O2 -fno-stack-protector"
+	fi
 	replace_str Makefile "/usr/local" "/usr"
 	# parallel build failes, do not use $PMAKE
 	make all KERNEL_DIR=$KERNELDIR || exit 1