[Devil-linux-commit] build/scripts patch-o-matic,1.22.2.3,1.22.2.4

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

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

Modified Files:
      Tag: rel-1-2-patches
	patch-o-matic 
Log Message:
make layer7 patch work with grsec again


Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -d -r1.22.2.3 -r1.22.2.4
--- patch-o-matic	10 Dec 2005 15:33:47 -0000	1.22.2.3
+++ patch-o-matic	20 Dec 2005 01:46:32 -0000	1.22.2.4
@@ -37,11 +37,11 @@
 		    if [ ! -f .done_layer7 ]; then
 			echo "Applying Layer7 patch"
             		pushd $KERNEL_DIR > /dev/null
-			patch -p1 < ../netfilter-layer7-*/kernel-2.4-layer7-*.patch || exit 1
+			patch -p1 -i ../netfilter-layer7-*/kernel-2.4-layer7-*grsec.patch || exit 1
             		popd > /dev/null
 						
             		pushd  $IPTABLES_DIR > /dev/null
-			patch -p1 < ../netfilter-layer7-*/iptables-layer7-*.patch || exit 1
+			patch -p1 -i ../netfilter-layer7-*/iptables-layer7-*.patch || exit 1
 		        chmod +x extensions/.layer7-test || exit 1
             		popd > /dev/null
 			touch .done_layer7