ipset: bump to version 6.20.1
PATCH 1/2 ipset: bump to version 6.20.1
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/ipset/ipset-01-uclinux.patch | 26 -------------------------- package/ipset/ipset.mk | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 package/ipset/ipset-01-uclinux.patch
package/ipset/ipset-01-uclinux.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 8ec2a85a29817f5aa3f6fb680753d331e2af3591 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Tue, 10 Sep 2013 15:28:49 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6b64576..6d06ef5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,7 @@ LTDL_INIT([nonrecursive]) - - dnl Shortcut: Linux supported alone - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux systems supported exclusively!]);; - esac - --- -1.8.1.5 -
package/ipset/ipset.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 6.19 +IPSET_VERSION = 6.20.1 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf
Signature · 1 line
1.8.1.5
PATCH 2/2 iptables: add support for connlabel match and nfnl_osf
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/iptables/iptables.mk | 10 ++++++++++ 1 file changed, 10 insertions(+)
package/iptables/iptables.mk +10 -0
@@ -16,6 +16,16 @@ IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr # Because of iptables-01-fix-static-link.patch IPTABLES_AUTORECONF = YES +# For connlabel match +ifeq ($(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),y) +IPTABLES_DEPENDENCIES += libnetfilter_conntrack +endif + +# For nfnl_osf +ifeq ($(BR2_PACKAGE_LIBNFNETLINK),y) +IPTABLES_DEPENDENCIES += libnfnetlink +endif + define IPTABLES_TARGET_SYMLINK_CREATE ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables-save
Signature · 1 line
1.8.1.5
PATCH 1/2 ipset: bump to version 6.20.1
In reply to Gustavo ZacariasQuoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Signed-off-by Gustavo Zacarias <[email protected]>
Committed both, thanks.
Signature · 1 line
Bye, Peter Korsgaard