Changeset 17844


Ignore:
Timestamp:
2009-10-04T01:51:10+02:00 (7 years ago)
Author:
nico
Message:

remove ipset support from core, it is now provided by xtables-addons from the packages feed

Location:
trunk
Files:
8 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/iptables/Makefile

    r17721 r17844  
    208208endef 
    209209 
    210 define Package/iptables-mod-ipset 
    211 $(call Package/iptables/Module, +kmod-ipt-ipset) 
    212   TITLE:=IPset extension 
    213 endef 
    214  
    215210define Package/iptables-utils 
    216211$(call Package/iptables/Module, ) 
     
    366361$(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m))) 
    367362$(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m))) 
    368 $(eval $(call BuildPlugin,iptables-mod-ipset,$(IPT_IPSET-m))) 
    369363$(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m),$(L7_INSTALL))) 
    370364$(eval $(call BuildPlugin,iptables-mod-imq,$(IPT_IMQ-m))) 
  • trunk/package/kernel/modules/netfilter.mk

    r17764 r17844  
    301301 
    302302 
    303 define KernelPackage/ipt-ipset 
    304   SUBMENU:=$(NF_MENU) 
    305   TITLE:=IPSET Modules 
    306   KCONFIG:=$(KCONFIG_IPT_IPSET) 
    307   FILES:=$(foreach mod,$(IPT_IPSET-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) 
    308   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSET-m))) 
    309   DEPENDS:= kmod-ipt-core 
    310 endef 
    311  
    312 define KernelPackage/ipt-ipset/description 
    313  Netfilter kernel modules for ipset 
    314  Includes: 
    315  - ip_set 
    316  - ip_set_iphash 
    317  - ip_set_ipmap 
    318  - ip_set_ipporthash 
    319  - ip_set_ipportiphash 
    320  - ip_set_ipportnethash 
    321  - ip_set_iptree 
    322  - ip_set_iptreemap 
    323  - ip_set_macipmap 
    324  - ip_set_nethash 
    325  - ip_set_portmap 
    326  - ip_set_setlist 
    327  - ipt_set 
    328  - ipt_SET 
    329 endef 
    330  
    331 $(eval $(call KernelPackage,ipt-ipset)) 
    332  
    333  
    334303define KernelPackage/ipt-extra 
    335304  SUBMENU:=$(NF_MENU) 
  • trunk/target/linux/generic-2.4/patches/609-netfilter_string.patch

    r17553 r17844  
    2222--- a/net/ipv4/netfilter/Config.in 
    2323+++ b/net/ipv4/netfilter/Config.in 
    24 @@ -61,6 +61,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     24@@ -47,6 +47,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    2525   fi 
    2626   if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then 
     
    134134--- a/net/ipv4/netfilter/Makefile 
    135135+++ b/net/ipv4/netfilter/Makefile 
    136 @@ -99,6 +99,7 @@ obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_s 
     136@@ -87,6 +87,7 @@ obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_s 
    137137 obj-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark.o 
    138138 obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o 
  • trunk/target/linux/generic-2.4/patches/610-netfilter_connbytes.patch

    r17553 r17844  
    1212--- a/net/ipv4/netfilter/Makefile 
    1313+++ b/net/ipv4/netfilter/Makefile 
    14 @@ -97,6 +97,7 @@ obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_ 
     14@@ -85,6 +85,7 @@ obj-$(CONFIG_IP_NF_MATCH_LENGTH) += ipt_ 
    1515 obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o 
    1616 obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_state.o 
  • trunk/target/linux/generic-2.4/patches/611-netfilter_condition.patch

    r17553 r17844  
    1616 CONFIG_IP_NF_MATCH_CONNTRACK 
    1717   This is a general conntrack match module, a superset of the state match. 
    18 @@ -3365,6 +3373,14 @@ CONFIG_IP6_NF_MATCH_MARK 
     18@@ -3296,6 +3304,14 @@ CONFIG_IP6_NF_MATCH_MARK 
    1919   If you want to compile it as a module, say M here and read 
    2020   <file:Documentation/modules.txt>.  If unsure, say `N'. 
     
    6161--- a/net/ipv4/netfilter/Config.in 
    6262+++ b/net/ipv4/netfilter/Config.in 
    63 @@ -41,6 +41,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     63@@ -27,6 +27,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    6464   dep_tristate '  netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES 
    6565   dep_tristate '  Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES 
     
    7171--- a/net/ipv4/netfilter/Makefile 
    7272+++ b/net/ipv4/netfilter/Makefile 
    73 @@ -85,6 +85,7 @@ obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt 
     73@@ -73,6 +73,7 @@ obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt 
    7474 obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o 
    7575 obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o 
  • trunk/target/linux/generic-2.4/patches/612-netfilter_quota.patch

    r17553 r17844  
    3737   dep_tristate '  limit match support' CONFIG_IP_NF_MATCH_LIMIT $CONFIG_IP_NF_IPTABLES 
    3838+  dep_tristate '  quota match support' CONFIG_IP_NF_MATCH_QUOTA $CONFIG_IP_NF_IPTABLES 
    39   
    40    dep_tristate '  IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES 
    41    if [ "$CONFIG_IP_NF_SET" != "n" ]; then 
     39   dep_tristate '  MAC address match support' CONFIG_IP_NF_MATCH_MAC $CONFIG_IP_NF_IPTABLES 
     40   dep_tristate '  Packet type match support' CONFIG_IP_NF_MATCH_PKTTYPE $CONFIG_IP_NF_IPTABLES 
     41   dep_tristate '  netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES 
    4242--- a/net/ipv4/netfilter/Makefile 
    4343+++ b/net/ipv4/netfilter/Makefile 
     
    4848+obj-$(CONFIG_IP_NF_MATCH_QUOTA) += ipt_quota.o 
    4949 obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o 
    50  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o 
    51  obj-$(CONFIG_IP_NF_TARGET_SET) += ipt_SET.o 
     50 obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o 
     51 obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o 
    5252--- /dev/null 
    5353+++ b/net/ipv4/netfilter/ipt_quota.c 
  • trunk/target/linux/generic-2.4/patches/613-netfilter_nat_h323.patch

    r17553 r17844  
    99  
    1010 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then 
    11 @@ -94,6 +95,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     11@@ -80,6 +81,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    1212           define_tristate CONFIG_IP_NF_NAT_AMANDA $CONFIG_IP_NF_NAT 
    1313         fi 
  • trunk/target/linux/generic-2.4/patches/614-netfilter_nat_rtsp.patch

    r17553 r17844  
    99  
    1010 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then 
    11 @@ -102,6 +103,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     11@@ -88,6 +89,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    1212          define_tristate CONFIG_IP_NF_NAT_H323 $CONFIG_IP_NF_NAT 
    1313        fi 
  • trunk/target/linux/generic-2.4/patches/615-netfilter_nat_mms.patch

    r17553 r17844  
    99  
    1010 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then 
    11 @@ -110,6 +111,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     11@@ -96,6 +97,13 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    1212          define_tristate CONFIG_IP_NF_NAT_RTSP $CONFIG_IP_NF_NAT 
    1313        fi 
  • trunk/target/linux/generic-2.4/patches/616-netfilter_imq.patch

    r17553 r17844  
    2424 CONFIG_IP_NF_TARGET_MARK 
    2525   This option adds a `MARK' target, which allows you to create rules 
    26 @@ -9931,6 +9947,20 @@ CONFIG_BONDING 
     26@@ -9862,6 +9878,20 @@ CONFIG_BONDING 
    2727   say M here and read <file:Documentation/modules.txt>.  The module 
    2828   will be called bonding.o. 
     
    506506--- a/net/ipv4/netfilter/Config.in 
    507507+++ b/net/ipv4/netfilter/Config.in 
    508 @@ -155,6 +155,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     508@@ -141,6 +141,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    509509     dep_tristate '    DSCP target support' CONFIG_IP_NF_TARGET_DSCP $CONFIG_IP_NF_MANGLE 
    510510   
     
    516516--- a/net/ipv4/netfilter/Makefile 
    517517+++ b/net/ipv4/netfilter/Makefile 
    518 @@ -130,6 +130,7 @@ obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TO 
     518@@ -118,6 +118,7 @@ obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TO 
    519519 obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o 
    520520 obj-$(CONFIG_IP_NF_TARGET_DSCP) += ipt_DSCP.o 
  • trunk/target/linux/generic-2.4/patches/620-netfilter_iprange.patch

    r17553 r17844  
    5050+  dep_tristate '  IP range match support' CONFIG_IP_NF_MATCH_IPRANGE $CONFIG_IP_NF_IPTABLES 
    5151   dep_tristate '  quota match support' CONFIG_IP_NF_MATCH_QUOTA $CONFIG_IP_NF_IPTABLES 
    52   
    53    dep_tristate '  IP set support' CONFIG_IP_NF_SET $CONFIG_IP_NF_IPTABLES 
     52   dep_tristate '  MAC address match support' CONFIG_IP_NF_MATCH_MAC $CONFIG_IP_NF_IPTABLES 
     53   dep_tristate '  Packet type match support' CONFIG_IP_NF_MATCH_PKTTYPE $CONFIG_IP_NF_IPTABLES 
    5454--- /dev/null 
    5555+++ b/net/ipv4/netfilter/ipt_iprange.c 
     
    165165 obj-$(CONFIG_IP_NF_MATCH_QUOTA) += ipt_quota.o 
    166166 obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o 
    167  obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o 
     167 obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o 
  • trunk/target/linux/generic-2.4/patches/621-netfilter_random.patch

    r17553 r17844  
    2525 CONFIG_IP_NF_MATCH_TCPMSS 
    2626   This option adds a `tcpmss' match, which allows you to examine the 
    27 @@ -3387,6 +3397,14 @@ CONFIG_IP6_NF_MATCH_MAC 
     27@@ -3318,6 +3328,14 @@ CONFIG_IP6_NF_MATCH_MAC 
    2828   If you want to compile it as a module, say M here and read 
    2929   <file:Documentation/modules.txt>.  If unsure, say `N'. 
     
    7070--- a/net/ipv4/netfilter/Config.in 
    7171+++ b/net/ipv4/netfilter/Config.in 
    72 @@ -46,6 +46,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
     72@@ -32,6 +32,7 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ];  
    7373   dep_tristate '  netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES 
    7474   dep_tristate '  Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES 
     
    179179--- a/net/ipv4/netfilter/Makefile 
    180180+++ b/net/ipv4/netfilter/Makefile 
    181 @@ -105,6 +105,8 @@ obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_o 
     181@@ -93,6 +93,8 @@ obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_o 
    182182 obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o 
    183183 obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o 
  • trunk/target/linux/generic-2.4/patches/622-tc_esfq.patch

    r16144 r17844  
    11--- a/Documentation/Configure.help 
    22+++ b/Documentation/Configure.help 
    3 @@ -11165,6 +11165,24 @@ CONFIG_NET_SCH_HFSC 
     3@@ -11096,6 +11096,24 @@ CONFIG_NET_SCH_HFSC 
    44   whenever you want).  If you want to compile it as a module, say M 
    55   here and read <file:Documentation/modules.txt>. 
Note: See TracChangeset for help on using the changeset viewer.