[Devil-linux-commit] build/scripts patch-o-matic,1.32,1.33

[Serge L. <sma...@us...>]

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

Modified Files:
	patch-o-matic 
Log Message:

- updated l7-filter for kernel 2.6.21.5 


Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- patch-o-matic	27 Mar 2007 00:52:50 -0000	1.32
+++ patch-o-matic	31 Jul 2007 11:07:08 -0000	1.33
@@ -36,17 +36,19 @@
 		
 		    if [ ! -f .done_layer7 ]; then
             		pushd $KERNEL_DIR > /dev/null
-			patch -p1 < ../netfilter-layer7-*/kernel*2.6*layer7-*.patch || exit 1
+#			patch -p1 < ../netfilter-layer7-*/kernel*2.6*layer7-*.patch || exit 1
+			patch -p1 < ../netfilter-layer7-*/for_older_kernels/kernel-2.6.20-2.6.21*layer7-*.patch || exit 1
             		popd > /dev/null
 						
             		pushd  $IPTABLES_DIR > /dev/null
-			patch -p1 < ../netfilter-layer7-*/iptables-layer7-*.patch || exit 1
+#			patch -p1 < ../netfilter-layer7-*/iptables-layer7-*.patch || exit 1
+			patch -p1 < ../netfilter-layer7-*/iptables-*2.6.20forward-layer7*.patch || exit 1
 		        chmod +x extensions/.layer7-test || exit 1
             		popd > /dev/null
 			touch .done_layer7
 		    fi
 		fi
-		
+				
                 for FILE in $(ls $DL_DIR/src/pom-addon/*.tar.bz2)
 		do
 		    tar -vxjf $FILE -C patchlets || exit 1
@@ -88,6 +90,11 @@
 		set_all_kernel_options net/ipv4/netfilter
 		set_all_kernel_options net/ipv6/netfilter
 		
+		if [ "$CONFIG_NF_LAYER7" = "y" ]; then
+		    set_kernel_option CONFIG_NETFILTER_XT_MATCH_LAYER7 m
+		    set_kernel_option CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG n	    
+		fi
+		
 		# settings didn't get applied, so let's do it here
 		#set_kernel_option CONFIG_IP_NF_RAW m