[Devil-linux-commit] build/scripts patch-o-matic,1.13,1.14

[Friedrich L. <fr...@us...>]

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

Modified Files:
	patch-o-matic 
Log Message:
fixed the case that netfilter patch-o-matic did fail with
certain submitted and/or pending patches (fl)



Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- patch-o-matic	25 Feb 2004 20:10:09 -0000	1.13
+++ patch-o-matic	9 Apr 2004 01:18:57 -0000	1.14
@@ -30,15 +30,26 @@
 		export KERNEL_DIR=$KERNELDIR
 		NETFILTERDIR=$(find_src_dir iptables)
 		export NETFILTERDIR
-		./runme --batch submitted
-		./runme --batch pending
-		./runme --batch optimizations
-		if [ "$CONFIG_NF_BASE" = "y" ]; then
-			./runme --batch base
-		fi
-		if [ "$CONFIG_NF_EXTRA" = "y" ]; then
-			./runme --batch $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^	\+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra)
-		fi
+
+		# move troublesome patches away
+		mkdir -p submitted/tmp
+		mkdir -p pending/tmp
+		mv -f submitted/61_nulldev_alignment* submitted/tmp &> /dev/null
+		#mv -f pending/XXXXX* pending/tmp &> /dev/null
+
+		PATCHES=""; 
+		[ "$CONFIG_NF_BASE" = "y" ] && \
+			PATCHES="$PATCHES base";
+		[ "$CONFIG_NF_EXTRA" = "y" ] && \
+			PATCHES="$PATCHES $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^	\+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra)"
+
+		# now apply all patches at once
+		./runme --batch \
+			submitted \
+			pending \
+			optimizations \
+			$PATCHES
+
 		for CFG in $(  grep tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			set_kernel_option $CFG m
 		done
@@ -54,6 +65,7 @@
 
 		# settings didn't get applied, so let's do it here
 		set_kernel_option CONFIG_IP_NF_RAW m 
+		set_kernel_option CONFIG_IP_NF_SET_MAX 256
 
 		echo "**** IPv4 ****" > $WORKDIR/netfilter.patches.lst
 		grep tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 2 >> $WORKDIR/netfilter.patches.lst