X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fnetwork%2Futils%2Fipset%2FMakefile;h=f44c1de23238379e4fdc0aa64292168fbf6bb85e;hb=4c1ce83548abacfeabb75c6e28e8eb450ef10951;hp=4afcae5d49343b93a851fd316e7c74d188e9bc5b;hpb=fe35a1cb8bff1e7bfcf05ba7c59b196127725b2a;p=openwrt%2Fopenwrt.git

diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile
index 4afcae5d49..f44c1de232 100644
--- a/package/network/utils/ipset/Makefile
+++ b/package/network/utils/ipset/Makefile
@@ -1,4 +1,4 @@
- 
+
 # Copyright (C) 2009-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipset
-PKG_VERSION:=6.20.1
+PKG_VERSION:=6.32
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ipset.netfilter.org
-PKG_MD5SUM:=8af741492752fbf24d3a28a9d1473d40
+PKG_HASH:=d9cbb49a4ae9e32d7808a604f1a37f359f9fc9064c210c4c5f35d629d49fb9fe
 
-PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0
 
 PKG_FIXUP:=autoreconf
@@ -39,24 +39,15 @@ MAKE_FLAGS += \
 	ARCH="$(LINUX_KARCH)" \
 	SHELL="$(BASH)"
 
-IPSET_MODULES:= \
-	ipset/ip_set \
-	ipset/ip_set_bitmap_ip \
-	ipset/ip_set_bitmap_ipmac \
-	ipset/ip_set_bitmap_port \
-	ipset/ip_set_hash_ip \
-	ipset/ip_set_hash_ipport \
-	ipset/ip_set_hash_ipportip \
-	ipset/ip_set_hash_ipportnet \
-	ipset/ip_set_hash_net \
-	ipset/ip_set_hash_netiface \
-	ipset/ip_set_hash_netport \
-	ipset/ip_set_list_set \
-	xt_set \
-
 define Build/Compile
 	$(call Build/Compile/Default)
-	$(call Build/Compile/Default,modules)
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/libipset $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/lib/libipset.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/ipset/install
@@ -66,13 +57,4 @@ define Package/ipset/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so* $(1)/usr/lib/
 endef
 
-define KernelPackage/ipt-ipset
-  SUBMENU:=Netfilter Extensions
-  TITLE:=IPset netfilter modules
-  DEPENDS+= +kmod-ipt-core +kmod-nfnetlink
-  FILES:=$(foreach mod,$(IPSET_MODULES),$(PKG_BUILD_DIR)/kernel/net/netfilter/$(mod).ko)
-  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPSET_MODULES)))
-endef
-
 $(eval $(call BuildPackage,ipset))
-$(eval $(call KernelPackage,ipt-ipset))