[Devil-linux-commit] build/scripts patch-o-matic, 1.22.2.9, 1.22.2.10

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

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

Modified Files:
      Tag: rel-1-2-patches
	patch-o-matic 
Log Message:
undo last couple changes


Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.22.2.9
retrieving revision 1.22.2.10
diff -u -d -r1.22.2.9 -r1.22.2.10
--- patch-o-matic	30 Mar 2007 19:16:23 -0000	1.22.2.9
+++ patch-o-matic	30 Mar 2007 23:32:34 -0000	1.22.2.10
@@ -35,6 +35,11 @@
 		if [ "$CONFIG_NF_LAYER7" = "y" ]; then
 		
 		    if [ ! -f .done_layer7 ]; then
+			echo "Applying GRSecurity compatability patch for Layer7 patch"
+			pushd ../netfilter-layer7-* > /dev/null
+			bzcat $DL_DIR/src/netfilter-layer7-v2.6-grsec.patch.bz2 | patch -p0 kernel-2.4-layer7-*.patch || exit 1
+			popd > /dev/null
+			
             		pushd $KERNEL_DIR > /dev/null
 			patch -p1 < ../netfilter-layer7-*/kernel*2.4*layer7-*.patch || exit 1
             		popd > /dev/null