From ff0d53405157ce82f6b56c74654c75c07b9ce92d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 8 Nov 2021 23:29:02 +0100 Subject: [PATCH] package/iwd: bump version to 1.19 - removed 0001-build-Add-reallocarray-to-missing-h.patch (from upstream [1]) - removed 0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch (from upstream [2]) - Changelog (since 1.18, from [3]): ver 1.19: Fix issue with handling OCV if offloading is supported. Fix issue with handling SA Query on channel switch event. Fix issue with starting FT-over-DS actions after roaming. Add support for OWE transition networks. Add support for extended key IDs. [1] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=ec1c348b4fd67619fa0c2f55ae644f6a8014d971 [2] https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7 [3] https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...-build-Add-reallocarray-to-missing-h.patch | 55 ------------------- ...nfig-Remove-usage-of-in6_addr__in6_u.patch | 32 ----------- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 4 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 package/iwd/0001-build-Add-reallocarray-to-missing-h.patch delete mode 100644 package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch diff --git a/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch b/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch deleted file mode 100644 index ef6114f1af..0000000000 --- a/package/iwd/0001-build-Add-reallocarray-to-missing-h.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ec1c348b4fd67619fa0c2f55ae644f6a8014d971 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Sep 2021 21:17:44 +0200 -Subject: build: Add reallocarray to missing.h - -reallocarray has been added to glibc relatively recently (version 2.26, -from 2017) and apparently not all users run new enough glibc. Moreover, -reallocarray is not available with uclibc-ng. So use realloc if -reallocarray is not available to avoid the following build failure -raised since commit 891b78e9e892a3bcd800eb3a298e6380e9a15dd1: - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/10.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: src/sae.o: in function `sae_rx_authenticate': -sae.c:(.text+0xd74): undefined reference to `reallocarray' - -Fixes: - - http://autobuild.buildroot.org/results/c6d3f86282c44645b4f1c61882dc63ccfc8eb35a - -[Retrieved from: -https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=ec1c348b4fd67619fa0c2f55ae644f6a8014d971] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 1 + - src/missing.h | 7 +++++++ - 2 files changed, 8 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c6250401..51d9da93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,6 +129,7 @@ AC_DEFINE_UNQUOTED(WIRED_STORAGEDIR, "${wired_storagedir}", - - AC_CHECK_FUNCS(explicit_bzero) - AC_CHECK_FUNCS(rawmemchr) -+AC_CHECK_FUNCS(reallocarray) - - AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) - -diff --git a/src/missing.h b/src/missing.h -index 2cc80aee..a5b92952 100644 ---- a/src/missing.h -+++ b/src/missing.h -@@ -37,3 +37,10 @@ _Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"") - _Pragma("GCC diagnostic pop") - } - #endif -+ -+#ifndef HAVE_REALLOCARRAY -+static inline void *reallocarray(void *ptr, size_t nmemb, size_t size) -+{ -+ return realloc(ptr, nmemb * size); -+} -+#endif --- -cgit 1.2.3-1.el7 - diff --git a/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch b/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch deleted file mode 100644 index f6b3d24516..0000000000 --- a/package/iwd/0002-netconfig-Remove-usage-of-in6_addr__in6_u.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7 Mon Sep 17 00:00:00 2001 -From: Andrew Zaborowski -Date: Thu, 16 Sep 2021 01:58:29 +0200 -Subject: netconfig: Remove usage of in6_addr.__in6_u - -in6_addr.__in6_u.__u6_addr8 is glibc-specific and named differently in -the headers shipped with musl libc for example. The POSIX compliant and -universal way of accessing it is in6_addr.s6_addr. - -[Retrieved from: -https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=42bd5ba7c2665c5bf95ba102a8115c4cf01d31d7] -Signed-off-by: Fabrice Fontaine ---- - src/netconfig.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/netconfig.c b/src/netconfig.c -index ce95db0b..421270c9 100644 ---- a/src/netconfig.c -+++ b/src/netconfig.c -@@ -171,7 +171,7 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr) - struct in6_addr in6_addr; - char *addr_str = l_malloc(INET6_ADDRSTRLEN); - -- memcpy(in6_addr.__in6_u.__u6_addr8, addr, 16); -+ memcpy(in6_addr.s6_addr, addr, 16); - - if (L_WARN_ON(unlikely(!inet_ntop(AF_INET6, &in6_addr, addr_str, - INET6_ADDRSTRLEN)))) { --- -cgit 1.2.3-1.el7 - diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 7c010ed891..008a2db011 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 0225ab81579f027e0fcbf255517f432fcf355d14f3645c36813c71a441dfab55 iwd-1.18.tar.xz +sha256 dd65a8795f6127fb1b9e29f2092686b0590a0d3738c2b90c792ccd320deaf966 iwd-1.19.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index 96bdc56e93..afa6e3bdeb 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.18 +IWD_VERSION = 1.19 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+