X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0084424abd5765981df1459ab61bcec8fc1c3fe8..8b93389dcabc49295c3022bc5b81629fafbfe572:/package/iptables/Makefile diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 8b0e5ca8d..b4e255435 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables +PKG_VERSION:=1.4.4 +PKG_RELEASE:=3 -PKG_VERSION:=1.4.3.2 -PKG_RELEASE:=1 -PKG_MD5SUM:=545698693b636cfc844aafc6729fd48a - -PKG_VERSION?= - +PKG_MD5SUM:=08cd9196881657ea0615d926334cb7e9 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/ \ @@ -24,6 +21,8 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ PATCH_DIR:=./patches/$(PKG_VERSION) +PKG_FIXUP = libtool + include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) -include $(LINUX_DIR)/.config @@ -32,26 +31,10 @@ ifeq ($(DUMP),) endif -define Package/libiptc - SECTION:=libs - CATEGORY:=Libraries - URL:=http://netfilter.org/ - TITLE:=IPv4/IPv6 firewall - shared libiptc library -endef - -define Package/libxtables - SECTION:=libs - CATEGORY:=Libraries - URL:=http://netfilter.org/ - TITLE:=IPv4/IPv6 firewall - shared xtables library -endef - - define Package/iptables/Default SECTION:=net - CATEGORY:=Base system + CATEGORY:=Network URL:=http://netfilter.org/ - DEPENDS:=+libiptc +libxtables endef define Package/iptables/Module @@ -63,12 +46,13 @@ 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: + - comment - limit - LOG - mac @@ -220,11 +204,6 @@ define Package/iptables-mod-extra/description - libipt_NOTRACK endef -define Package/iptables-mod-ipset -$(call Package/iptables/Module, +kmod-ipt-ipset) - TITLE:=IPset extension -endef - define Package/iptables-utils $(call Package/iptables/Module, ) TITLE:=iptables save and restore utilities @@ -239,26 +218,41 @@ $(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 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 $(TARGET_CPPFLAGS) -TARGET_CFLAGS += $(FPIC) + +TARGET_CPPFLAGS := \ + -I$(PKG_BUILD_DIR)/include \ + -I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include \ + $(TARGET_CPPFLAGS) + CONFIGURE_ARGS += \ + --enable-shared \ + --enable-static \ --enable-devel \ + --enable-ipv6 \ --with-kernel="$(LINUX_DIR)" \ --with-xtlibdir=/usr/lib/iptables -define Build/Compile - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ +IPTABLES_MAKEOPTS = \ $(TARGET_CONFIGURE_OPTS) \ COPT_FLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="-rdynamic -static-libgcc" \ @@ -266,11 +260,34 @@ define Build/Compile KBUILD_OUTPUT="$(LINUX_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install $(MAKE_TARGETS) + +define Build/Compile + mkdir -p $(PKG_INSTALL_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS) + $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS) endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/include $(1)/usr + mkdir -p $(1)/usr/include + mkdir -p $(1)/usr/include/iptables + mkdir -p $(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 + $(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/libipq.a $(1)/usr/lib/ + mkdir -p $(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 @@ -286,18 +303,6 @@ define Package/iptables/install ) endef - -define Package/libiptc/install - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so.0 $(1)/usr/lib/ -endef - -define Package/libxtables/install - $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so.2 $(1)/usr/lib/ -endef - - define Package/iptables-utils/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/ @@ -317,6 +322,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/libiptc.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 @@ -336,15 +351,11 @@ L7_INSTALL:=\ $(CP) files/l7/*.pat $$(1)/etc/l7-protocols/ -$(eval $(call BuildPackage,libiptc)) -$(eval $(call BuildPackage,libxtables)) - $(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))) @@ -355,3 +366,5 @@ $(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))