diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-18 12:57:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-20 22:52:14 +0100 |
commit | b44d6bc7e56121d977a7bc491aec00cf3fb510fb (patch) | |
tree | 11cd8c9c55fe54ef213d07385f5b482eb6e5049b /meta/recipes-extended | |
parent | 65bbbfc609c553b7ba54b63b5aab18b827c632f8 (diff) | |
download | openembedded-core-contrib-b44d6bc7e56121d977a7bc491aec00cf3fb510fb.tar.gz |
iptables: upgrade 1.8.7 -> 1.8.8
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0001-iptables-xshared.h-add-missing-sys.types.h-include.patch | 30 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables/format-security.patch | 30 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables_1.8.8.bb (renamed from meta/recipes-extended/iptables/iptables_1.8.7.bb) | 11 |
3 files changed, 69 insertions, 2 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-iptables-xshared.h-add-missing-sys.types.h-include.patch b/meta/recipes-extended/iptables/iptables/0001-iptables-xshared.h-add-missing-sys.types.h-include.patch new file mode 100644 index 0000000000..17dd032434 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/0001-iptables-xshared.h-add-missing-sys.types.h-include.patch @@ -0,0 +1,30 @@ +From 796b8f6fc1e584c27c42ba302f623fd1c5aa0667 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Tue, 17 May 2022 10:56:59 +0200 +Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include + +This resolves the build error under musl: + +| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'? +| 83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, +| | ^~~~~~~~~ +| | uint16_t + +Upstream-Status: Submitted [via email to phil@nwl.cc] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + iptables/xshared.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/iptables/xshared.h b/iptables/xshared.h +index 14568bb..73b1017 100644 +--- a/iptables/xshared.h ++++ b/iptables/xshared.h +@@ -6,6 +6,7 @@ + #include <stdint.h> + #include <netinet/in.h> + #include <net/if.h> ++#include <sys/types.h> + #include <linux/netfilter_arp/arp_tables.h> + #include <linux/netfilter_ipv4/ip_tables.h> + #include <linux/netfilter_ipv6/ip6_tables.h> diff --git a/meta/recipes-extended/iptables/iptables/format-security.patch b/meta/recipes-extended/iptables/iptables/format-security.patch new file mode 100644 index 0000000000..be1e077b49 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/format-security.patch @@ -0,0 +1,30 @@ +From b72eb12ea5a61df0655ad99d5048994e916be83a Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Fri, 13 May 2022 16:51:58 +0200 +Subject: xshared: Fix build for -Werror=format-security + +Gcc complains about the omitted format string. + +Signed-off-by: Phil Sutter <phil@nwl.cc> +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + iptables/xshared.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iptables/xshared.c b/iptables/xshared.c +index fae5ddd5..a8512d38 100644 +--- a/iptables/xshared.c ++++ b/iptables/xshared.c +@@ -1307,7 +1307,7 @@ static void check_empty_interface(struct xtables_args *args, const char *arg) + return; + + if (args->family != NFPROTO_ARP) +- xtables_error(PARAMETER_PROBLEM, msg); ++ xtables_error(PARAMETER_PROBLEM, "%s", msg); + + fprintf(stderr, "%s", msg); + } +-- +cgit v1.2.3 + diff --git a/meta/recipes-extended/iptables/iptables_1.8.7.bb b/meta/recipes-extended/iptables/iptables_1.8.8.bb index 3b41882841..54d027220b 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.7.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.8.bb @@ -12,12 +12,14 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ file://0001-Makefile.am-do-not-install-etc-ethertypes.patch \ file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ + file://format-security.patch \ file://iptables.service \ file://iptables.rules \ file://ip6tables.service \ file://ip6tables.rules \ + file://0001-iptables-xshared.h-add-missing-sys.types.h-include.patch \ " -SRC_URI[sha256sum] = "c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0" +SRC_URI[sha256sum] = "71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f" SYSTEMD_SERVICE:${PN} = "\ iptables.service \ @@ -28,6 +30,8 @@ inherit autotools pkgconfig systemd EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR}" +CFLAGS:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0" + PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," @@ -41,6 +45,9 @@ do_configure:prepend() { # Remove some libtool m4 files # Keep ax_check_linker_flags.m4 which belongs to autoconf-archive. rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 + + # Copy a header to fix out of tree builds + cp -f ${S}/libiptc/linux_list.h ${S}/include/libiptc/ } IPTABLES_RULES_DIR ?= "${sysconfdir}/${BPN}" @@ -108,7 +115,7 @@ RDEPENDS:${PN}-apply = "${PN} bash" # Include the symlinks as well in respective packages FILES:${PN}-module-xt-conntrack += "${libdir}/xtables/libxt_state.so" -FILES:${PN}-module-xt-ct += "${libdir}/xtables/libxt_NOTRACK.so" +FILES:${PN}-module-xt-ct += "${libdir}/xtables/libxt_NOTRACK.so ${libdir}/xtables/libxt_REDIRECT.so" ALLOW_EMPTY:${PN}-modules = "1" |