X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8e2cf077d0066a626bf3b90596acd941f430fe9e..ab16ee98add748ab65f784b5410f12cbc9b6b4da:/package/iptables/Makefile diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 5b43dfefb..b1ae19db1 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,49 +1,40 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables +PKG_VERSION:=1.4.10 +PKG_RELEASE:=3 -ifeq ($(CONFIG_LINUX_2_4),y) - PKG_VERSION:=1.3.8 - PKG_RELEASE:=3 - PKG_MD5SUM:=0a9209f928002e5eee9cdff8fef4d4b3 - MAKE_TARGETS:=experimental install-experimental -endif - -ifeq ($(CONFIG_LINUX_2_6),y) - PKG_VERSION:=1.4.0 - PKG_RELEASE:=1 - PKG_MD5SUM:=90cfa8a554a29b0b859a625e701af2a7 -endif - -PKG_VERSION?= - +PKG_MD5SUM:=f382fe693f0b59d87bd47bea65eca198 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ -PATCH_DIR:=./patches/$(PKG_VERSION) +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) -include $(LINUX_DIR)/.config include $(INCLUDE_DIR)/netfilter.mk - STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep 'NETFILTER' $(LINUX_DIR)/.config | md5s) + STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell $(SH_FUNC) grep 'NETFILTER' $(LINUX_DIR)/.config | md5s) endif + define Package/iptables/Default SECTION:=net - CATEGORY:=Base system + CATEGORY:=Network + SUBMENU:=Firewall URL:=http://netfilter.org/ endef @@ -56,87 +47,127 @@ define Package/iptables $(call Package/iptables/Default) TITLE:=IPv4 firewall administration tool MENU:=1 + DEPENDS+= +kmod-ipt-core +libip4tc +libxtables +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:=connection tracking modules + TITLE:=Basic connection tracking extensions endef define Package/iptables-mod-conntrack/description - iptables extensions for connection tracking. - Includes: - - libipt_conntrack - - libipt_helper - - libipt_connmark/CONNMARK +Basic iptables extensions for connection tracking. +Includes: +- state +- raw +- NOTRACK endef -define Package/iptables-mod-filter -$(call Package/iptables/Module, +kmod-ipt-filter) - TITLE:=filter modules +define Package/iptables-mod-conntrack-extra +$(call Package/iptables/Module, +kmod-ipt-conntrack-extra) + TITLE:=Extra connection tracking extensions endef -define Package/iptables-mod-filter/description - iptables extensions for packet content inspection. - Includes: - - libipt_ipp2p - - libipt_layer7 +define Package/iptables-mod-conntrack-extra/description +Extra iptables extensions for connection tracking. +Includes: +- libipt_conntrack +- libipt_helper +- libipt_connmark/CONNMARK endef -define Package/iptables-mod-imq -$(call Package/iptables/Module, +kmod-ipt-imq) - TITLE:=IMQ support +define Package/iptables-mod-filter +$(call Package/iptables/Module, +kmod-ipt-filter) + TITLE:=Content inspection extensions endef -define Package/iptables-mod-imq/description - iptables extension for IMQ support. - Includes: - - libipt_IMQ +define Package/iptables-mod-filter/description +iptables extensions for packet content inspection. +Includes: +- libipt_string +- libipt_layer7 endef define Package/iptables-mod-ipopt $(call Package/iptables/Module, +kmod-ipt-ipopt) - TITLE:=IP/Packet option modules + TITLE:=IP/Packet option extensions 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 +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 endef define Package/iptables-mod-ipsec $(call Package/iptables/Module, +kmod-ipt-ipsec) - TITLE:=IPSec extensions + TITLE:=IPsec extensions endef define Package/iptables-mod-ipsec/description - iptables extensions for matching ipsec traffic. - Includes: - - libipt_ah - - libipt_esp - - libipt_policy +iptables extensions for matching ipsec traffic. +Includes: +- libipt_ah +- libipt_esp +- libipt_policy +endef + +define Package/iptables-mod-ipset +$(call Package/iptables/Module,) + TITLE:=IPset iptables extensions +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:=extra NAT targets + TITLE:=Basic NAT extensions endef define Package/iptables-mod-nat/description - iptables extensions for different NAT targets. - Includes: - - libipt_REDIRECT +iptables extensions for basic NAT targets. +Includes: +- MASQUERADE +- SNAT +- DNAT +endef + +define Package/iptables-mod-nat-extra +$(call Package/iptables/Module, +kmod-ipt-nat-extra) + TITLE:=Extra NAT extensions +endef + +define Package/iptables-mod-nat-extra/description +iptables extensions for extra NAT targets. +Includes: +- REDIRECT endef define Package/iptables-mod-ulog @@ -145,45 +176,90 @@ $(call Package/iptables/Module, +kmod-ipt-ulog) endef define Package/iptables-mod-ulog/description - iptables extensions for user-space packet logging. - Includes: - - libipt_ULOG +iptables extensions for user-space packet logging. +Includes: +- libipt_ULOG +endef + +define Package/iptables-mod-hashlimit +$(call Package/iptables/Module, +kmod-ipt-hashlimit) + TITLE:=hashlimit matching +endef + +define Package/iptables-mod-hashlimit/description +iptables extensions for hashlimit matching +Includes: +- libipt_hashlimit endef define Package/iptables-mod-iprange $(call Package/iptables/Module, +kmod-ipt-iprange) - TITLE:=ip range module + TITLE:=IP range extension endef define Package/iptables-mod-iprange/description - iptables extensions for matching ip ranges. - Includes: - - libipt_iprange +iptables extensions for matching ip ranges. +Includes: +- libipt_iprange endef define Package/iptables-mod-extra $(call Package/iptables/Module, +kmod-ipt-extra) - TITLE:=other extra iptables extensions + TITLE:=Other extra iptables extensions endef define Package/iptables-mod-extra/description - other extra iptables extensions. - Includes: - - libipt_limit - - libipt_owner - - libipt_physdev - - libipt_pkttype - - libipt_recent - - iptable_raw - - libipt_NOTRACK - - libipt_TARPIT - - libipt_DELUDE - - libipt_CHAOS +Other extra iptables extensions. +Includes: +- libipt_owner +- libipt_physdev +- libipt_pkttype +- libipt_recent endef -define Package/iptables-mod-ipset -$(call Package/iptables/Module, +kmod-ipt-ipset) - TITLE:=ipset iptables extension +define Package/iptables-mod-led +$(call Package/iptables/Module, +kmod-ipt-led) + TITLE:=LED trigger iptables extension +endef + +define Package/iptables-mod-led/description +iptables extension for triggering a LED. +Includes: +- libxt_LED +endef + +define Package/iptables-mod-tproxy +$(call Package/iptables/Module, +kmod-ipt-tproxy) + TITLE:=Transparent proxy iptables extensions +endef + +define Package/iptables-mod-tproxy/description +Transparent proxy iptables extensions. +Includes: +- libxt_socket +- libxt_TPROXY +endef + +define Package/iptables-mod-tee +$(call Package/iptables/Module, +kmod-ipt-tee) + TITLE:=TEE iptables extensions +endef + +define Package/iptables-mod-tee/description +TEE iptables extensions. +Includes: +- libxt_TEE +endef + +define Package/iptables-mod-u32 +$(call Package/iptables/Module, +kmod-ipt-u32) + TITLE:=U32 iptables extensions +endef + +define Package/iptables-mod-u32/description +U32 iptables extensions. +Includes: +- libxt_u32 endef define Package/iptables-utils @@ -193,52 +269,100 @@ endef define Package/ip6tables $(call Package/iptables/Default) - DEPENDS:=+kmod-ip6tables + DEPENDS:=+kmod-ip6tables +libip6tc +libxtables CATEGORY:=IPv6 TITLE:=IPv6 firewall administration tool MENU:=1 endef define Package/ip6tables-utils - $(call Package/iptables/Default) - DEPENDS:=ip6tables - CATEGORY:=IPv6 - TITLE:=ip6tables save and restore utilities +$(call Package/iptables/Default) + DEPENDS:=ip6tables + CATEGORY:=IPv6 + TITLE:=ip6tables save and restore utilities endef -define Build/Prepare - $(call Build/Prepare/Default) +define Package/libiptc +$(call Package/iptables/Default) + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+libip4tc +libip6tc + TITLE:=IPv4/IPv6 firewall - shared libiptc library (compatibility stub) endef -define Build/Configure - chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test* - rm -f $(PKG_BUILD_DIR)/.configured* - $(MAKE) -C $(PKG_BUILD_DIR) \ - clean +define Package/libip4tc +$(call Package/iptables/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=IPv4 firewall - shared libiptc library endef -define Build/Compile - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - COPT_FLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="-rdynamic -static-libgcc" \ - KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ - KBUILD_OUTPUT="$(LINUX_DIR)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install $(MAKE_TARGETS) +define Package/libip6tc +$(call Package/iptables/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=IPv6 firewall - shared libiptc library endef +define Package/libxtables + $(call Package/iptables/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=IPv4/IPv6 firewall - shared xtables library +endef + +define Package/libipq + $(call Package/iptables/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=IPv4/IPv6 firewall - shared libipq library +endef + +TARGET_CPPFLAGS := \ + -I$(PKG_BUILD_DIR)/include \ + -I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include \ + $(TARGET_CPPFLAGS) + +TARGET_CFLAGS += \ + -I$(PKG_BUILD_DIR)/include \ + -I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include + +CONFIGURE_ARGS += \ + --enable-shared \ + --enable-devel \ + --enable-ipv6 \ + --enable-libipq \ + --with-kernel="$(LINUX_DIR)" \ + --with-xtlibdir=/usr/lib/iptables + +MAKE_FLAGS := \ + $(TARGET_CONFIGURE_OPTS) \ + COPT_FLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="-rdynamic" \ + KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ + KBUILD_OUTPUT="$(LINUX_DIR)" \ + define Build/InstallDev - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - COPT_FLAGS="$(TARGET_CFLAGS)" \ - KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ - KBUILD_OUTPUT="$(LINUX_DIR)" \ - DESTDIR="$(1)" \ - install-devel - $(CP) $(PKG_BUILD_DIR)/include $(1)/usr - $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/include + $(INSTALL_DIR) $(1)/usr/include/iptables + $(INSTALL_DIR) $(1)/usr/include/net/netfilter + + # XXX: iptables header fixup, some headers are not installed by iptables anymore + $(CP) $(PKG_BUILD_DIR)/include/net/netfilter/*.h $(1)/usr/include/net/netfilter/ + $(CP) $(PKG_BUILD_DIR)/include/iptables/*.h $(1)/usr/include/iptables/ + $(CP) $(PKG_BUILD_DIR)/include/iptables.h $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/include/libipq/libipq.h $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/include/libipulog $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/include/libiptc $(1)/usr/include/ + + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.so* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xtables.pc $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libiptc.pc $(1)/usr/lib/pkgconfig/ endef define Package/iptables/install @@ -256,7 +380,9 @@ endef define Package/iptables-utils/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-multi $(1)/usr/sbin/ + $(LN) iptables-multi $(1)/usr/sbin/iptables-save + $(LN) iptables-multi $(1)/usr/sbin/iptables-restore endef define Package/ip6tables/install @@ -270,7 +396,34 @@ endef define Package/ip6tables-utils/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-multi $(1)/usr/sbin/ + $(LN) ip6tables-multi $(1)/usr/sbin/ip6tables-save + $(LN) ip6tables-multi $(1)/usr/sbin/ip6tables-restore +endef + +define Package/libiptc/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so* $(1)/usr/lib/ +endef + +define Package/libip4tc/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip4tc.so* $(1)/usr/lib/ +endef + +define Package/libip6tc/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip6tc.so* $(1)/usr/lib/ +endef + +define Package/libxtables/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so* $(1)/usr/lib/ +endef + +define Package/libipq/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.so* $(1)/usr/lib/ endef define BuildPlugin @@ -291,17 +444,29 @@ L7_INSTALL:=\ $(INSTALL_DIR) $$(1)/etc/l7-protocols; \ $(CP) files/l7/*.pat $$(1)/etc/l7-protocols/ + $(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-ipset,$(IPT_IPSET-m))) $(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m),$(L7_INSTALL))) -$(eval $(call BuildPlugin,iptables-mod-imq,$(IPT_IMQ-m))) $(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))) +$(eval $(call BuildPlugin,iptables-mod-hashlimit,$(IPT_HASHLIMIT-m))) +$(eval $(call BuildPlugin,iptables-mod-led,$(IPT_LED-m))) +$(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)) +$(eval $(call BuildPackage,libxtables)) +$(eval $(call BuildPackage,libipq))