X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3a25b868c7ec5a22f6af9e433a1f8f2d09718761..e72bb33ad8aa325a7f54289b8c063d6cc05a1255:/package/iptables/Makefile diff --git a/package/iptables/Makefile b/package/iptables/Makefile index ff2f314d1..94e3f58b0 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,38 +1,25 @@ # -# Copyright (C) 2006-2008 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.4.8 +PKG_RELEASE:=1 -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:=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/ -PATCH_DIR:=./patches/$(PKG_VERSION) +PKG_FIXUP:=libtool include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) @@ -41,9 +28,10 @@ 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 @@ -56,18 +44,19 @@ define Package/iptables $(call Package/iptables/Default) TITLE:=IPv4 firewall administration tool MENU:=1 - DEPENDS+= +kmod-ipt-core + DEPENDS+= +kmod-ipt-core +libiptc +libxtables endef define Package/iptables/description - IPv4 firewall administration tool. - Includes support for: - - limit - - LOG - - mac - - multiport - - REJECT - - TCPMSS +IPv4 firewall administration tool. +Includes support for: +- comment +- limit +- LOG +- mac +- multiport +- REJECT +- TCPMSS endef define Package/iptables-mod-conntrack @@ -76,9 +65,11 @@ $(call Package/iptables/Module, +kmod-ipt-conntrack) endef define Package/iptables-mod-conntrack/description - Basic iptables extensions for connection tracking. - Includes: - - state +Basic iptables extensions for connection tracking. +Includes: +- state +- raw +- NOTRACK endef define Package/iptables-mod-conntrack-extra @@ -87,11 +78,11 @@ $(call Package/iptables/Module, +kmod-ipt-conntrack-extra) endef define Package/iptables-mod-conntrack-extra/description - Extra iptables extensions for connection tracking. - Includes: - - libipt_conntrack - - libipt_helper - - libipt_connmark/CONNMARK +Extra iptables extensions for connection tracking. +Includes: +- libipt_conntrack +- libipt_helper +- libipt_connmark/CONNMARK endef define Package/iptables-mod-filter @@ -100,10 +91,10 @@ $(call Package/iptables/Module, +kmod-ipt-filter) endef define Package/iptables-mod-filter/description - iptables extensions for packet content inspection. - Includes: - - libipt_ipp2p - - libipt_layer7 +iptables extensions for packet content inspection. +Includes: +- libipt_string +- libipt_layer7 endef define Package/iptables-mod-imq @@ -112,9 +103,9 @@ $(call Package/iptables/Module, +kmod-ipt-imq) endef define Package/iptables-mod-imq/description - iptables extension for IMQ support. - Includes: - - libipt_IMQ +iptables extension for IMQ support. +Includes: +- libipt_IMQ endef define Package/iptables-mod-ipopt @@ -123,19 +114,19 @@ $(call Package/iptables/Module, +kmod-ipt-ipopt) 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 @@ -144,11 +135,23 @@ $(call Package/iptables/Module, +kmod-ipt-ipsec) 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, @LINUX_2_6) + 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 @@ -157,11 +160,11 @@ $(call Package/iptables/Module, +kmod-ipt-nat) endef define Package/iptables-mod-nat/description - iptables extensions for basic NAT targets. - Includes: - - MASQUERADE - - SNAT - - DNAT +iptables extensions for basic NAT targets. +Includes: +- MASQUERADE +- SNAT +- DNAT endef define Package/iptables-mod-nat-extra @@ -170,9 +173,9 @@ $(call Package/iptables/Module, +kmod-ipt-nat-extra) endef define Package/iptables-mod-nat-extra/description - iptables extensions for extra NAT targets. - Includes: - - REDIRECT +iptables extensions for extra NAT targets. +Includes: +- REDIRECT endef define Package/iptables-mod-ulog @@ -181,9 +184,9 @@ $(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-iprange @@ -192,9 +195,9 @@ $(call Package/iptables/Module, +kmod-ipt-iprange) 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 @@ -203,22 +206,12 @@ $(call Package/iptables/Module, +kmod-ipt-extra) endef define Package/iptables-mod-extra/description - other extra iptables extensions. - Includes: - - libipt_owner - - libipt_physdev - - libipt_pkttype - - libipt_recent - - iptable_raw - - libipt_NOTRACK - - libipt_TARPIT - - libipt_DELUDE - - libipt_CHAOS -endef - -define Package/iptables-mod-ipset -$(call Package/iptables/Module, +kmod-ipt-ipset) - TITLE:=IPset extension +Other extra iptables extensions. +Includes: +- libipt_owner +- libipt_physdev +- libipt_pkttype +- libipt_recent endef define Package/iptables-utils @@ -235,47 +228,81 @@ $(call Package/iptables/Default) 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 + TITLE:=IPv4/IPv6 firewall - shared libiptc library 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/libxtables + $(call Package/iptables/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=IPv4/IPv6 firewall - shared xtables library endef -TARGET_CFLAGS += $(FPIC) -define Build/Compile - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ +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) + $(MAKE_TARGETS) + +define Build/Compile + $(INSTALL_DIR) $(PKG_INSTALL_DIR) + $(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 \ - 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.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(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 @@ -310,6 +337,16 @@ define Package/ip6tables-utils/install $(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 @@ -328,19 +365,22 @@ 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 BuildPackage,ip6tables)) $(eval $(call BuildPackage,ip6tables-utils)) +$(eval $(call BuildPackage,libiptc)) +$(eval $(call BuildPackage,libxtables))