[Devil-linux-commit] build/scripts patch-o-matic,1.8,1.8.2.1

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

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

Modified Files:
      Tag: rel-1-0-patches
	patch-o-matic 
Log Message:
While searching why the pptp netfilter connection tracking modul disappeared
somewhere in the 1.0.x series, I discovered that the netfilter patch-o-matic
patches fail already pretty soon in their patch process. 

This is now corrected. Hopefully we are not introducing some problems 
because certain netfilter modules that should have been there, are now
really there.

In case there are troubles mail fl...@fl...



Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- patch-o-matic	20 Aug 2003 20:02:48 -0000	1.8
+++ patch-o-matic	6 Apr 2004 23:33:59 -0000	1.8.2.1
@@ -19,15 +19,26 @@
 	echo "no extra patches" > $WORKDIR/netfilter.patches.lst
 	if [ "$CONFIG_NF_PENDING" = "y" ]; then
 		export KERNEL_DIR=$KERNELDIR
-		yes "n" | ./runme --batch submitted
-		yes "n" | ./runme --batch pending
-		yes "n" | ./runme --batch optimizations
-		if [ "$CONFIG_NF_BASE" = "y" ]; then
-			yes "n" | ./runme --batch base
-		fi
-		if [ "$CONFIG_NF_EXTRA" = "y" ]; then
-			yes "n" | ./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/45_masq_routing_check* submitted/73_ipt_MASQUERADE-oif* submitted/tmp &> /dev/null
+		mv -f pending/40_nf-log* 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 dep_tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			echo "$CFG=m" >> $KERNELDIR/.config
 		done
@@ -40,6 +51,7 @@
 		for CFG in $(  grep bool $KERNELDIR/net/ipv6/netfilter/Config.in | cut -d "'" -f 3 | cut -d " " -f 2 ); do
 			echo "$CFG=y" >> $KERNELDIR/.config
 		done
+
 		echo "**** IPv4 ****" > $WORKDIR/netfilter.patches.lst
 		grep dep_tristate $KERNELDIR/net/ipv4/netfilter/Config.in | cut -d "'" -f 2 >> $WORKDIR/netfilter.patches.lst
 		pushd $KERNEL_DIR > /dev/null