[Devil-linux-commit] build/scripts glibc,1.31,1.31.2.1 grsecurity,1.20.2.1,1.20.2.2 iptraf,1.11,1.11.2.1 php,1.9.2.1,1.9.2.2

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

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

Modified Files:
      Tag: rel-1-2-patches
	glibc grsecurity iptraf php 
Log Message:
- various program updates
- corrected gradm installation (missing files)
- disabled iptraf until a patch is available for kernel 2.4.28 support
(project isn't maintained anymore)
- added gettext support to php (Jean-Luc Parouty / Heiko)
- updated openswan to v1 CVS-2004-11-23
- ipv6 module is not loaded per default anymore (change modules.conf if
needed)
- updated kernel to v2.4.28


Index: iptraf
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iptraf,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- iptraf	11 Jan 2004 14:43:04 -0000	1.11
+++ iptraf	24 Nov 2004 17:10:37 -0000	1.11.2.1
@@ -28,6 +28,10 @@
 case $1 in
 	build )
 		if [ "$CONFIG_IPTRAF" = "y" ]; then
+			#if [ ! -e .done_dl_patches ]; then
+			#    bzcat $DL_DIR/src/iptraf-netdevice-fix.diff.bz2 | patch -p1 || exit 1
+			#    touch .done_dl_patches
+			#fi
 			replace_str ./src/Makefile /var/local/iptraf /var/iptraf
 			make $PMAKE -C src || exit 1
 			strip_debug

Index: php
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/php,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -d -r1.9.2.1 -r1.9.2.2
--- php	21 Aug 2004 15:22:04 -0000	1.9.2.1
+++ php	24 Nov 2004 17:10:37 -0000	1.9.2.2
@@ -34,7 +34,7 @@
 				--with-config-file-path=/etc --with-dom-exslt --enable-ftp --with-gd --with-gmp \
 				--enable-gd-native-ttf --with-ldap --with-mcrypt --with-mhash --with-pgsql --with-snmp \
 				--with-imap=$IMAPDIR --with-imap-ssl --with-openssl --with-iconv \
-				--sysconfdir=/etc --with-config-file-path=/etc --prefix=/usr || exit 1
+				--sysconfdir=/etc --with-config-file-path=/etc --prefix=/usr --with-gettext || exit 1
 			#
 			# not working --enable-xslt --with-kerberos
 			# do not use --with-cyrus

Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -d -r1.20.2.1 -r1.20.2.2
--- grsecurity	4 Sep 2004 15:00:16 -0000	1.20.2.1
+++ grsecurity	24 Nov 2004 17:10:37 -0000	1.20.2.2
@@ -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

Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -d -r1.31 -r1.31.2.1
--- glibc	10 Feb 2004 00:52:03 -0000	1.31
+++ glibc	24 Nov 2004 17:10:36 -0000	1.31.2.1
@@ -51,12 +51,16 @@
 		cd ../glibc-build || exit 1
 		# unfortunately we can only go as high as the host kernel version
 
-		KVER_RUN=$(cat /proc/sys/kernel/osrelease)
-		if [ "$KERNELVERSION" \> "$KVER_RUN" ]; then
-		   KVER=$KVER_RUN
-		else
-		   KVER=$KERNELVERSION
-		fi
+		#KVER_RUN=$(cat /proc/sys/kernel/osrelease)
+		#if [ "$KERNELVERSION" \> "$KVER_RUN" ]; then
+		#   KVER=$KVER_RUN
+		#else
+		#   KVER=$KERNELVERSION
+		#fi
+		
+		# set the minimum kernel level, so our remote updates won't fail
+		KVER=2.4.22
+		
 		../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/bin --enable-kernel=$KVER --without-gd || exit 1
 
 		make $PMAKE || exit 1