From e014faf13fc0f0d86cbaa262abd7f05ce6a6f3cb Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 27 Sep 2009 15:03:41 +0000
Subject: Update ipset to version 3.2

SVN-Revision: 17764
---
 package/ipset/Makefile              | 12 ++++++++----
 package/kernel/modules/netfilter.mk |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'package')

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 5e657275e5..b7b4a317d1 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -6,14 +6,15 @@
 #
 #
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipset
-PKG_VERSION:=2.3.0
+PKG_VERSION:=3.2
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20070828.tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ipset.netfilter.org
-PKG_MD5SUM:=9e17798dfd8ed87c63a1f3498f9fe64d
+PKG_MD5SUM:=0fd83af3efae5f72f5e5b55d07582941
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,8 +29,11 @@ endef
 define Build/Compile
 	$(call Build/Compile/Default, \
 		COPT_FLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="-rdynamic -static-libgcc" \
 		KERNEL_DIR="$(LINUX_DIR)" \
 		PREFIX="/usr" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		binaries \
 	)
 endef
 
@@ -37,7 +41,7 @@ define Package/ipset/install
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(1)" \
 		PREFIX="/usr" \
-		install
+		binaries_install
 	rm -rf $(1)/usr/man
 endef
 
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index d5b4c81a65..a6988acf04 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -316,11 +316,14 @@ define KernelPackage/ipt-ipset/description
  - ip_set_iphash
  - ip_set_ipmap
  - ip_set_ipporthash
+ - ip_set_ipportiphash
+ - ip_set_ipportnethash
  - ip_set_iptree
  - ip_set_iptreemap
  - ip_set_macipmap
  - ip_set_nethash
  - ip_set_portmap
+ - ip_set_setlist
  - ipt_set
  - ipt_SET
 endef
-- 
cgit v1.2.3