cryptodev: Compilefix on 2.6.36

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 7da5464..8609b6d 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables

-PKG_VERSION:=1.4.8
+PKG_VERSION:=1.4.9.1

 PKG_RELEASE:=1
 
 PKG_RELEASE:=1
 

-PKG_MD5SUM:=697ed89f37af4473a5f6349ba2700f2d
+PKG_MD5SUM:=fbadfb0b5f2dbda49e0ad06a798898e3

 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/ \
 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/ \


@@ -20,6 +20,8 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
        ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
 
 PKG_FIXUP:=libtool
        ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
 
 PKG_FIXUP:=libtool

+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1

 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)


@@ -189,6 +191,17 @@ Includes:
 - libipt_ULOG
 endef
 
 - 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 extension
 define Package/iptables-mod-iprange
 $(call Package/iptables/Module, +kmod-ipt-iprange)
   TITLE:=IP range extension


@@ -234,7 +247,7 @@ endef
 
 define Package/ip6tables
 $(call Package/iptables/Default)
 
 define Package/ip6tables
 $(call Package/iptables/Default)

-  DEPENDS:=+kmod-ip6tables
+  DEPENDS:=+kmod-ip6tables +libiptc +libxtables

   CATEGORY:=IPv6
   TITLE:=IPv6 firewall administration tool
   MENU:=1
   CATEGORY:=IPv6
   TITLE:=IPv6 firewall administration tool
   MENU:=1


@@ -261,6 +274,12 @@ define Package/libxtables
  TITLE:=IPv4/IPv6 firewall - shared xtables library
 endef
 
  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 \
 
 TARGET_CPPFLAGS := \
        -I$(PKG_BUILD_DIR)/include \


@@ -275,24 +294,20 @@ CONFIGURE_ARGS += \
        --enable-shared \
        --enable-devel \
        --enable-ipv6 \
        --enable-shared \
        --enable-devel \
        --enable-ipv6 \

+       --enable-libipq \

        --with-kernel="$(LINUX_DIR)" \
        --with-xtlibdir=/usr/lib/iptables
 
        --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)" \
-               $(MAKE_TARGETS)
+MAKE_FLAGS := \
+       $(TARGET_CONFIGURE_OPTS) \
+       COPT_FLAGS="$(TARGET_CFLAGS)" \
+       LDFLAGS="-rdynamic -static-libgcc" \
+       KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
+       KBUILD_OUTPUT="$(LINUX_DIR)" \

 
 

-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
+define Build/Prepare
+$(call Build/Prepare/Default)
+       (cd $(PKG_BUILD_DIR); ./autogen.sh)

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev


@@ -310,9 +325,9 @@ define Build/InstallDev
 
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib
 
        $(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/
+       $(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,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/
        $(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/


@@ -360,6 +375,11 @@ define Package/libxtables/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so* $(1)/usr/lib/
 endef
 
        $(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
   define Package/$(1)/install
        $(INSTALL_DIR) $$(1)/usr/lib/iptables
 define BuildPlugin
   define Package/$(1)/install
        $(INSTALL_DIR) $$(1)/usr/lib/iptables


@@ -393,8 +413,10 @@ $(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-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-tproxy,$(IPT_TPROXY-m)))
 $(eval $(call BuildPackage,ip6tables))
 $(eval $(call BuildPackage,ip6tables-utils))
 $(eval $(call BuildPackage,libiptc))
 $(eval $(call BuildPackage,libxtables))
 $(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))

+$(eval $(call BuildPackage,libipq))