[Devil-linux-commit] build/scripts/config patch-o-matic.exclude,1.4.2.5,1.4.2.6

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

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

Modified Files:
      Tag: rel-1-2-patches
	patch-o-matic.exclude 
Log Message:
enabled sip-conntrack-nat and disabled ipv4options


Index: patch-o-matic.exclude
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/patch-o-matic.exclude,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -d -r1.4.2.5 -r1.4.2.6
--- patch-o-matic.exclude	20 Oct 2005 18:24:49 -0000	1.4.2.5
+++ patch-o-matic.exclude	23 Oct 2005 16:24:00 -0000	1.4.2.6
@@ -2,7 +2,7 @@
 #base/fuzzy
 #base/HOPLIMIT
 #base/iprange
-#base/ipv4options
+base/ipv4options
 #base/IPV4OPTSSTRIP
 #base/NETLINK
 #base/NETMAP
@@ -85,4 +85,4 @@
 extra/ctnetlink
 extra/nfnetlink
 deprecated/nfnetlink-ctnetlink-0.13
-extra/sip-conntrack-nat
+#extra/sip-conntrack-nat