X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e148281b008b6e71f06e26e603e3d3c50377b28a..51c76d8aa5224233370fa5de9cc1277f5a797a66:/package/iptables/Makefile diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 7d34cc68e..87d898bea 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,24 +1,25 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2010 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.3.7 +PKG_VERSION:=1.4.8 PKG_RELEASE:=1 +PKG_MD5SUM:=697ed89f37af4473a5f6349ba2700f2d 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/ -PKG_MD5SUM:=dd965bdacbb86ce2a6498829fddda6b7 + +PKG_FIXUP:=libtool include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) @@ -27,216 +28,346 @@ ifeq ($(DUMP),) STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep 'NETFILTER' $(LINUX_DIR)/.config | md5s) endif + define Package/iptables/Default SECTION:=net - CATEGORY:=Base system + CATEGORY:=Network URL:=http://netfilter.org/ endef +define Package/iptables/Module +$(call Package/iptables/Default) + DEPENDS:=iptables $(1) +endef + define Package/iptables - $(call Package/iptables/Default) +$(call Package/iptables/Default) TITLE:=IPv4 firewall administration tool MENU:=1 + DEPENDS+= +kmod-ipt-core +libiptc +libxtables endef -define Package/iptables/conffiles -/etc/config/firewall -/etc/firewall.user +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/Default) - DEPENDS:=iptables +kmod-ipt-conntrack - TITLE:=connection tracking modules - DESCRIPTION:=\ - iptables extensions for connection tracking.\\\ - \\\ - Includes: \\\ - - libipt_conntrack \\\ - - libipt_helper \\\ - - libipt_connmark/CONNMARK +$(call Package/iptables/Module, +kmod-ipt-conntrack) + TITLE:=Basic connection tracking extensions +endef + +define Package/iptables-mod-conntrack/description +Basic iptables extensions for connection tracking. +Includes: +- state +- raw +- NOTRACK +endef + +define Package/iptables-mod-conntrack-extra +$(call Package/iptables/Module, +kmod-ipt-conntrack-extra) + TITLE:=Extra connection tracking extensions +endef + +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-filter - $(call Package/iptables/Default) - DEPENDS:=iptables +kmod-ipt-filter - TITLE:=filter modules - DESCRIPTION:=\ - iptables extensions for packet content inspection.\\\ - \\\ - Includes: \\\ - - libipt_ipp2p \\\ - - libipt_layer7 +$(call Package/iptables/Module, +kmod-ipt-filter) + TITLE:=Content inspection extensions +endef + +define Package/iptables-mod-filter/description +iptables extensions for packet content inspection. +Includes: +- libipt_string +- libipt_layer7 endef define Package/iptables-mod-imq - $(call Package/iptables/Default) - DEPENDS:=iptables +kmod-ipt-imq +$(call Package/iptables/Module, +kmod-ipt-imq) TITLE:=IMQ support - DESCRIPTION:=\ - iptables extension for IMQ support.\\\ - \\\ - Includes: \\\ - - libipt_IMQ +endef + +define Package/iptables-mod-imq/description +iptables extension for IMQ support. +Includes: +- libipt_IMQ endef define Package/iptables-mod-ipopt - $(call Package/iptables/Default) - DEPENDS:=iptables +kmod-ipt-ipopt - TITLE:=IP/Packet option modules - DESCRIPTION:=\ - iptables extensions for matching/changing IP packet options.\\\ - \\\ - Includes: \\\ - - libipt_CLASSIFY \\\ - - libipt_dscp/DSCP \\\ - - libipt_ecn/ECN \\\ - - libipt_length \\\ - - libipt_mac \\\ - - libipt_tos/TOS \\\ - - libipt_tcpmms \\\ - - libipt_ttl/TTL \\\ - - libipt_unclean +$(call Package/iptables/Module, +kmod-ipt-ipopt) + 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 endef define Package/iptables-mod-ipsec - $(call Package/iptables/Default) - DEPENDS:=iptables +kmod-ipt-ipsec - TITLE:=IPSec extensions - DESCRIPTION:=\ - iptables extensions for matching ipsec traffic.\\\ - \\\ - Includes: \\\ - - libipt_ah \\\ - - libipt_esp +$(call Package/iptables/Module, +kmod-ipt-ipsec) + TITLE:=IPsec extensions +endef + +define Package/iptables-mod-ipsec/description +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/Default) - DEPENDS:=iptables +kmod-ipt-nat - TITLE:=extra NAT targets - DESCRIPTION:=\ - iptables extensions for different NAT targets.\\\ - \\\ - Includes: \\\ - - libipt_REDIRECT +$(call Package/iptables/Module, +kmod-ipt-nat) + TITLE:=Basic NAT extensions +endef + +define Package/iptables-mod-nat/description +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 - $(call Package/iptables/Default) - DEPENDS:=iptables +kmod-ipt-ulog +$(call Package/iptables/Module, +kmod-ipt-ulog) TITLE:=user-space packet logging - DESCRIPTION:=\ - iptables extensions for user-space packet logging.\\\ - \\\ - Includes: \\\ - - libipt_ULOG +endef + +define Package/iptables-mod-ulog/description +iptables extensions for user-space packet logging. +Includes: +- libipt_ULOG +endef + +define Package/iptables-mod-iprange +$(call Package/iptables/Module, +kmod-ipt-iprange) + TITLE:=IP range extension +endef + +define Package/iptables-mod-iprange/description +iptables extensions for matching ip ranges. +Includes: +- libipt_iprange endef define Package/iptables-mod-extra - $(call Package/iptables/Default) - DEPENDS:=iptables +kmod-ipt-extra - TITLE:=other extra iptables extensions - DESCRIPTION:=\ - other extra iptables extensions.\\\ - \\\ - Includes: \\\ - - libipt_limit \\\ - - libipt_owner \\\ - - libipt_physdev \\\ - - libipt_pkttype \\\ - - libipt_recent \\\ - - libipt_NOTRACK +$(call Package/iptables/Module, +kmod-ipt-extra) + TITLE:=Other extra iptables extensions endef +define Package/iptables-mod-extra/description +Other extra iptables extensions. +Includes: +- libipt_owner +- libipt_physdev +- libipt_pkttype +- libipt_recent +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-utils - $(call Package/iptables/Default) - DEPENDS:=iptables +$(call Package/iptables/Module, ) TITLE:=iptables save and restore utilities endef define Package/ip6tables - $(call Package/iptables/Default) - CATEGORY:=Network +$(call Package/iptables/Default) + DEPENDS:=+kmod-ip6tables + CATEGORY:=IPv6 TITLE:=IPv6 firewall administration tool + MENU:=1 endef -define Build/Configure - rm -f $(PKG_BUILD_DIR)/.configured* - $(MAKE) -C $(PKG_BUILD_DIR) \ - clean +define Package/ip6tables-utils +$(call Package/iptables/Default) + DEPENDS:=ip6tables + CATEGORY:=IPv6 + TITLE:=ip6tables save and restore utilities endef -define Build/Compile - chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test* - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ +define Package/libiptc +$(call Package/iptables/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=IPv4/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 + + +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 \ + --with-kernel="$(LINUX_DIR)" \ + --with-xtlibdir=/usr/lib/iptables + +IPTABLES_MAKEOPTS = \ $(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 Build/Compile + $(INSTALL_DIR) $(PKG_INSTALL_DIR) + (cd $(PKG_BUILD_DIR); ./autogen.sh) + $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS) + $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS) install + $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS) + $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS) install endef define Build/InstallDev - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - COPT_FLAGS="$(TARGET_CFLAGS)" \ - KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ - DESTDIR="$(STAGING_DIR)" \ - install-devel - $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr - $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(STAGING_DIR)/usr/lib -endef + $(INSTALL_DIR) $(1)/usr/include + $(INSTALL_DIR) $(1)/usr/include/iptables + $(INSTALL_DIR) $(1)/usr/include/net/netfilter -define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/libipq.h - rm -rf $(STAGING_DIR)/usr/include/libipulog - rm -rf $(STAGING_DIR)/usr/include/libipq - rm -rf $(STAGING_DIR)/usr/include/libiptc - rm -rf $(STAGING_DIR)/usr/include/linux/netfilter* - rm -rf $(STAGING_DIR)/usr/include/iptables* - rm -rf $(STAGING_DIR)/usr/include/ip6tables* - rm -rf $(STAGING_DIR)/usr/lib/libipq.a - rm -rf $(STAGING_DIR)/usr/lib/libiptc.a + # 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 - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall - $(INSTALL_BIN) ./files/firewall.user $(1)/etc/ - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) ./files/firewall.awk $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/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 - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(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 - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/ $(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/libip*tc.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 BuildPlugin define Package/$(1)/install $(INSTALL_DIR) $$(1)/usr/lib/iptables - for m in $$(patsubst xt_%,ipt_%,$(2)); do \ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so $$(1)/usr/lib/iptables/ ; \ + for m in $(patsubst xt_%,ipt_%,$(2)) $(patsubst ipt_%,xt_%,$(2)); 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 $(3) endef @@ -248,14 +379,23 @@ 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-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-tproxy,$(IPT_TPROXY-m))) $(eval $(call BuildPackage,ip6tables)) +$(eval $(call BuildPackage,ip6tables-utils)) +$(eval $(call BuildPackage,libiptc)) +$(eval $(call BuildPackage,libxtables))