Changeset 2435


Ignore:
Timestamp:
2005-11-11T22:15:16+01:00 (11 years ago)
Author:
nico
Message:

backport iptables extension split introduced by changeset:2412 (fix ticket:40),
bump trunk release number

Location:
trunk/openwrt/package/iptables
Files:
7 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/iptables/Config.in

    r2333 r2435  
    1616          http://www.iptables.org/ 
    1717 
     18config BR2_PACKAGE_IPTABLES_EXTRA 
     19        prompt   "iptables-extra.................. Extra Iptables extensions for IPv4 firewalling (meta-package)" 
     20        tristate 
     21        default m if CONFIG_DEVEL 
     22        depends BR2_PACKAGE_IPTABLES 
     23        select BR2_PACKAGE_KMOD_IPTABLES_EXTRA 
     24        select BR2_PACKAGE_IPTABLES_MOD_CONNTRACK 
     25        select BR2_PACKAGE_IPTABLES_MOD_EXTRA 
     26        select BR2_PACKAGE_IPTABLES_MOD_FILTER 
     27        select BR2_PACKAGE_IPTABLES_MOD_IPOPT 
     28        select BR2_PACKAGE_IPTABLES_MOD_IPSEC 
     29        select BR2_PACKAGE_IPTABLES_MOD_NAT 
     30        select BR2_PACKAGE_IPTABLES_MOD_ULOG 
     31        help 
     32          Extra Iptables extensions for IPv4 firewalling (meta-package) 
     33 
     34config BR2_PACKAGE_IPTABLES_MOD_CONNTRACK 
     35        prompt   "iptables-mod-conntrack.......... Iptables extensions for connection tracking" 
     36        tristate 
     37        default m if CONFIG_DEVEL 
     38        depends BR2_PACKAGE_IPTABLES 
     39        select BR2_PACKAGE_KMOD_IPT_CONNTRACK 
     40        help 
     41          Iptables (IPv4) extensions for connection tracking 
     42 
     43config BR2_PACKAGE_IPTABLES_MOD_FILTER 
     44        prompt   "iptables-mod-filter............. Iptables extension for packet content inspection" 
     45        tristate 
     46        default m if CONFIG_DEVEL 
     47        depends BR2_PACKAGE_IPTABLES 
     48        select BR2_PACKAGE_KMOD_IPT_FILTER 
     49        help 
     50          Iptables (IPv4) extension for packet content inspection 
     51 
     52config BR2_PACKAGE_IPTABLES_MOD_IPOPT 
     53        prompt   "iptables-mod-ipopt.............. Iptables extensions for matching/changing IP packet options" 
     54        tristate 
     55        default m if CONFIG_DEVEL 
     56        depends BR2_PACKAGE_IPTABLES 
     57        select BR2_PACKAGE_KMOD_IPT_IPOPT 
     58        help 
     59          Extra Iptables (IPv4) extensions for matching/changing IP packet options 
     60 
     61config BR2_PACKAGE_IPTABLES_MOD_IPSEC 
     62        prompt   "iptables-mod-ipsec.............. Iptables extensions for matching special IPsec packets" 
     63        tristate 
     64        default m if CONFIG_DEVEL 
     65        depends BR2_PACKAGE_IPTABLES 
     66        select BR2_PACKAGE_KMOD_IPT_IPSEC 
     67        help 
     68          Iptables (IPv4) extensions for matching special IPsec packets 
     69 
     70config BR2_PACKAGE_IPTABLES_MOD_NAT 
     71        prompt   "iptables-mod-nat................ Iptables extensions for different NAT targets" 
     72        tristate 
     73        default m if CONFIG_DEVEL 
     74        depends BR2_PACKAGE_IPTABLES 
     75        select BR2_PACKAGE_KMOD_IPT_NAT 
     76        help 
     77          Iptables (IPv4) extensions for different NAT targets 
     78 
     79config BR2_PACKAGE_IPTABLES_MOD_ULOG 
     80        prompt   "iptables-mod-ulog............... Iptables extensions for user-space packet logging" 
     81        tristate 
     82        default m if CONFIG_DEVEL 
     83        depends BR2_PACKAGE_IPTABLES 
     84        select BR2_PACKAGE_KMOD_IPT_ULOG 
     85        help 
     86          Iptables (IPv4) extensions for user-space packet logging 
     87 
     88config BR2_PACKAGE_IPTABLES_MOD_EXTRA 
     89        prompt   "iptables-mod-extra.............. Other extra Iptables extensions" 
     90        tristate 
     91        default m if CONFIG_DEVEL 
     92        depends BR2_PACKAGE_IPTABLES 
     93        select BR2_PACKAGE_KMOD_IPT_EXTRA 
     94        help 
     95          Other extra Iptables (IPv4) extensions 
     96 
    1897config BR2_PACKAGE_IPTABLES_UTILS 
    1998        prompt   "iptables-utils.................. Save and restore utilities" 
     
    22101        depends BR2_PACKAGE_IPTABLES 
    23102        help 
    24           iptables-save and iptables-restore 
    25            
    26           http://www.iptables.org/ 
    27  
    28 config BR2_PACKAGE_IPTABLES_EXTRA 
    29         prompt   "iptables-extra.................. Extra modules not found elsewhere" 
    30         tristate 
    31         default m if CONFIG_DEVEL 
    32         depends BR2_PACKAGE_IPTABLES 
    33         help 
    34           Extra modules for iptables (kernel and user space) 
     103          iptables-save and iptables-restore for Iptables (IPv4) 
    35104           
    36105          http://www.iptables.org/ 
  • trunk/openwrt/package/iptables/Makefile

    r2230 r2435  
    22 
    33include $(TOPDIR)/rules.mk 
    4 include kernelconfig.mk 
    54 
    65PKG_NAME:=iptables 
    76PKG_VERSION:=1.3.3 
    8 PKG_RELEASE:=1 
     7PKG_RELEASE:=2.1 
    98PKG_MD5SUM:=86d88455520cfdc56fd7ae27897a80a4 
    109 
     
    1918PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install 
    2019 
     20define IPKG_plugin_template 
     21 
     22$$(IPKG_$(1)): 
     23        install -m0755 -d $$(IDIR_$(1))/usr/lib/iptables 
     24        for m in $(2); do \ 
     25                cp -fpR $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \ 
     26        done 
     27        $(RSTRIP) $$(IDIR_$(1)) 
     28        $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) 
     29 
     30endef 
     31 
    2132include $(TOPDIR)/package/rules.mk 
     33include $(LINUX_DIR)/.config 
     34include $(TOPDIR)/target/linux/netfilter.mk 
    2235 
    2336$(eval $(call PKG_template,IPTABLES,iptables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     
    2639$(eval $(call PKG_template,IP6TABLES,ip6tables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    2740 
     41$(eval $(call PKG_template,IPTABLES_MOD_CONNTRACK,iptables-mod-conntrack,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     42$(eval $(call PKG_template,IPTABLES_MOD_EXTRA,iptables-mod-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     43$(eval $(call PKG_template,IPTABLES_MOD_FILTER,iptables-mod-filter,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     44$(eval $(call PKG_template,IPTABLES_MOD_IMQ,iptables-mod-img,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     45$(eval $(call PKG_template,IPTABLES_MOD_IPOPT,iptables-mod-ipopt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     46$(eval $(call PKG_template,IPTABLES_MOD_IPSEC,iptables-mod-ipsec,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     47$(eval $(call PKG_template,IPTABLES_MOD_NAT,iptables-mod-nat,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     48$(eval $(call PKG_template,IPTABLES_MOD_ULOG,iptables-mod-ulog,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     49 
     50$(eval $(call IPKG_plugin_template,IPTABLES_MOD_CONNTRACK,$(IPKG_IPTABLES_MOD_CONNTRACK-m))) 
     51$(eval $(call IPKG_plugin_template,IPTABLES_MOD_EXTRA,$(IPKG_IPTABLES_MOD_EXTRA-m))) 
     52$(eval $(call IPKG_plugin_template,IPTABLES_MOD_FILTER,$(IPKG_IPTABLES_MOD_FILTER-m))) 
     53$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IMQ,$(IPKG_IPTABLES_MOD_IMQ-m))) 
     54$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPOPT,$(IPKG_IPTABLES_MOD_IPOPT-m))) 
     55$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPSEC,$(IPKG_IPTABLES_MOD_IPSEC-m))) 
     56$(eval $(call IPKG_plugin_template,IPTABLES_MOD_NAT,$(IPKG_IPTABLES_MOD_NAT-m))) 
     57$(eval $(call IPKG_plugin_template,IPTABLES_MOD_ULOG,$(IPKG_IPTABLES_MOD_ULOG-m))) 
     58 
    2859$(PKG_BUILD_DIR)/.configured: 
    2960        touch $@ 
    3061 
    3162$(PKG_BUILD_DIR)/.built: 
    32         chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test 
     63        chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test* 
    3364        mkdir -p $(PKG_INSTALL_DIR) 
    3465        $(MAKE) -C $(PKG_BUILD_DIR) \ 
     
    4576        install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables 
    4677        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ 
    47          cp -fpR $(patsubst %,libipt_%.so,$(ext-y)) $(IDIR_IPTABLES)/usr/lib/iptables \ 
     78                cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ 
    4879        ) 
    4980        $(RSTRIP) $(IDIR_IPTABLES) 
    5081        $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) 
    5182 
    52 $(IPKG_IPTABLES_EXTRA): 
    53         install -d -m0755 $(IDIR_IPTABLES_EXTRA)/usr/lib/iptables 
    54         (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ 
    55          cp -fpR $(patsubst %,libipt_%.so,$(ext-m)) $(IDIR_IPTABLES_EXTRA)/usr/lib/iptables \ 
    56         ) 
    57         $(RSTRIP) $(IDIR_IPTABLES_EXTRA) 
    58         $(IPKG_BUILD) $(IDIR_IPTABLES_EXTRA) $(PACKAGE_DIR) 
    59  
    6083$(IPKG_IPTABLES_UTILS): 
    6184        install -d -m0755 $(IDIR_IPTABLES_UTILS)/usr/sbin 
    62         cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin 
     85        cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin/ 
    6386        $(RSTRIP) $(IDIR_IPTABLES_UTILS) 
    6487        $(IPKG_BUILD) $(IDIR_IPTABLES_UTILS) $(PACKAGE_DIR) 
     
    6992        install -d -m0755 $(IDIR_IP6TABLES)/usr/lib/iptables 
    7093        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ 
    71          cp -fpR libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables \ 
     94                cp -fpR libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \ 
    7295        ) 
    7396        $(RSTRIP) $(IDIR_IP6TABLES) 
     
    7598 
    7699$(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built 
    77         mkdir -p $(STAGING_DIR)/usr/include/ $(STAGING_DIR)/usr/lib/ 
     100        mkdir -p $(STAGING_DIR)/usr/include 
    78101        cp -fpR $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/ 
     102        mkdir -p $(STAGING_DIR)/usr/lib 
    79103        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ 
    80104 
  • trunk/openwrt/package/iptables/ipkg/iptables-extra.control

    r2210 r2435  
    22Priority: optional 
    33Section: net 
    4 Description: Extra plugins for iptables 
    5 Depends: kmod-iptables-extra 
     4Depends: kmod-iptables-extra, iptables-mod-conntrack, iptables-mod-extra, iptables-mod-filter, iptables-mod-ipopt, iptables-mod-ipsec, iptables-mod-nat, iptables-mod-ulog 
     5Description: Other extra Iptables extensions (meta-package) 
  • trunk/openwrt/package/iptables/ipkg/iptables-utils.control

    r2210 r2435  
    22Priority: optional 
    33Section: net 
    4 Description: iptables-save and iptables-restore 
     4Description: iptables-save and iptables-restore for Iptables (IPv4) 
Note: See TracChangeset for help on using the changeset viewer.