diff options
Diffstat (limited to 'package/network/utils/ipset')
| -rw-r--r-- | package/network/utils/ipset/Makefile | 6 | ||||
| -rw-r--r-- | package/network/utils/ipset/patches/001-fix-kernel-3.9.patch | 16 |
2 files changed, 19 insertions, 3 deletions
diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile index 273ef9d42..d53b044e2 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 <jow@openwrt.org> @@ -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 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 <linux/netfilter/nfnetlink.h> + #include <linux/netfilter/ipset/ip_set.h> + ++#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 */ |