[Devil-linux-commit] build/scripts grsecurity,1.19,1.20 perl,1.28,1.29

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

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

Modified Files:
	grsecurity perl 
Log Message:
various software updates
updated grsecurity to v2


Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- grsecurity	24 Mar 2004 02:07:49 -0000	1.19
+++ grsecurity	23 Apr 2004 15:53:13 -0000	1.20
@@ -31,7 +31,7 @@
 		cd $KERNELDIR
 		if [ ! -f devil-linux-grsec-kernel-patches.done ]; then
 			touch devil-linux-grsec-kernel-patches.done
-			bzcat $DL_DIR/src/grsecurity-1.9*.patch.bz2 > grsecurity.patch || exit 1
+			bzcat $DL_DIR/src/grsecurity-2.*$CONFIG_LINUX_VERSION*.patch.bz2 > 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
@@ -42,6 +42,7 @@
 		fi
 		# add configuration to kernel config
 		cat $MYDIR/config/config_grsecurity >> .config
+
 		# start oldconfig, in case there are new options
 		make oldconfig || exit 1
 
@@ -59,7 +60,6 @@
 		mkdir -p $ETCDIR/etc/grsec || exit 1
 		cp -dp acl $ETCDIR/etc/grsec/ || exit
 		mkdir -p $DOCDIR/grsecurity/ || exit 1
-		cp -dpR ./debian* $DOCDIR/grsecurity/ || exit 1
 
 		cp -dp $MYDIR/scripts/grsecurity $ETCDIR/etc/init.d || exit 1
 		cp -dp $MYDIR/scripts/grsecurity.proc $ETCDIR/etc/sysconfig || exit 1

Index: perl
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/perl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- perl	11 Jan 2004 14:43:04 -0000	1.28
+++ perl	23 Apr 2004 15:53:13 -0000	1.29
@@ -61,6 +61,7 @@
 			rm -f /usr/share/man/man1/s2p.1 /usr/share/man/man1/psed.1 /usr/share/man/man1/c2ph.1 /usr/share/man/man1/pstruct.1
 			rm -f /usr/bin/perl /usr/bin/perl5.8.0
 			rm -f /usr/bin/perl /usr/bin/perl5.8.2
+			rm -f /usr/bin/perl /usr/bin/perl5.8.3
 			rm -f /usr/bin/s2p /usr/bin/psed
 			rm -f /usr/bin/pstruct /usr/bin/c2ph
 			cp -vfdpR $WORKDIR/tmp/* /usr || exit 1
@@ -83,7 +84,7 @@
 			rm $WORKDIR/tmp/bin/perl || exit 1
 
 			# check here if install fails, you probably upgraded to a new perl release
-			PERLBIN=perl5.8.2
+			PERLBIN=perl5.8.3
 			[ -e $WORKDIR/tmp/bin/$PERLBIN ] || exit 1
 			ln -sf $PERLBIN $WORKDIR/tmp/bin/perl || exit 1