From db5c3d26ab6908b1e2f26b6eae96ef8e550f56c8 Mon Sep 17 00:00:00 2001 From: DaErich Date: Thu, 16 Sep 2021 22:05:35 +0200 Subject: [PATCH] iwd: update to 1.18 --- ...fig_Remove_usage_of_in6_addr.__in6_u.patch | 30 +++++++++++++++++++ srcpkgs/iwd/template | 4 +-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/iwd/patches/netconfig_Remove_usage_of_in6_addr.__in6_u.patch diff --git a/srcpkgs/iwd/patches/netconfig_Remove_usage_of_in6_addr.__in6_u.patch b/srcpkgs/iwd/patches/netconfig_Remove_usage_of_in6_addr.__in6_u.patch new file mode 100644 index 0000000000..99371ca3bb --- /dev/null +++ b/srcpkgs/iwd/patches/netconfig_Remove_usage_of_in6_addr.__in6_u.patch @@ -0,0 +1,30 @@ +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. +--- + src/netconfig.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +(limited to 'src/netconfig.c') + +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/srcpkgs/iwd/template b/srcpkgs/iwd/template index 34a8902383..d55ea04bd4 100644 --- a/srcpkgs/iwd/template +++ b/srcpkgs/iwd/template @@ -1,6 +1,6 @@ # Template file for 'iwd' pkgname=iwd -version=1.17 +version=1.18 revision=1 build_style=gnu-configure configure_args="--disable-systemd-service --enable-pie @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://iwd.wiki.kernel.org/" changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog" distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz" -checksum=6f946f823b0dc3205e4e72becf8ad1915448d194f5b10d8003e4c8c5a18e4ef7 +checksum=0225ab81579f027e0fcbf255517f432fcf355d14f3645c36813c71a441dfab55 make_dirs="/var/lib/iwd 0600 root root /var/lib/ead 0600 root root /etc/iwd 755 root root"