[PATCH] p-o-mification of nfnetlink-ctnetlink patch

[netfilter@interlinx.bc.ca]

[-- Attachment #1.1: Type: text/plain, Size: 512 bytes --]

[ Sorry if this shows up as a duplicate later.  I forgot to use the
  correct posting address and didn't want to wait to see if/when it
  would be approved by the list manager. ]

Hi all,

I noticed when working on my Amanda conntrack/nat module that the
nfnetlink-ctnetlink in p-o-m was not quite to p-o-m standards with
regard to separation of the parts of the patch.  Please find attached
a patch to p-o-m which "p-o-mifies" the one nfnetlink-ctnetlink patch.

Thanx,
b.

-- 
Brian J. Murrell

[-- Attachment #1.2: nfnetlink-ctnetlink.patch --]
[-- Type: text/plain, Size: 4902 bytes --]

diff --exclude CVS -Nur ./patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch ../netfilter/patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch
--- ./patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch	2002-09-13 14:49:45.000000000 -0400
+++ ../netfilter/patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch	2002-08-21 10:53:15.000000000 -0400
@@ -1,45 +1,3 @@
-diff -Nru --exclude .depend --exclude *.o --exclude *.ver --exclude .*.flags --exclude *.orig --exclude *.rej --exclude *~ linuxppc-020802-newnat/net/ipv4/netfilter/Config.in linuxppc-020802-newnat14-ctnl/net/ipv4/netfilter/Config.in
---- linuxppc-020802-newnat/net/ipv4/netfilter/Config.in	Fri Aug  2 02:32:30 2002
-+++ linuxppc-020802-newnat14-ctnl/net/ipv4/netfilter/Config.in	Fri Aug  2 15:45:54 2002
-@@ -4,11 +4,19 @@
- mainmenu_option next_comment
- comment '  IP: Netfilter Configuration'
- 
-+tristate 'Netfilter netlink interface' CONFIG_IP_NF_NETLINK
-+
- tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK
- if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then
-   dep_tristate '  FTP protocol support' CONFIG_IP_NF_FTP $CONFIG_IP_NF_CONNTRACK
-   dep_tristate '  IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK
-+  if [ "$CONFIG_IP_NF_CONNTRACK" = "y" ]; then
-+    dep_tristate '  Connection tracking netlink interface' CONFIG_IP_NF_NETLINK_CONNTRACK $CONFIG_IP_NF_NETLINK
-+  else
-+    dep_tristate '  Connection tracking netlink interface' CONFIG_IP_NF_NETLINK_CONNTRACK $CONFIG_IP_NF_CONNTRACK
-+  fi
- fi
-+
- 
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-   tristate 'Userspace queueing via NETLINK (EXPERIMENTAL)' CONFIG_IP_NF_QUEUE
-diff -Nru --exclude .depend --exclude *.o --exclude *.ver --exclude .*.flags --exclude *.orig --exclude *.rej --exclude *~ linuxppc-020802-newnat/net/ipv4/netfilter/Makefile linuxppc-020802-newnat14-ctnl/net/ipv4/netfilter/Makefile
---- linuxppc-020802-newnat/net/ipv4/netfilter/Makefile	Fri Aug  2 11:18:23 2002
-+++ linuxppc-020802-newnat14-ctnl/net/ipv4/netfilter/Makefile	Fri Aug  2 15:41:30 2002
-@@ -28,6 +28,15 @@
- ipfwadm-objs		:= $(ip_nf_compat-objs) ipfwadm_core.o
- ipchains-objs		:= $(ip_nf_compat-objs) ipchains_core.o
- 
-+# netfilter netlink interface
-+obj-$(CONFIG_IP_NF_NETLINK) += nfnetlink.o
-+ifdef CONFIG_IP_NF_NETLINK
-+	export-objs += nfnetlink.o
-+endif
-+
-+# nfnetlink modules
-+obj-$(CONFIG_IP_NF_NETLINK_CONNTRACK) += nfnetlink_conntrack.o
-+
- # connection tracking
- obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o
- 
 diff -Nru --exclude .depend --exclude *.o --exclude *.ver --exclude .*.flags --exclude *.orig --exclude *.rej --exclude *~ linuxppc-020802-newnat/net/ipv4/netfilter/nfnetlink.c linuxppc-020802-newnat14-ctnl/net/ipv4/netfilter/nfnetlink.c
 --- linuxppc-020802-newnat/net/ipv4/netfilter/nfnetlink.c	Thu Jan  1 01:00:00 1970
 +++ linuxppc-020802-newnat14-ctnl/net/ipv4/netfilter/nfnetlink.c	Fri Aug  2 16:35:39 2002
diff --exclude CVS -Nur ./patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.config.in ../netfilter/patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.config.in
--- ./patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.config.in	1969-12-31 19:00:00.000000000 -0500
+++ ../netfilter/patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.config.in	2002-08-21 10:47:28.000000000 -0400
@@ -0,0 +1,3 @@
+comment '  IP: Netfilter Configuration'
+
+tristate 'Netfilter netlink interface' CONFIG_IP_NF_NETLINK
diff --exclude CVS -Nur ./patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.config.in-2 ../netfilter/patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.config.in-2
--- ./patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.config.in-2	1969-12-31 19:00:00.000000000 -0500
+++ ../netfilter/patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.config.in-2	2002-08-21 10:50:06.000000000 -0400
@@ -0,0 +1,6 @@
+if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then
+  if [ "$CONFIG_IP_NF_CONNTRACK" = "y" ]; then
+    dep_tristate '  Connection tracking netlink interface' CONFIG_IP_NF_NETLINK_CONNTRACK $CONFIG_IP_NF_NETLINK
+  else
+    dep_tristate '  Connection tracking netlink interface' CONFIG_IP_NF_NETLINK_CONNTRACK $CONFIG_IP_NF_CONNTRACK
+  fi
diff --exclude CVS -Nur ./patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.makefile ../netfilter/patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.makefile
--- ./patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.makefile	1969-12-31 19:00:00.000000000 -0500
+++ ../netfilter/patch-o-matic/extra/nfnetlink-ctnetlink-0.11.patch.makefile	2002-08-21 10:52:48.000000000 -0400
@@ -0,0 +1,10 @@
+ipchains-objs		:= $(ip_nf_compat-objs) ipchains_core.o
+
+# netfilter netlink interface
+obj-$(CONFIG_IP_NF_NETLINK) += nfnetlink.o
+ifdef CONFIG_IP_NF_NETLINK
+	export-objs += nfnetlink.o
+endif
+
+# nfnetlink modules
+obj-$(CONFIG_IP_NF_NETLINK_CONNTRACK) += nfnetlink_conntrack.o

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]