[Devil-linux-commit] build/scripts glibc,1.38,1.39 grsecurity,1.21,1.22

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

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

Modified Files:
	glibc grsecurity 
Log Message:
- disabled IPv6 module per default (modules.conf)
- corrected grsecurity installation
- added gettext support to php (Jean-Luc Parouty / Heiko)


Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- glibc	12 Nov 2004 01:23:57 -0000	1.38
+++ glibc	24 Nov 2004 17:14:17 -0000	1.39
@@ -73,9 +73,12 @@
 		#else
 		#   KVER=$KERNELVERSION
 		#fi
-		#KVER="2.6.0"
+		
+		# set minimum kernel to 2.4.22, so we don't mess up our 'remote' updates
+		KVER="2.4.22"
+
 		../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons=$ADDON --libexecdir=/usr/bin \
-		    -without-cvs --with-tls --without-__thread || exit 1
+		    -without-cvs --with-tls --without-__thread --enable-kernel=$KVER  || exit 1
 		#    -without-cvs --with-tls --with-__thread || exit 1  # use this one for nptl
 		
 		#  --with-headers=$KERNELDIR/include

Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- grsecurity	3 Sep 2004 02:02:46 -0000	1.21
+++ grsecurity	24 Nov 2004 17:14:17 -0000	1.22
@@ -30,8 +30,7 @@
 	if [ "$CONFIG_GRSECURITY" = "y" ] ; then
 		cd $KERNELDIR
 		if [ ! -f devil-linux-grsec-kernel-patches.done ]; then
-			touch devil-linux-grsec-kernel-patches.done
-			bzcat $DL_DIR/src/grsecurity-2.*$CONFIG_LINUX_VERSION*.patch.bz2 > grsecurity.patch || exit 1
+			zcat $DL_DIR/src/grsecurity-2.*$CONFIG_LINUX_VERSION*.patch.gz > grsecurity.patch || exit 1
 			if [ ! "$CONFIG_VHZ" = "OFF" ]; then
 				bzcat $DL_DIR/src/grsecurity-kernel-vhz1.patch.bz2 |sed -e 's/^--- grsecurity.*/--- grsecurity.patch.old/g' -e 's/^+++ grsecurity.*/+++ grsecurity.patch/g' | patch -p0 || exit 1
 			fi
@@ -39,6 +38,7 @@
 			if [ ! "$CONFIG_VHZ" = "OFF" ]; then
 				bzcat $DL_DIR/src/grsecurity-kernel-vhz2.patch.bz2 | patch -p0 || exit 1
 			fi
+			touch devil-linux-grsec-kernel-patches.done
 		fi
 		# add configuration to kernel config
 		cat $MYDIR/config/config_grsecurity >> .config
@@ -55,10 +55,15 @@
 
 	install )
 	if [ "$CONFIG_GRSECURITY" = "y" ] ; then
+		rm -rf $WORKDIR/tmp
+		mkdir -p $WORKDIR/tmp || exit 1
 		cd $GRADMDIR || exit 1
-		cp -dp $GRADMDIR/gradm $CDDIR/sbin || exit 1
-		mkdir -p $ETCDIR/etc/grsec || exit 1
-		cp -dp policy $ETCDIR/etc/grsec/ || exit
+		make -C $GRADMDIR  DESTDIR=$WORKDIR/tmp install || exit 1
+		
+		copy_docs $WORKDIR/tmp || exit 1
+		cp -vdpR $WORKDIR/tmp/sbin/* $CDDIR/sbin || exit 1
+		cp -vdpR $WORKDIR/tmp/etc $ETCDIR/ || exit 1
+		
 		mkdir -p $DOCDIR/grsecurity/ || exit 1
 
 		cp -dp $MYDIR/scripts/grsecurity $ETCDIR/etc/init.d || exit 1