aboutsummaryrefslogtreecommitdiff
path: root/package/iptables/iptables.mk
diff options
context:
space:
mode:
authorGravatar Gustavo Zacarias <gustavo@zacarias.com.ar>2015-12-20 17:05:27 -0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-12-30 00:10:08 +0100
commit35dc775b83b8054d27a75a218d30c7a0f15b6a6d (patch)
treeb39b0465b1e78bea4ccfa62e15ee55fd224e4e74 /package/iptables/iptables.mk
parent5203541aa62c1d77d1e85662961bd7ab313813bc (diff)
downloadbuildroot-35dc775b83b8054d27a75a218d30c7a0f15b6a6d.tar.gz
buildroot-35dc775b83b8054d27a75a218d30c7a0f15b6a6d.tar.bz2
iptables: bump to version 1.6.0
Add option for nftables compat utilies and for bpf compiler/nfsynproxy configuration tool. Drop symlink trickery since it's not required any more. Switch homepage to proper one and drop the kernel v2.4+ note since that's not supported by buildroot anyway. Drop most patches (except musl build) since they're upstream. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/iptables/iptables.mk')
-rw-r--r--package/iptables/iptables.mk32
1 files changed, 15 insertions, 17 deletions
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index e425ec6f4a..da8d48bc14 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IPTABLES_VERSION = 1.4.21
+IPTABLES_VERSION = 1.6.0
IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
IPTABLES_INSTALL_STAGING = YES
@@ -15,8 +15,6 @@ IPTABLES_LICENSE_FILES = COPYING
# Building static causes ugly warnings on some plugins
IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \
$(if $(BR2_STATIC_LIBS),,--disable-static)
-# Because of iptables-01-fix-static-link.patch
-IPTABLES_AUTORECONF = YES
# For connlabel match
ifeq ($(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),y)
@@ -28,20 +26,20 @@ 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
- ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables-restore
-endef
-
-define IPTABLES_TARGET_IPV6_SYMLINK_CREATE
- ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables
- ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables-save
- ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore
-endef
-
-IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_SYMLINK_CREATE
+# For iptables-compat tools
+ifeq ($(BR2_PACKAGE_IPTABLES_NFTABLES),y)
+IPTABLES_CONF_OPTS += --enable-nftables
+IPTABLES_DEPENDENCIES += host-bison host-flex libmnl libnftnl
+else
+IPTABLES_CONF_OPTS += --disable-nftables
+endif
-IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_IPV6_SYMLINK_CREATE
+# bpf compiler support and nfsynproxy tool
+ifeq ($(BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY),y)
+IPTABLES_CONF_OPTS += --enable-bpf-compiler --enable-nfsynproxy
+IPTABLES_DEPENDENCIES += libpcap
+else
+IPTABLES_CONF_OPTS += --disable-bpf-compiler --disable-nfsynproxy
+endif
$(eval $(autotools-package))