rendered paste bodyIndex: target/linux/control/kmod-ipt-nat-rtsp.control
===================================================================
--- target/linux/control/kmod-ipt-nat-rtsp.control (revision 0)
+++ target/linux/control/kmod-ipt-nat-rtsp.control (revision 0)
@@ -0,0 +1,4 @@
+Package: kmod-ipt-nat-rtsp
+Priority: optional
+Section: net
+Description: Netfilter (IPv4) NAT kernel modules for RTSP
Index: target/linux/control/kmod-ipt-nat-h323.control
===================================================================
--- target/linux/control/kmod-ipt-nat-h323.control (revision 0)
+++ target/linux/control/kmod-ipt-nat-h323.control (revision 0)
@@ -0,0 +1,4 @@
+Package: kmod-ipt-nat-h323
+Priority: optional
+Section: net
+Description: Netfilter (IPv4) NAT kernel modules for H.323
Index: target/linux/control/kmod-ipt-nat-pptp.control
===================================================================
--- target/linux/control/kmod-ipt-nat-pptp.control (revision 0)
+++ target/linux/control/kmod-ipt-nat-pptp.control (revision 0)
@@ -0,0 +1,4 @@
+Package: kmod-ipt-nat-pptp
+Priority: optional
+Section: net
+Description: Netfilter (IPv4) NAT kernel modules for PPTP
Index: target/linux/Config.in
===================================================================
--- target/linux/Config.in (revision 3362)
+++ target/linux/Config.in (working copy)
@@ -119,6 +119,24 @@
Includes:
* ipt_REDIRECT
+config BR2_PACKAGE_KMOD_IPT_NAT_H323
+ tristate "Netfilter NAT modules for H.323"
+ default m
+ help
+ Netfilter (IPv4) NAT kernel modules for H.323
+
+config BR2_PACKAGE_KMOD_IPT_NAT_PPTP
+ tristate "Netfilter NAT modules for PPTP"
+ default m
+ help
+ Netfilter (IPv4) NAT kernel modules for PPTP
+
+config BR2_PACKAGE_KMOD_IPT_NAT_RTSP
+ tristate "Netfilter NAT modules for RTSP"
+ default m
+ help
+ Netfilter (IPv4) NAT kernel modules for RTSP
+
config BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
tristate "Extra Netfilter NAT modules for special protocols"
default m
@@ -129,8 +147,6 @@
* ip_conntrack_amanda
* ip_conntrack_proto_gre
* ip_nat_proto_gre
- * ip_conntrack_pptp
- * ip_nat_pptp
* ip_nat_snmp_basic
* ip_conntrack_tftp
Index: target/linux/linux-2.4/Makefile
===================================================================
--- target/linux/linux-2.4/Makefile (revision 3362)
+++ target/linux/linux-2.4/Makefile (working copy)
@@ -62,31 +62,40 @@
,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulog))
$(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\
- $(foreach mod,$(IPKG_KMOD_IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+ $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
))
$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\
- $(foreach mod,$(IPKG_KMOD_IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+ $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
))
$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\
- $(foreach mod,$(IPKG_KMOD_IPT_FILTER-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+ $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
))
$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\
- $(foreach mod,$(IPKG_KMOD_IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+ $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
))
$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\
- $(foreach mod,$(IPKG_KMOD_IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+ $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
))
$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\
- $(foreach mod,$(IPKG_KMOD_IPT_NAT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+ $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
))
+$(eval $(call KMOD_template,IPT_NAT_H323,ipt-nat-h323,\
+ $(foreach mod,$(IPT_NAT_H323-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+,,,40,$(IPT_NAT_H323-m)))
+$(eval $(call KMOD_template,IPT_NAT_PPTP,ipt-nat-pptp,\
+ $(foreach mod,$(IPT_NAT_PPTP-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+,,,40,$(IPT_NAT_PPTP-m)))
+$(eval $(call KMOD_template,IPT_NAT_RTSP,ipt-nat-rtsp,\
+ $(foreach mod,$(IPT_NAT_RTSP-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+,,,40,$(IPT_NAT_RTSP-m)))
$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\
- $(foreach mod,$(IPKG_KMOD_IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
-,,,40,$(IPKG_KMOD_IPT_NAT_EXTRA-m)))
+ $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+,,,40,$(IPT_NAT_EXTRA-m)))
$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\
- $(foreach mod,$(IPKG_KMOD_IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+ $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
))
$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\
- $(foreach mod,$(IPKG_KMOD_IPT_ULOG-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
+ $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \
))
$(eval $(call KMOD_template,IMQ,imq,\
Index: package/iptables/Makefile
===================================================================
--- package/iptables/Makefile (revision 3362)
+++ package/iptables/Makefile (working copy)
@@ -48,14 +48,14 @@
$(eval $(call PKG_template,IPTABLES_MOD_NAT,iptables-mod-nat,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,IPTABLES_MOD_ULOG,iptables-mod-ulog,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call IPKG_plugin_template,IPTABLES_MOD_CONNTRACK,$(IPKG_IPTABLES_MOD_CONNTRACK-m)))
-$(eval $(call IPKG_plugin_template,IPTABLES_MOD_EXTRA,$(IPKG_IPTABLES_MOD_EXTRA-m)))
-$(eval $(call IPKG_plugin_template,IPTABLES_MOD_FILTER,$(IPKG_IPTABLES_MOD_FILTER-m),layer7-install))
-$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IMQ,$(IPKG_IPTABLES_MOD_IMQ-m)))
-$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPOPT,$(IPKG_IPTABLES_MOD_IPOPT-m)))
-$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPSEC,$(IPKG_IPTABLES_MOD_IPSEC-m)))
-$(eval $(call IPKG_plugin_template,IPTABLES_MOD_NAT,$(IPKG_IPTABLES_MOD_NAT-m)))
-$(eval $(call IPKG_plugin_template,IPTABLES_MOD_ULOG,$(IPKG_IPTABLES_MOD_ULOG-m)))
+$(eval $(call IPKG_plugin_template,IPTABLES_MOD_CONNTRACK,$(IPT_CONNTRACK-m)))
+$(eval $(call IPKG_plugin_template,IPTABLES_MOD_EXTRA,$(IPT_EXTRA-m)))
+$(eval $(call IPKG_plugin_template,IPTABLES_MOD_FILTER,$(IPT_FILTER-m),layer7-install))
+$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IMQ,$(IPT_IMQ-m)))
+$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPOPT,$(IPT_IPOPT-m)))
+$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPSEC,$(IPT_IPSEC-m)))
+$(eval $(call IPKG_plugin_template,IPTABLES_MOD_NAT,$(IPT_NAT-m)))
+$(eval $(call IPKG_plugin_template,IPTABLES_MOD_ULOG,$(IPT_ULOG-m)))
$(PKG_BUILD_DIR)/.configured:
touch $@
@@ -83,7 +83,7 @@
cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/
install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables
(cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
- cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y)) $(IDIR_IPTABLES)/usr/lib/iptables/ \
+ cp -fpR $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \
)
$(RSTRIP) $(IDIR_IPTABLES)
$(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR)