From 051c0da80c194ff9a29c32d877ce33a2f4c42078 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 18 Dec 2012 14:50:44 +0000 Subject: ipset: update to 6.16.1 to fix build with kernel 3.7 Signed-off-by: David Woodhouse Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34752 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/utils/ipset/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/network/utils/ipset') diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile index 273ef9d42..fd48a5d91 100644 --- a/package/network/utils/ipset/Makefile +++ b/package/network/utils/ipset/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ipset -PKG_VERSION:=6.14 +PKG_VERSION:=6.16.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ipset.netfilter.org -PKG_MD5SUM:=70f2d4c054592236dcda285855a4ee58 +PKG_MD5SUM:=9fd70c825f052db7dc9d5ba0562b7083 PKG_MAINTAINER:=Jo-Philipp Wich -- cgit v1.2.3 From 06211d702c555dcfdad210497c96ee71a6b31c2f Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 20 Mar 2013 21:59:24 +0000 Subject: kernel: add some fixes for kernel 3.9 This patch fixes some compile problems with kernel 3.9 and adds some missing linux 3.9 handling into kernel packages. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36098 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../network/utils/ipset/patches/001-fix-kernel-3.9.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 package/network/utils/ipset/patches/001-fix-kernel-3.9.patch (limited to 'package/network/utils/ipset') diff --git a/package/network/utils/ipset/patches/001-fix-kernel-3.9.patch b/package/network/utils/ipset/patches/001-fix-kernel-3.9.patch new file mode 100644 index 000000000..d57ab0287 --- /dev/null +++ b/package/network/utils/ipset/patches/001-fix-kernel-3.9.patch @@ -0,0 +1,16 @@ +--- a/kernel/net/netfilter/ipset/ip_set_core.c ++++ b/kernel/net/netfilter/ipset/ip_set_core.c +@@ -27,6 +27,13 @@ + #include + #include + ++#ifndef IPSET_IN_KERNEL_TREE ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) ++#define nfnl_unlock() nfnl_unlock(NFNL_SUBSYS_IPSET) ++#define nfnl_lock() nfnl_lock(NFNL_SUBSYS_IPSET) ++#endif ++#endif ++ + static LIST_HEAD(ip_set_type_list); /* all registered set types */ + static DEFINE_MUTEX(ip_set_type_mutex); /* protects ip_set_type_list */ + static DEFINE_RWLOCK(ip_set_ref_lock); /* protects the set refs */ -- cgit v1.2.3 From 62bf5ee0c4353c0235eb132f3947352d40ca6b87 Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 21 May 2013 13:00:28 +0000 Subject: ipset: remove dependency on iptables-mod-ipset - technically it does not depend on it and the iptables matches are now part of the base git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36685 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/utils/ipset/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/network/utils/ipset') diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile index fd48a5d91..d53b044e2 100644 --- a/package/network/utils/ipset/Makefile +++ b/package/network/utils/ipset/Makefile @@ -31,7 +31,7 @@ define Package/ipset $(call Package/ipset/Default) SECTION:=net CATEGORY:=Network - DEPENDS+= +iptables-mod-ipset +kmod-ipt-ipset +libmnl + DEPENDS+= +kmod-ipt-ipset +libmnl TITLE:=IPset administration utility URL:=http://ipset.netfilter.org/ endef -- cgit v1.2.3