[brcm-2.4] drop iptables 1.3.8 and switch to to 1.4.3.2, refresh layer7 kernel patche...

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 3390b1d..8b0e5ca 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -4,25 +4,15 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # 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
 
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
 

-ifeq ($(CONFIG_LINUX_2_4),y)
-  PKG_VERSION:=1.3.8
-  PKG_RELEASE:=4
-  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:=1.4.3.2
+PKG_RELEASE:=1
+PKG_MD5SUM:=545698693b636cfc844aafc6729fd48a

 
 PKG_VERSION?=<IPTABLES_VERSION>
 
 
 PKG_VERSION?=<IPTABLES_VERSION>
 


@@ -41,10 +31,27 @@ ifeq ($(DUMP),)
   STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep 'NETFILTER' $(LINUX_DIR)/.config | md5s)
 endif
 
   STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep 'NETFILTER' $(LINUX_DIR)/.config | md5s)
 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
   URL:=http://netfilter.org/
 define Package/iptables/Default
   SECTION:=net
   CATEGORY:=Base system
   URL:=http://netfilter.org/

+  DEPENDS:=+libiptc +libxtables

 endef
 
 define Package/iptables/Module
 endef
 
 define Package/iptables/Module


@@ -102,12 +109,12 @@ endef
 define Package/iptables-mod-filter/description
  iptables extensions for packet content inspection.
  Includes:
 define Package/iptables-mod-filter/description
  iptables extensions for packet content inspection.
  Includes:

- - libipt_ipp2p
+ - libipt_string

  - libipt_layer7
 endef
 
 define Package/iptables-mod-imq
  - libipt_layer7
 endef
 
 define Package/iptables-mod-imq

-$(call Package/iptables/Module, +kmod-ipt-imq @!LINUX_2_6_27)
+$(call Package/iptables/Module, +kmod-ipt-imq)

   TITLE:=IMQ support
 endef
 
   TITLE:=IMQ support
 endef
 


@@ -211,9 +218,6 @@ define Package/iptables-mod-extra/description
  - libipt_recent
  - iptable_raw
  - libipt_NOTRACK
  - libipt_recent
  - iptable_raw
  - libipt_NOTRACK

- - libipt_TARPIT
- - libipt_DELUDE
- - libipt_CHAOS

 endef
 
 define Package/iptables-mod-ipset
 endef
 
 define Package/iptables-mod-ipset


@@ -245,14 +249,12 @@ define Build/Prepare
        $(call Build/Prepare/Default)
 endef
 
        $(call Build/Prepare/Default)
 endef
 

-define Build/Configure
-       chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
-       rm -f $(PKG_BUILD_DIR)/.configured*
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               clean
-endef
-
+TARGET_CPPFLAGS := -I$(PKG_BUILD_DIR)/include $(TARGET_CPPFLAGS)

 TARGET_CFLAGS += $(FPIC)
 TARGET_CFLAGS += $(FPIC)

+CONFIGURE_ARGS += \
+       --enable-devel \
+       --with-kernel="$(LINUX_DIR)" \
+       --with-xtlibdir=/usr/lib/iptables

 
 define Build/Compile
        mkdir -p $(PKG_INSTALL_DIR)
 
 define Build/Compile
        mkdir -p $(PKG_INSTALL_DIR)


@@ -267,15 +269,8 @@ define Build/Compile
 endef
 
 define Build/InstallDev
 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
+       $(INSTALL_DIR) $(1)/usr/lib

        $(CP) $(PKG_BUILD_DIR)/include $(1)/usr
        $(CP) $(PKG_BUILD_DIR)/include $(1)/usr

-       $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(1)/usr/lib

 endef
 
 define Package/iptables/install
 endef
 
 define Package/iptables/install


@@ -291,6 +286,18 @@ define Package/iptables/install
        )
 endef
 
        )
 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/
 define Package/iptables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/


@@ -328,6 +335,10 @@ L7_INSTALL:=\
        $(INSTALL_DIR) $$(1)/etc/l7-protocols; \
        $(CP) files/l7/*.pat $$(1)/etc/l7-protocols/
 
        $(INSTALL_DIR) $$(1)/etc/l7-protocols; \
        $(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 BuildPackage,iptables))
 $(eval $(call BuildPackage,iptables-utils))
 $(eval $(call BuildPlugin,iptables-mod-conntrack,$(IPT_CONNTRACK-m)))