X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/2b3988d5abfd2a1c55bd2a49d09f33cc7fbed57f..fc23cd7aa9a29eef1c7e37fe12fcef5bbd3dc126:/package/iptables/Makefile diff --git a/package/iptables/Makefile b/package/iptables/Makefile index fab190cbd..f683331ff 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 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. @@ -9,23 +9,17 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables -PKG_VERSION:=1.4.4 +PKG_VERSION:=1.4.7 PKG_RELEASE:=1 -PKG_MD5SUM:=08cd9196881657ea0615d926334cb7e9 +PKG_MD5SUM:=645941dd1f9e0ec1f74c61918d70d52f 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/ -ifeq ($(CONFIG_EXTERNAL_KERNEL_TREE),) -PATCH_DIR:= -else -PATCH_DIR:=./patches/$(PKG_VERSION) -endif - -PKG_FIXUP = libtool +PKG_FIXUP:=libtool include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) @@ -37,7 +31,7 @@ endif define Package/iptables/Default SECTION:=net - CATEGORY:=Base system + CATEGORY:=Network URL:=http://netfilter.org/ endef @@ -54,14 +48,15 @@ $(call Package/iptables/Default) 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 @@ -70,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 @@ -81,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 @@ -94,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_string - - libipt_layer7 +iptables extensions for packet content inspection. +Includes: +- libipt_string +- libipt_layer7 endef define Package/iptables-mod-imq @@ -106,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 @@ -117,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 @@ -138,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 @@ -151,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 @@ -164,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 @@ -175,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 @@ -186,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 @@ -197,19 +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 -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 @@ -247,11 +249,17 @@ define Package/libxtables endef -TARGET_CPPFLAGS := -I$(PKG_BUILD_DIR)/include $(TARGET_CPPFLAGS) -TARGET_CFLAGS += $(FPIC) +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-static \ --enable-devel \ --enable-ipv6 \ --with-kernel="$(LINUX_DIR)" \ @@ -264,31 +272,35 @@ IPTABLES_MAKEOPTS = \ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ KBUILD_OUTPUT="$(LINUX_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - all install $(MAKE_TARGETS) + $(MAKE_TARGETS) define Build/Compile - mkdir -p $(PKG_INSTALL_DIR) + $(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 - mkdir -p $(1)/usr/include - mkdir -p $(1)/usr/include/iptables - mkdir -p $(1)/usr/include/net/netfilter + $(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/ - mkdir -p $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.{a,so*} $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.{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/ - mkdir -p $(1)/usr/lib/pkgconfig + $(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 @@ -327,12 +339,12 @@ endef define Package/libiptc/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so.* $(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 - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so* $(1)/usr/lib/ endef define BuildPlugin @@ -359,11 +371,11 @@ $(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)))