diff --git a/srcpkgs/iwd/patches/dhcp-fix.patch b/srcpkgs/iwd/patches/dhcp-fix.patch deleted file mode 100644 index e3213323c30..00000000000 --- a/srcpkgs/iwd/patches/dhcp-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 974ceb60c946b8b0183875131464335f91e9d6de Mon Sep 17 00:00:00 2001 -From: Denis Kenzior -Date: Tue, 29 Sep 2020 16:09:31 -0500 -Subject: dhcp: Allow DOMAIN_NAME options with trailing NULL - ---- - ell/dhcp-lease.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/ell/dhcp-lease.c b/ell/dhcp-lease.c -index e93c618..ac90c6a 100644 ---- ell/dhcp-lease.c -+++ ell/dhcp-lease.c -@@ -111,6 +111,15 @@ struct l_dhcp_lease *_dhcp_lease_parse_options(struct dhcp_message_iter *iter) - if (memchr(v, 0, l - 1)) - goto error; - -+ /* -+ * RFC2132 doesn't say whether ending NULLs are present -+ * or not. However, section 2 recommends that trailing -+ * NULLs should not be used but must not be treated -+ * as an error -+ */ -+ if (l_get_u8(v + l - 1) == 0) -+ l -= 1; -+ - if (!l_utf8_validate(v, l, NULL)) - goto error; - --- -cgit 1.2.3-1.el7 - diff --git a/srcpkgs/iwd/patches/musl-rawmemchr.patch b/srcpkgs/iwd/patches/musl-rawmemchr.patch deleted file mode 100644 index 9b027bc7028..00000000000 --- a/srcpkgs/iwd/patches/musl-rawmemchr.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/wiphy.c.orig 2019-11-16 09:09:02.009699886 -0500 -+++ src/wiphy.c 2019-11-16 09:25:25.188776792 -0500 -@@ -500,7 +500,11 @@ - - if (out_num) - *out_num = -+#if defined(__GLIBC__) - (uint8_t *) rawmemchr(wiphy->supported_rates[band], 0) - -+#else -+ (uint8_t *) memchr(wiphy->supported_rates[band], 0, SIZE_MAX) - -+#endif - wiphy->supported_rates[band]; - - return wiphy->supported_rates[band]; diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template index c147de23de8..aa7e24ffb1d 100644 --- a/srcpkgs/iwd/template +++ b/srcpkgs/iwd/template @@ -1,7 +1,7 @@ # Template file for 'iwd' pkgname=iwd -version=1.9 -revision=3 +version=1.10 +revision=1 build_style=gnu-configure configure_args="--disable-systemd-service --enable-pie --enable-external-ell --enable-dbus-policy --enable-wired" @@ -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=1e6803885280da343805ad9997d604e1719c434266b83f1afffe210d55dfaea9 +checksum=94781d7435f1822dd55ae6abe8091e04db4c69abd2e800669981a1a75512e463 make_dirs="/var/lib/iwd 0600 root root /var/lib/ead 0600 root root /etc/iwd 755 root root"