[Devil-linux-commit] build/scripts binutils,1.9,1.10 coreutils,1.8,1.9 gcc,1.24,1.25 glibc,1.34,1.35 popt,1.6,1.7

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

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

Modified Files:
	binutils coreutils gcc glibc popt 
Log Message:
- updated popt to v1.7
- don't install hostname from coreutils package, use the one from net-tools
- added frandom patch to kernel
- added ssp guard functions + frandom support to glibc
- removed support for kernel 2.4 from build system
- updated gcc-protector to v3.4.1-1


Index: coreutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/coreutils,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- coreutils	28 Feb 2004 16:15:24 -0000	1.8
+++ coreutils	23 Sep 2004 21:50:01 -0000	1.9
@@ -25,14 +25,14 @@
 
 case $1 in
     build )
-		#if [ ! -f devil-linux-patches.done ]; then
-		#	for PATCH in $(ls $WORKDIR/coreutils-patches/* 2> /dev/null )
-		#	do
-		#		echo applying patch: $PATCH
-		#		patch -p1 -i $PATCH || exit 1
-		#	done
-		#	touch devil-linux-patches.done
-		#fi
+		if [ ! -f devil-linux-patches.done ]; then
+			for PATCH in $(ls $WORKDIR/coreutils-patches/* 2> /dev/null )
+			do
+				echo applying patch: $PATCH
+				patch -p1 -i $PATCH || exit 1
+			done
+			touch devil-linux-patches.done
+		fi
 		./configure --prefix= --disable-nls --without-included-regex || exit 1
 		make $PMAKE || exit 1
 		strip_debug

Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- glibc	21 Sep 2004 22:51:36 -0000	1.34
+++ glibc	23 Sep 2004 21:50:01 -0000	1.35
@@ -49,6 +49,19 @@
 			done
 			touch devil-linux-glibc-patches.done
 		fi
+		
+		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
+		    if [ ! -f devil-linux-glibc-ssp-patches.done ]; then
+			cp -v ../glibc-ssp/ssp.c sysdeps/unix/sysv/linux/ || exit 1
+			for PATCH in $(ls ../glibc-ssp/*patch)
+			do
+				echo applying patch: $PATCH
+				patch -i $PATCH -p1 || exit 1
+			done
+			touch devil-linux-glibc-ssp-patches.done
+		    fi
+		fi
+		
 		rm -rf ../glibc-build
 		mkdir ../glibc-build || exit 1
 		cd ../glibc-build || exit 1

Index: gcc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gcc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gcc	20 Sep 2004 22:14:08 -0000	1.24
+++ gcc	23 Sep 2004 21:50:01 -0000	1.25
@@ -9,7 +9,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       gcc
-# Required-Start: distcc prepare binutils
+# Required-Start: distcc prepare glibc_stage1 binutils
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -30,14 +30,13 @@
 		if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then
 		    if [ ! -e ./.done_patch_protector ]; then
 			cd gcc
-			patch -p1 -i $WORKDIR/protector.dif || exit 1
-			cp -rf $WORKDIR/gcc/* . || exit 1
-			patch -p1 -i $WORKDIR/protectonly.dif || exit 1
+			patch -p1 -i $WORKDIR/gcc-ssp/gcc_3_4_1.dif || exit 1
+			cp -rf $WORKDIR/gcc-ssp/gcc/* . || exit 1
 			cd ..
 			touch ./.done_patch_protector
 
-			if [ ! -f devil-linux-kernel-protector-patch.done ]; then
-			    touch devil-linux-kernel-protector-patch.done
+			if [ ! -f $KERNELDIR/devil-linux-kernel-protector-patch.done ]; then
+			    touch $KERNELDIR/devil-linux-kernel-protector-patch.done
 			    if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
 	    		    	bzcat $DL_DIR/src/linux-2.4.*-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
 			    else
@@ -67,7 +66,7 @@
 		#    --enable-threads=posix --with-slibdir=/lib  --enable-__cxa_atexit --enable-clocale=gnu \
 		#    --enable-languages=c,c++,objc --disable-nls $CONF_HOST || exit 1
 		../gcc-3*/configure --prefix=/usr \
-		    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
+		    --libexecdir=/usr/lib --enable-shared --enable-threads=posix --enable-stack-protector \
 		    --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ $CONF_HOST || exit 1
 		    
 		make MAKE="make $PMAKE" $PMAKE bootstrap || exit 1

Index: binutils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/binutils,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- binutils	11 Jan 2004 14:43:04 -0000	1.9
+++ binutils	23 Sep 2004 21:50:00 -0000	1.10
@@ -9,7 +9,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       binutils
-# Required-Start: prepare distcc
+# Required-Start: prepare distcc glibc_stage1
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:

Index: popt
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/popt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- popt	11 Jan 2004 14:43:05 -0000	1.6
+++ popt	23 Sep 2004 21:50:01 -0000	1.7
@@ -23,6 +23,9 @@
 # source functions and config
 source $MYDIR/settings
 
+# disabled for now
+exit 0
+
 case $1 in
     build )
 		./configure --prefix=/usr --disable-nls  || exit 1