X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/cbff181a94ee1ae952ec72366276903e02c727b9..9fdb87c88819de663ea208016020b26ca484e872:/package/iptables/Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 3390b1d19..05e694359 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -15,13 +15,13 @@ ifeq ($(CONFIG_LINUX_2_4),y)
   PKG_VERSION:=1.3.8
   PKG_RELEASE:=4
   PKG_MD5SUM:=0a9209f928002e5eee9cdff8fef4d4b3
-  MAKE_TARGETS:=experimental install-experimental
+  MAKE_TARGETS:=experimental install-experimental install-devel
 endif
 
 ifeq ($(CONFIG_LINUX_2_6),y)
-  PKG_VERSION:=1.4.0
-  PKG_RELEASE:=1
-  PKG_MD5SUM:=90cfa8a554a29b0b859a625e701af2a7
+  PKG_VERSION:=1.4.1.1
+  PKG_RELEASE:=2
+  PKG_MD5SUM:=723fa88d8a0915e184f99e03e9bf06cb
 endif
 
 PKG_VERSION?=<IPTABLES_VERSION>
@@ -102,7 +102,7 @@ endef
 define Package/iptables-mod-filter/description
  iptables extensions for packet content inspection.
  Includes:
- - libipt_ipp2p
+ - libipt_string
  - libipt_layer7
 endef
 
@@ -211,9 +211,6 @@ define Package/iptables-mod-extra/description
  - libipt_recent
  - iptable_raw
  - libipt_NOTRACK
- - libipt_TARPIT
- - libipt_DELUDE
- - libipt_CHAOS
 endef
 
 define Package/iptables-mod-ipset
@@ -245,14 +242,21 @@ define Build/Prepare
 	$(call Build/Prepare/Default)
 endef
 
-define Build/Configure
+ifeq ($(KERNEL),2.4)
+  define Build/Configure
 	chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
 	rm -f $(PKG_BUILD_DIR)/.configured*
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		clean
-endef
+  endef
+endif
 
+TARGET_CPPFLAGS := -I$(PKG_BUILD_DIR)/include $(TARGET_CPPFLAGS)
 TARGET_CFLAGS += $(FPIC)
+CONFIGURE_ARGS += \
+	--enable-devel \
+	--with-kernel="$(LINUX_DIR)" \
+	--with-xtlibdir=/usr/lib/iptables
 
 define Build/Compile
 	mkdir -p $(PKG_INSTALL_DIR)
@@ -267,13 +271,7 @@ define Build/Compile
 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)/libiptc/libiptc.a $(1)/usr/lib
 endef