diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch | 20 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch | 10 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch | 41 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch | 12 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables/format-security.patch | 31 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables_1.8.10.bb (renamed from meta/recipes-extended/iptables/iptables_1.8.9.bb) | 4 |
6 files changed, 19 insertions, 99 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 0c2c97cdc8..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,7 +1,7 @@ | |||
1 | From 698ed332e2c592235d2b737c545ac25ad0970e15 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 1/4] configure: Add option to enable/disable libnfnetlink | 4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink |
5 | 5 | ||
6 | This changes the configure behaviour from autodetecting | 6 | This changes the configure behaviour from autodetecting |
7 | for libnfnetlink to having an option to disable it explicitly | 7 | for libnfnetlink to having an option to disable it explicitly |
@@ -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 bc2ed47b..e27745e5 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 bc2ed47b..e27745e5 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 | @@ -117,9 +120,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 bc2ed47b..e27745e5 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.30.2 | ||
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 index 9621d46c09..a190c7e8ae 100644 --- 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From d4699d2169fe2d91d0f1f4369d40d2e5f42b8877 Mon Sep 17 00:00:00 2001 | 1 | From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Tue, 17 May 2022 10:56:59 +0200 | 3 | Date: Tue, 17 May 2022 10:56:59 +0200 |
4 | Subject: [PATCH 2/4] iptables/xshared.h: add missing sys.types.h include | 4 | Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include |
5 | 5 | ||
6 | This resolves the build error under musl: | 6 | This resolves the build error under musl: |
7 | 7 | ||
@@ -12,12 +12,13 @@ This resolves the build error under musl: | |||
12 | 12 | ||
13 | Upstream-Status: Submitted [via email to phil@nwl.cc] | 13 | Upstream-Status: Submitted [via email to phil@nwl.cc] |
14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
15 | |||
15 | --- | 16 | --- |
16 | iptables/xshared.h | 1 + | 17 | iptables/xshared.h | 1 + |
17 | 1 file changed, 1 insertion(+) | 18 | 1 file changed, 1 insertion(+) |
18 | 19 | ||
19 | diff --git a/iptables/xshared.h b/iptables/xshared.h | 20 | diff --git a/iptables/xshared.h b/iptables/xshared.h |
20 | index 0ed9f3c2..b1413834 100644 | 21 | index a200e0d..f543dbf 100644 |
21 | --- a/iptables/xshared.h | 22 | --- a/iptables/xshared.h |
22 | +++ b/iptables/xshared.h | 23 | +++ b/iptables/xshared.h |
23 | @@ -6,6 +6,7 @@ | 24 | @@ -6,6 +6,7 @@ |
@@ -28,6 +29,3 @@ index 0ed9f3c2..b1413834 100644 | |||
28 | #include <linux/netfilter_arp/arp_tables.h> | 29 | #include <linux/netfilter_arp/arp_tables.h> |
29 | #include <linux/netfilter_ipv4/ip_tables.h> | 30 | #include <linux/netfilter_ipv4/ip_tables.h> |
30 | #include <linux/netfilter_ipv6/ip6_tables.h> | 31 | #include <linux/netfilter_ipv6/ip6_tables.h> |
31 | -- | ||
32 | 2.30.2 | ||
33 | |||
diff --git a/meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch b/meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch deleted file mode 100644 index cbc97572ec..0000000000 --- a/meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 28291b41bc3717f51e8d9d465f0100f1ca99dc26 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <trevor.gamblin@windriver.com> | ||
3 | Date: Wed, 9 Mar 2022 12:50:39 -0500 | ||
4 | Subject: [PATCH 3/4] Makefile.am: do not install /etc/ethertypes | ||
5 | |||
6 | The /etc/ethertypes is provided by netbase since 6.0[1]. | ||
7 | Do not instal the file in ebtables, otherwise there would be a conflict: | ||
8 | Error: Transaction test error: | ||
9 | file /etc/ethertypes conflicts between attempted installs of | ||
10 | netbase-1:6.2-r0.corei7_64 and iptables-1.8.7-r0.corei7_64 | ||
11 | |||
12 | [1] | ||
13 | https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35) | ||
14 | |||
15 | This patch is based off of the same change made for the ebtables recipe: | ||
16 | |||
17 | http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch?h=master | ||
18 | |||
19 | Upstream-Status: Inappropriate [embedded specific] | ||
20 | |||
21 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> | ||
22 | --- | ||
23 | Makefile.am | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/Makefile.am b/Makefile.am | ||
27 | index 451c3cb2..5125238c 100644 | ||
28 | --- a/Makefile.am | ||
29 | +++ b/Makefile.am | ||
30 | @@ -20,7 +20,7 @@ EXTRA_DIST = autogen.sh iptables-test.py xlate-test.py | ||
31 | |||
32 | if ENABLE_NFTABLES | ||
33 | confdir = $(sysconfdir) | ||
34 | -dist_conf_DATA = etc/ethertypes etc/xtables.conf | ||
35 | +dist_conf_DATA = etc/xtables.conf | ||
36 | endif | ||
37 | |||
38 | .PHONY: tarball | ||
39 | -- | ||
40 | 2.30.2 | ||
41 | |||
diff --git a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch index 20c40c4039..5a022ebc8c 100644 --- a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch +++ b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e7aa1dd2831f9bb5d0603c5e5027387ad7721b00 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 4/4] configure.ac: | 4 | Subject: [PATCH] configure.ac: |
5 | only-check-conntrack-when-libnfnetlink-enabled.patch | 5 | only-check-conntrack-when-libnfnetlink-enabled.patch |
6 | 6 | ||
7 | Package libnetfilter-conntrack depends on package libnfnetlink. iptables | 7 | Package libnetfilter-conntrack depends on package libnfnetlink. iptables |
@@ -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 e27745e5..528f1bb5 100644 | 32 | index d607772..25a8e75 100644 |
32 | --- a/configure.ac | 33 | --- a/configure.ac |
33 | +++ b/configure.ac | 34 | +++ b/configure.ac |
34 | @@ -158,10 +158,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 e27745e5..528f1bb5 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.30.2 | ||
51 | |||
diff --git a/meta/recipes-extended/iptables/iptables/format-security.patch b/meta/recipes-extended/iptables/iptables/format-security.patch deleted file mode 100644 index fae920f0a8..0000000000 --- a/meta/recipes-extended/iptables/iptables/format-security.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From ed4082a7405a5838c205a34c1559e289949200cc Mon Sep 17 00:00:00 2001 | ||
2 | From: Phil Sutter <phil@nwl.cc> | ||
3 | Date: Thu, 12 Jan 2023 14:38:44 +0100 | ||
4 | Subject: extensions: NAT: Fix for -Werror=format-security | ||
5 | |||
6 | Have to pass either a string literal or format string to xt_xlate_add(). | ||
7 | |||
8 | Fixes: f30c5edce0413 ("extensions: Merge SNAT, DNAT, REDIRECT and MASQUERADE") | ||
9 | Signed-off-by: Phil Sutter <phil@nwl.cc> | ||
10 | Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=ed4082a7405a5838c205a34c1559e289949200cc] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | --- | ||
13 | extensions/libxt_NAT.c | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/extensions/libxt_NAT.c b/extensions/libxt_NAT.c | ||
17 | index da9f2201..2a634398 100644 | ||
18 | --- a/extensions/libxt_NAT.c | ||
19 | +++ b/extensions/libxt_NAT.c | ||
20 | @@ -424,7 +424,7 @@ __NAT_xlate(struct xt_xlate *xl, const struct nf_nat_range2 *r, | ||
21 | if (r->flags & NF_NAT_RANGE_PROTO_OFFSET) | ||
22 | return 0; | ||
23 | |||
24 | - xt_xlate_add(xl, tgt); | ||
25 | + xt_xlate_add(xl, "%s", tgt); | ||
26 | if (strlen(range_str)) | ||
27 | xt_xlate_add(xl, " to %s", range_str); | ||
28 | if (r->flags & NF_NAT_RANGE_PROTO_RANDOM) { | ||
29 | -- | ||
30 | cgit v1.2.3 | ||
31 | |||
diff --git a/meta/recipes-extended/iptables/iptables_1.8.9.bb b/meta/recipes-extended/iptables/iptables_1.8.10.bb index dc91973548..cd2f3bce0b 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.9.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb | |||
@@ -15,11 +15,9 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \ | |||
15 | file://ip6tables.rules \ | 15 | file://ip6tables.rules \ |
16 | file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ | 16 | file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ |
17 | file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \ | 17 | file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \ |
18 | file://0003-Makefile.am-do-not-install-etc-ethertypes.patch \ | ||
19 | file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \ | 18 | file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \ |
20 | file://format-security.patch \ | ||
21 | " | 19 | " |
22 | SRC_URI[sha256sum] = "ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f" | 20 | SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c" |
23 | 21 | ||
24 | SYSTEMD_SERVICE:${PN} = "\ | 22 | SYSTEMD_SERVICE:${PN} = "\ |
25 | iptables.service \ | 23 | iptables.service \ |