[Devil-linux-commit] build/scripts grsecurity,1.24,1.25

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

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

Modified Files:
	grsecurity 
Log Message:
- updated lm_sensors to cvs 20050123
- updated i2c to cvs 20050123
- removed i2c kernel patch
- updated gradm to 2.1.1-200501222316
- updated grsecurity to 2.1.1-2.4.29-200501231159
- added -as2 kernel patches


Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- grsecurity	2 Jan 2005 21:49:00 -0000	1.24
+++ grsecurity	27 Jan 2005 03:53:38 -0000	1.25
@@ -40,14 +40,20 @@
 			fi
 			touch devil-linux-grsec-kernel-patches.done
 		fi
+		
 		# add configuration to kernel config
-		cat $KERNEL_CONFIG_DIR/config_grsecurity >> .config
+		cat $MYDIR/config/config_grsecurity >> .config
 
 		# start oldconfig, in case there are new options
 		make oldconfig || exit 1
 
 		# compile the admin program
 		cd $GRADMDIR || exit 1
+		if [ ! -f devil-linux-patches.done ]; then
+		    bzcat $DL_DIR/src/gradm-distro.diff.bz2 | patch -p1
+		    touch devil-linux-patches.done
+		fi
+		
 		make $PMAKE all || exit 1
 		strip_debug
 	fi
@@ -55,14 +61,14 @@
 
 	install )
 	if [ "$CONFIG_GRSECURITY" = "y" ] ; then
-		rm -rf $TMPDIR
-		mkdir -p $TMPDIR || exit 1
+		rm -rf $WORKDIR/tmp
+		mkdir -p $WORKDIR/tmp || exit 1
 		cd $GRADMDIR || exit 1
-		make -C $GRADMDIR  DESTDIR=$TMPDIR install || exit 1
+		make -C $GRADMDIR  DESTDIR=$WORKDIR/tmp install || exit 1
 		
-		copy_docs $TMPDIR || exit 1
-		cp -vdpR $TMPDIR/sbin/* $CDDIR/sbin || exit 1
-		cp -vdpR $TMPDIR/etc $ETCDIR/ || 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