iptables: bump to version 1.6.0
PATCH 1/1 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.
---
...h-musl.patch => 0001-fix-build-with-musl.patch} | 0
package/iptables/0001-fix-static-link.patch | 68 ----------------
...ip-6-tables-save.c-remove-dlfcn.h-include.patch | 47 -----------
.../iptables/0003-consistently-use-errno.h.patch | 92 ----------------------
.../0004-include-remove-libc5-support-code.patch | 51 ------------
.../iptables/0006-fix-connlabel-conf-warning.patch | 72 -----------------
package/iptables/Config.in | 29 ++++++-
package/iptables/iptables.hash | 6 +-
package/iptables/iptables.mk | 32 ++++----
9 files changed, 45 insertions(+), 352 deletions(-)
rename package/iptables/{0005-fix-build-with-musl.patch => 0001-fix-build-with-musl.patch} (100%)
delete mode 100644 package/iptables/0001-fix-static-link.patch
delete mode 100644 package/iptables/0002-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch
delete mode 100644 package/iptables/0003-consistently-use-errno.h.patch
delete mode 100644 package/iptables/0004-include-remove-libc5-support-code.patch
delete mode 100644 package/iptables/0006-fix-connlabel-conf-warning.patchpackage/iptables/0001-fix-build-with-musl.patch renamed from package/iptables/0005-fix-build-with-musl.patch +0 -0
package/iptables/0001-fix-static-link.patch deleted +0 -68
68 lines not on this page · raw message
package/iptables/0002-iptables-ip-6-tables-save.c-remove-dlfcn.h-include.patch deleted +0 -47
47 lines not on this page · raw message
package/iptables/0003-consistently-use-errno.h.patch deleted +0 -92
92 lines not on this page · raw message
package/iptables/0004-include-remove-libc5-support-code.patch deleted +0 -51
51 lines not on this page · raw message
package/iptables/0006-fix-connlabel-conf-warning.patch deleted +0 -72
72 lines not on this page · raw message
package/iptables/Config.in +27 -2
@@ -1,6 +1,31 @@ config BR2_PACKAGE_IPTABLES bool "iptables" help - Linux kernel (2.4+) firewall, NAT, and packet mangling tools. + Linux kernel firewall, NAT, and packet mangling tools. - http://www.iptables.org/ + http://www.netfilter.org/projects/iptables/index.html + +if BR2_PACKAGE_IPTABLES + +config BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY + bool "bpfc and nfsynproxy" + select BR2_PACKAGE_LIBPCAP + help + Build bpf compiler and nfsynproxy configuration tool. + +config BR2_PACKAGE_IPTABLES_NFTABLES + bool "nftables compat" + # uses dlfcn + depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + select BR2_PACKAGE_LIBMNL + select BR2_PACKAGE_LIBNFTNL + help + Build nftables compat utilities. + +comment "nftables compat needs a toolchain w/ wchar, dynamic library, headers >= 3.4" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || \ + !BR2_USE_WCHAR || BR2_STATIC_LIBS + +endif
package/iptables/iptables.hash +3 -3
@@ -1,3 +1,3 @@ -# From ftp://ftp.netfilter.org/pub/iptables/iptables-1.4.21.tar.bz2.{md5sum,sha1sum} -md5 536d048c8e8eeebcd9757d0863ebb0c0 iptables-1.4.21.tar.bz2 -sha1 85d4160537546a23a7e42bc26dd7ee62a0ede4c8 iptables-1.4.21.tar.bz2 +# From ftp://ftp.netfilter.org/pub/iptables/iptables-1.6.0.tar.bz2.{md5sum,sha1sum} +md5 27ba3451cb622467fc9267a176f19a31 iptables-1.6.0.tar.bz2 +sha1 21a694e75b0d6863cc001f85fb15915d12b8cc22 iptables-1.6.0.tar.bz2
package/iptables/iptables.mk +15 -17
@@ -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))
Signature · 1 line
2.4.10
PATCH 1/1 iptables: bump to version 1.6.0
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Add option for nftables compat utilies and for bpf compiler/nfsynproxy configuration tool.
Quoted 8 lines
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 <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard