diff options
Diffstat (limited to 'meta/recipes-extended/iptables/iptables')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch | 18 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch | 31 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch (renamed from meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch) | 10 |
3 files changed, 43 insertions, 16 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch index 03c36ccbc2..8824bf2af7 100644 --- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch +++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c46db7c2e1f63ec525835553587e70c635565310 Mon Sep 17 00:00:00 2001 | 1 | From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001 |
2 | From: "Maxin B. John" <maxin.john@intel.com> | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
3 | Date: Tue, 21 Feb 2017 11:16:31 +0200 | 3 | Date: Tue, 21 Feb 2017 11:16:31 +0200 |
4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink | 4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink |
@@ -10,12 +10,13 @@ Upstream-Status: Pending | |||
10 | 10 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
13 | |||
13 | --- | 14 | --- |
14 | configure.ac | 10 +++++++--- | 15 | configure.ac | 10 +++++++--- |
15 | 1 file changed, 7 insertions(+), 3 deletions(-) | 16 | 1 file changed, 7 insertions(+), 3 deletions(-) |
16 | 17 | ||
17 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
18 | index eda7871..03ddc50 100644 | 19 | index d99fa3b..d607772 100644 |
19 | --- a/configure.ac | 20 | --- a/configure.ac |
20 | +++ b/configure.ac | 21 | +++ b/configure.ac |
21 | @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], | 22 | @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], |
@@ -28,9 +29,9 @@ index eda7871..03ddc50 100644 | |||
28 | AC_ARG_ENABLE([connlabel], | 29 | AC_ARG_ENABLE([connlabel], |
29 | AS_HELP_STRING([--disable-connlabel], | 30 | AS_HELP_STRING([--disable-connlabel], |
30 | [Do not build libnetfilter_conntrack]), | 31 | [Do not build libnetfilter_conntrack]), |
31 | @@ -115,9 +118,10 @@ if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then | 32 | @@ -113,9 +116,10 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"]) |
32 | AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool)) | 33 | AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"]) |
33 | fi | 34 | AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"]) |
34 | 35 | ||
35 | -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], | 36 | -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], |
36 | - [nfnetlink=1], [nfnetlink=0]) | 37 | - [nfnetlink=1], [nfnetlink=0]) |
@@ -40,8 +41,5 @@ index eda7871..03ddc50 100644 | |||
40 | + ]) | 41 | + ]) |
41 | +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) | 42 | +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) |
42 | 43 | ||
43 | if test "x$enable_nftables" = "xyes"; then | 44 | if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then |
44 | PKG_CHECK_MODULES([libmnl], [libmnl >= 1.0], [mnl=1], [mnl=0]) | 45 | PKG_CHECK_MODULES([libpcap], [libpcap], [], [ |
45 | -- | ||
46 | 2.4.0 | ||
47 | |||
diff --git a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch b/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch new file mode 100644 index 0000000000..a190c7e8ae --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 17 May 2022 10:56:59 +0200 | ||
4 | Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include | ||
5 | |||
6 | This resolves the build error under musl: | ||
7 | |||
8 | | ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'? | ||
9 | | 83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, | ||
10 | | | ^~~~~~~~~ | ||
11 | | | uint16_t | ||
12 | |||
13 | Upstream-Status: Submitted [via email to phil@nwl.cc] | ||
14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
15 | |||
16 | --- | ||
17 | iptables/xshared.h | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/iptables/xshared.h b/iptables/xshared.h | ||
21 | index a200e0d..f543dbf 100644 | ||
22 | --- a/iptables/xshared.h | ||
23 | +++ b/iptables/xshared.h | ||
24 | @@ -6,6 +6,7 @@ | ||
25 | #include <stdint.h> | ||
26 | #include <netinet/in.h> | ||
27 | #include <net/if.h> | ||
28 | +#include <sys/types.h> | ||
29 | #include <linux/netfilter_arp/arp_tables.h> | ||
30 | #include <linux/netfilter_ipv4/ip_tables.h> | ||
31 | #include <linux/netfilter_ipv6/ip6_tables.h> | ||
diff --git a/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch index 7842c6408a..5a022ebc8c 100644 --- a/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch +++ b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 26090b3dbcdf6a11e60535da949b726a6e86426d Mon Sep 17 00:00:00 2001 | 1 | From 6832501bbb90a3dab977a4625d0391804c0e795c Mon Sep 17 00:00:00 2001 |
2 | From: "Maxin B. John" <maxin.john@intel.com> | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
3 | Date: Tue, 21 Feb 2017 11:49:07 +0200 | 3 | Date: Tue, 21 Feb 2017 11:49:07 +0200 |
4 | Subject: [PATCH] configure.ac: | 4 | Subject: [PATCH] configure.ac: |
@@ -23,15 +23,16 @@ Upstream-Status: Pending | |||
23 | 23 | ||
24 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 24 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
25 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 25 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
26 | |||
26 | --- | 27 | --- |
27 | configure.ac | 6 ++++-- | 28 | configure.ac | 6 ++++-- |
28 | 1 file changed, 4 insertions(+), 2 deletions(-) | 29 | 1 file changed, 4 insertions(+), 2 deletions(-) |
29 | 30 | ||
30 | diff --git a/configure.ac b/configure.ac | 31 | diff --git a/configure.ac b/configure.ac |
31 | index 03ddc50..523caea 100644 | 32 | index d607772..25a8e75 100644 |
32 | --- a/configure.ac | 33 | --- a/configure.ac |
33 | +++ b/configure.ac | 34 | +++ b/configure.ac |
34 | @@ -172,10 +172,12 @@ if test "$nftables" != 1; then | 35 | @@ -159,10 +159,12 @@ if test "$nftables" != 1; then |
35 | fi | 36 | fi |
36 | 37 | ||
37 | if test "x$enable_connlabel" = "xyes"; then | 38 | if test "x$enable_connlabel" = "xyes"; then |
@@ -46,6 +47,3 @@ index 03ddc50..523caea 100644 | |||
46 | if test "$nfconntrack" -ne 1; then | 47 | if test "$nfconntrack" -ne 1; then |
47 | blacklist_modules="$blacklist_modules connlabel"; | 48 | blacklist_modules="$blacklist_modules connlabel"; |
48 | echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; | 49 | echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; |
49 | -- | ||
50 | 2.4.0 | ||
51 | |||