Add buildroot 2018-02
This commit is contained in:
@@ -0,0 +1,44 @@
|
||||
From 06e0312d0bfd1f0b9e7c23ab654f18524d49e86b Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 2 Mar 2017 09:20:48 +0200
|
||||
Subject: [PATCH] utils: nfsynproxy: fix build with musl libc
|
||||
|
||||
The musl libc exposes some struct tcphdr field only when _GNU_SOURCE is
|
||||
defined. Fix the following build failure:
|
||||
|
||||
nfsynproxy.c: In function ‘parse_packet’:
|
||||
nfsynproxy.c:34:9: error: ‘const struct tcphdr’ has no member named ‘syn’
|
||||
if (!th->syn || !th->ack)
|
||||
^
|
||||
nfsynproxy.c:34:21: error: ‘const struct tcphdr’ has no member named ‘ack’
|
||||
if (!th->syn || !th->ack)
|
||||
^
|
||||
nfsynproxy.c:42:8: error: ‘const struct tcphdr’ has no member named ‘res2’
|
||||
if (th->res2 == 0x1)
|
||||
^
|
||||
nfsynproxy.c:45:13: error: ‘const struct tcphdr’ has no member named ‘doff’
|
||||
length = th->doff * 4 - sizeof(*th);
|
||||
^
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: pending (http://patchwork.ozlabs.org/patch/734503/)
|
||||
|
||||
utils/nfsynproxy.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/utils/nfsynproxy.c b/utils/nfsynproxy.c
|
||||
index baedc92c5d9f..bf5c416340f1 100644
|
||||
--- a/utils/nfsynproxy.c
|
||||
+++ b/utils/nfsynproxy.c
|
||||
@@ -6,6 +6,7 @@
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
+#define _GNU_SOURCE
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include <unistd.h>
|
||||
--
|
||||
2.11.0
|
||||
|
||||
31
buildroot/package/iptables/Config.in
Normal file
31
buildroot/package/iptables/Config.in
Normal file
@@ -0,0 +1,31 @@
|
||||
config BR2_PACKAGE_IPTABLES
|
||||
bool "iptables"
|
||||
help
|
||||
Linux kernel firewall, NAT, and packet mangling tools.
|
||||
|
||||
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_12
|
||||
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.12"
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
|
||||
!BR2_USE_WCHAR || BR2_STATIC_LIBS
|
||||
|
||||
endif
|
||||
3
buildroot/package/iptables/iptables.hash
Normal file
3
buildroot/package/iptables/iptables.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# From ftp://ftp.netfilter.org/pub/iptables/iptables-1.6.1.tar.bz2.{md5sum,sha1sum}
|
||||
md5 ab38a33806b6182c6f53d6afb4619add iptables-1.6.1.tar.bz2
|
||||
sha1 b2592490ca7a6c2cd0f069e167a4337c86acdf91 iptables-1.6.1.tar.bz2
|
||||
50
buildroot/package/iptables/iptables.mk
Normal file
50
buildroot/package/iptables/iptables.mk
Normal file
@@ -0,0 +1,50 @@
|
||||
################################################################################
|
||||
#
|
||||
# iptables
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IPTABLES_VERSION = 1.6.1
|
||||
IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
|
||||
IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
|
||||
IPTABLES_INSTALL_STAGING = YES
|
||||
IPTABLES_DEPENDENCIES = host-pkgconf \
|
||||
$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
|
||||
IPTABLES_LICENSE = GPL-2.0
|
||||
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)
|
||||
|
||||
# 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
|
||||
|
||||
# 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
|
||||
|
||||
# bpf compiler support and nfsynproxy tool
|
||||
ifeq ($(BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY),y)
|
||||
# libpcap is tricky for static-only builds and needs help
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
IPTABLES_LIBS_FOR_STATIC_LINK += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
|
||||
IPTABLES_CONF_OPTS += LIBS="$(IPTABLES_LIBS_FOR_STATIC_LINK)"
|
||||
endif
|
||||
IPTABLES_CONF_OPTS += --enable-bpf-compiler --enable-nfsynproxy
|
||||
IPTABLES_DEPENDENCIES += libpcap
|
||||
else
|
||||
IPTABLES_CONF_OPTS += --disable-bpf-compiler --disable-nfsynproxy
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user