X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/796516e7b0dc4d1ad0070a5669d40b34299faf0e..580a413385ed8640fb90d5b7dcdf6443df2502da:/package/iptables/Makefile?ds=sidebyside diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 581c0fcdc..026df266b 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables PKG_VERSION:=1.4.10 -PKG_RELEASE:=2 +PKG_RELEASE:=4 PKG_MD5SUM:=f382fe693f0b59d87bd47bea65eca198 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -23,6 +23,10 @@ PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +ifneq ($(CONFIG_EXTERNAL_KERNEL_TREE),"") +PATCH_DIR:= +endif + include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) -include $(LINUX_DIR)/.config @@ -52,27 +56,27 @@ endef define Package/iptables/description IPv4 firewall administration tool. -Includes support for: -- comment -- limit -- LOG -- mac -- multiport -- REJECT -- TCPMSS -endef -define Package/iptables-mod-conntrack -$(call Package/iptables/Module, +kmod-ipt-conntrack) - TITLE:=Basic connection tracking extensions -endef + Matches: + - icmp + - tcp + - udp + - comment + - limit + - mac + - multiport + + Targets: + - ACCEPT + - DROP + - REJECT + - LOG + - TCPMSS + + Tables: + - filter + - mangle -define Package/iptables-mod-conntrack/description -Basic iptables extensions for connection tracking. -Includes: -- state -- raw -- NOTRACK endef define Package/iptables-mod-conntrack-extra @@ -82,10 +86,16 @@ endef define Package/iptables-mod-conntrack-extra/description Extra iptables extensions for connection tracking. -Includes: -- libipt_conntrack -- libipt_helper -- libipt_connmark/CONNMARK + + Matches: + - connbytes + - connmark + - recent + - helper + + Targets: + - CONNMARK + endef define Package/iptables-mod-filter @@ -95,9 +105,12 @@ endef define Package/iptables-mod-filter/description iptables extensions for packet content inspection. -Includes: -- libipt_string -- libipt_layer7 +Includes support for: + + Matches: + - layer7 + - string + endef define Package/iptables-mod-ipopt @@ -107,18 +120,25 @@ endef define Package/iptables-mod-ipopt/description iptables extensions for matching/changing IP packet options. -Includes: -- libipt_CLASSIFY -- libipt_dscp/DSCP -- libipt_ecn/ECN -- libipt_length -- libipt_mac -- libipt_mark/MARK -- libipt_statistic -- libipt_tcpmms -- libipt_tos/TOS -- libipt_ttl/TTL -- libipt_unclean + + Matches: + - dscp + - ecn + - length + - mark + - statistic + - tcpmss + - time + - unclean + - hl + + Targets: + - DSCP + - CLASSIFY + - ECN + - MARK + - HL + endef define Package/iptables-mod-ipsec @@ -128,10 +148,12 @@ endef define Package/iptables-mod-ipsec/description iptables extensions for matching ipsec traffic. -Includes: -- libipt_ah -- libipt_esp -- libipt_policy + + Matches: + - ah + - esp + - policy + endef define Package/iptables-mod-ipset @@ -141,22 +163,13 @@ endef define Package/iptables-mod-ipset/description IPset iptables extensions. -Includes: -- libipt_set -- libipt_SET -endef -define Package/iptables-mod-nat -$(call Package/iptables/Module, +kmod-ipt-nat) - TITLE:=Basic NAT extensions -endef + Matches: + - set + + Targets: + - SET -define Package/iptables-mod-nat/description -iptables extensions for basic NAT targets. -Includes: -- MASQUERADE -- SNAT -- DNAT endef define Package/iptables-mod-nat-extra @@ -166,8 +179,11 @@ endef define Package/iptables-mod-nat-extra/description iptables extensions for extra NAT targets. -Includes: -- REDIRECT + + Targets: + - MIRROR + - NETMAP + - REDIRECT endef define Package/iptables-mod-ulog @@ -177,8 +193,10 @@ endef define Package/iptables-mod-ulog/description iptables extensions for user-space packet logging. -Includes: -- libipt_ULOG + + Targets: + - ULOG + endef define Package/iptables-mod-hashlimit @@ -188,8 +206,10 @@ endef define Package/iptables-mod-hashlimit/description iptables extensions for hashlimit matching -Includes: -- libipt_hashlimit + + Matches: + - hashlimit + endef define Package/iptables-mod-iprange @@ -199,8 +219,10 @@ endef define Package/iptables-mod-iprange/description iptables extensions for matching ip ranges. -Includes: -- libipt_iprange + + Matches: + - iprange + endef define Package/iptables-mod-extra @@ -210,11 +232,14 @@ endef define Package/iptables-mod-extra/description Other extra iptables extensions. -Includes: -- libipt_owner -- libipt_physdev -- libipt_pkttype -- libipt_recent + + Matches: + - condition + - owner + - physdev (if ebtables is enabled) + - pkttype + - quota + endef define Package/iptables-mod-led @@ -224,8 +249,10 @@ endef define Package/iptables-mod-led/description iptables extension for triggering a LED. -Includes: -- libxt_LED + + Targets: + - LED + endef define Package/iptables-mod-tproxy @@ -235,9 +262,13 @@ endef define Package/iptables-mod-tproxy/description Transparent proxy iptables extensions. -Includes: -- libxt_socket -- libxt_TPROXY + + Matches: + - socket + + Targets: + - TPROXY + endef define Package/iptables-mod-tee @@ -247,8 +278,10 @@ endef define Package/iptables-mod-tee/description TEE iptables extensions. -Includes: -- libxt_TEE + + Targets: + - TEE + endef define Package/iptables-mod-u32 @@ -258,13 +291,10 @@ endef define Package/iptables-mod-u32/description U32 iptables extensions. -Includes: -- libxt_u32 -endef -define Package/iptables-utils -$(call Package/iptables/Module, ) - TITLE:=iptables save and restore utilities + Matches: + - u32 + endef define Package/ip6tables @@ -275,13 +305,6 @@ $(call Package/iptables/Default) MENU:=1 endef -define Package/ip6tables-utils -$(call Package/iptables/Default) - DEPENDS:=ip6tables - CATEGORY:=IPv6 - TITLE:=ip6tables save and restore utilities -endef - define Package/libiptc $(call Package/iptables/Default) SECTION:=libs @@ -330,17 +353,18 @@ TARGET_CFLAGS += \ CONFIGURE_ARGS += \ --enable-shared \ --enable-devel \ - --enable-ipv6 \ + $(if $(CONFIG_IPV6),--enable-ipv6,--disable-ipv6) \ --enable-libipq \ --with-kernel="$(LINUX_DIR)" \ - --with-xtlibdir=/usr/lib/iptables + --with-xtlibdir=/usr/lib/iptables \ + --enable-static MAKE_FLAGS := \ $(TARGET_CONFIGURE_OPTS) \ COPT_FLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="-rdynamic" \ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ KBUILD_OUTPUT="$(LINUX_DIR)" \ + BUILTIN_MODULES="$(patsubst ipt_%,%,$(patsubst xt_%,%,$(IPT_BUILTIN) $(IPT_CONNTRACK-m) $(IPT_NAT-m)))" define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include @@ -368,35 +392,22 @@ endef define Package/iptables/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/ + $(LN) iptables $(1)/usr/sbin/iptables-save + $(LN) iptables $(1)/usr/sbin/iptables-restore $(INSTALL_DIR) $(1)/usr/lib/iptables - (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - for m in $(patsubst xt_%,ipt_%,$(IPT_BUILTIN)) $(patsubst ipt_%,xt_%,$(IPT_BUILTIN)); do \ - if [ -f $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so ]; then \ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $(1)/usr/lib/iptables/ ;\ - fi; \ - done \ - ) -endef - -define Package/iptables-utils/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/ endef define Package/ip6tables/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/ + $(LN) ip6tables $(1)/usr/sbin/ip6tables-save + $(LN) ip6tables $(1)/usr/sbin/ip6tables-restore $(INSTALL_DIR) $(1)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \ ) endef -define Package/ip6tables-utils/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/ -endef - define Package/libiptc/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so* $(1)/usr/lib/ @@ -442,15 +453,12 @@ L7_INSTALL:=\ $(eval $(call BuildPackage,iptables)) -$(eval $(call BuildPackage,iptables-utils)) -$(eval $(call BuildPlugin,iptables-mod-conntrack,$(IPT_CONNTRACK-m))) $(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m))) $(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m))) $(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m),$(L7_INSTALL))) $(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m))) $(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m))) $(eval $(call BuildPlugin,iptables-mod-ipset,ipt_set ipt_SET)) -$(eval $(call BuildPlugin,iptables-mod-nat,$(IPT_NAT-m))) $(eval $(call BuildPlugin,iptables-mod-nat-extra,$(IPT_NAT_EXTRA-m))) $(eval $(call BuildPlugin,iptables-mod-iprange,$(IPT_IPRANGE-m))) $(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m))) @@ -460,7 +468,6 @@ $(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m))) $(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m))) $(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m))) $(eval $(call BuildPackage,ip6tables)) -$(eval $(call BuildPackage,ip6tables-utils)) $(eval $(call BuildPackage,libiptc)) $(eval $(call BuildPackage,libip4tc)) $(eval $(call BuildPackage,libip6tc))