[PR PATCH]  iwd: update to 1.10.

[PR PATCH]  iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

There is a new pull request by pbui against master on the void-packages repository

https://github.com/pbui/void-packages iwd
https://github.com/void-linux/void-packages/pull/26824

 iwd: update to 1.10.
- Built for x86_64, x86_64-musl.
- Tested on x86_64 with WPA2 network.

- Added new patches to ell to make it build for musl.
- Removed dhcp-fix patch (included upstream)


A patch file from https://github.com/void-linux/void-packages/pull/26824.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iwd-26824.patch --]
[-- Type: text/x-diff, Size: 5631 bytes --]

From d007daee0b8d4e5d00fc83259fa5fddd6803e621 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Nov 2020 09:12:34 -0500
Subject: [PATCH 1/2] ell: update to 0.35.

---
 srcpkgs/ell/patches/musl-rawmemchr.patch      | 14 ++++++
 .../ell/patches/musl-use-stdint-types.patch   | 44 +++++++++++++++++++
 srcpkgs/ell/template                          |  4 +-
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ell/patches/musl-rawmemchr.patch
 create mode 100644 srcpkgs/ell/patches/musl-use-stdint-types.patch

diff --git a/srcpkgs/ell/patches/musl-rawmemchr.patch b/srcpkgs/ell/patches/musl-rawmemchr.patch
new file mode 100644
index 00000000000..e6c8e7bc9ea
--- /dev/null
+++ b/srcpkgs/ell/patches/musl-rawmemchr.patch
@@ -0,0 +1,14 @@
+--- ell/pem.c.orig	2020-11-30 09:02:25.583791998 -0500
++++ ell/pem.c	2020-11-30 09:03:23.548913496 -0500
+@@ -224,7 +224,11 @@
+ 
+ 		/* Check that each header line has a key and a colon */
+ 		while (start < end) {
++#if defined(__GLIBC__)
+ 			const char *lf = rawmemchr(start, '\n');
++#else
++			const char *lf = memchr(start, '\n', end - start);
++#endif
+ 			const char *colon = memchr(start, ':', lf - start);
+ 
+ 			if (!colon)
diff --git a/srcpkgs/ell/patches/musl-use-stdint-types.patch b/srcpkgs/ell/patches/musl-use-stdint-types.patch
new file mode 100644
index 00000000000..0ea7475ab8b
--- /dev/null
+++ b/srcpkgs/ell/patches/musl-use-stdint-types.patch
@@ -0,0 +1,44 @@
+--- ell/dhcp6-private.h.orig	2020-11-30 08:48:22.817008408 -0500
++++ ell/dhcp6-private.h	2020-11-30 08:48:43.971053954 -0500
+@@ -61,7 +61,7 @@
+ };
+ 
+ struct duid {
+-	__be16 type;
++	uint16_t type;
+ 	uint8_t identifier[];
+ } __attribute__ ((packed));
+ 
+@@ -69,7 +69,7 @@
+ struct dhcp6_message {
+ 	union {
+ 		uint8_t msg_type;
+-		__be32 transaction_id;
++		uint32_t transaction_id;
+ 	};
+ 	uint8_t options[];
+ } __attribute__ ((packed));
+--- ell/dhcp-private.h.orig	2020-11-30 08:47:14.968862313 -0500
++++ ell/dhcp-private.h	2020-11-30 08:47:56.632952028 -0500
+@@ -72,9 +72,9 @@
+ 	uint8_t htype;
+ 	uint8_t hlen;
+ 	uint8_t hops;
+-	__be32 xid;
+-	__be16 secs;
+-	__be16 flags;
++	uint32_t xid;
++	uint16_t secs;
++	uint16_t flags;
+ 	uint32_t ciaddr;
+ 	uint32_t yiaddr;
+ 	uint32_t siaddr;
+@@ -82,7 +82,7 @@
+ 	uint8_t chaddr[16];
+ 	uint8_t sname[64];
+ 	uint8_t file[128];
+-	__be32 magic;
++	uint32_t magic;
+ 	uint8_t options[0];
+ } __attribute__ ((packed));
+ 
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index bdf4f40c3b2..af209cf8cc1 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,6 +1,6 @@
 # Template file for 'ell'
 pkgname=ell
-version=0.33
+version=0.35
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
@@ -11,7 +11,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d9e40e641164150394b74b719b9726fc734f24b2cde679cf5f3be6915c34eded
+checksum=2bfe9da7781f65f1cb1595a5a068a3ae74d4b68b74f287c6f0c892cfe623913f
 
 ell-devel_package() {
 	depends="ell-${version}_${revision}"

From 2c30ae0ad2209b000c626c0e926b32ee9e4e4dbb Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Nov 2020 09:18:12 -0500
Subject: [PATCH 2/2] iwd: update to 1.10.

---
 srcpkgs/iwd/patches/dhcp-fix.patch | 32 ------------------------------
 srcpkgs/iwd/template               |  6 +++---
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/iwd/patches/dhcp-fix.patch

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 <denkenz@gmail.com>
-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/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"

Re: [PR REVIEW] iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 278 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532636879

Comment:
I'd just use `memchr`, any performance gain here is insignificant. This should be upstreamed as well, let me know if you can do it.

Re: [PR REVIEW] iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 253 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532639607

Comment:
Same for this one, would be nice to upstream it (or report the issue and get suggestions on how to solve).

Re: [PR REVIEW] iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532640123

Comment:
Assuming they aren't including any `linux/` headers, they only have these types available because glibc is leaky, and really shouldn't count on them...

Re: iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]

New comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#issuecomment-735824608

Comment:
@ericonr I probably don't have time to look into getting these upstreamed... so if you can do that then that would be great.

Re: iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#issuecomment-735827412

Comment:
Will do! On another matter, tested on x86_64-musl with WPA2 network.

Re: [PR REVIEW] iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

New review comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532661455

Comment:
Note we have an existing patch for `iwd` that uses `rawmemchr` for glibc and `memchr` for musl.  I just followed that convention (I am fine with just using `memchr` unconditionally).

Re: [PR REVIEW] iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532756196

Comment:
Huh, I hadn't noticed that one. Feel free to remove it, they added a fallback in IWD for missing rawmemchr, but forgot to add one in ELL.

Re: [PR REVIEW] iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 467 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532756553

Comment:
@pbui use

```
diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c
index c983ed4..144e83e 100644
--- ell/dhcp-server.c
+++ ell/dhcp-server.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <linux/types.h>
 #include <net/ethernet.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
```

instead

Re: [PR PATCH] [Updated] iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

There is an updated pull request by pbui against master on the void-packages repository

https://github.com/pbui/void-packages iwd
https://github.com/void-linux/void-packages/pull/26824

iwd: update to 1.10.
- Built for x86_64, x86_64-musl.
- Tested on x86_64 with WPA2 network.

- Added new patches to ell to make it build for musl.
- Removed dhcp-fix patch (included upstream)


A patch file from https://github.com/void-linux/void-packages/pull/26824.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iwd-26824.patch --]
[-- Type: text/x-diff, Size: 5806 bytes --]

From 6d29cc32471e74f098fe14f84c970d1cb0c19462 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Nov 2020 09:12:34 -0500
Subject: [PATCH 1/2] ell: update to 0.35.

- Add patch to replace rawmemchr with memchar for musl
- Add patch to include linux/types.h for __be16 and __be32 types
---
 srcpkgs/ell/patches/linux-types.patch    | 10 ++++++++++
 srcpkgs/ell/patches/musl-rawmemchr.patch | 14 ++++++++++++++
 srcpkgs/ell/template                     |  4 ++--
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ell/patches/linux-types.patch
 create mode 100644 srcpkgs/ell/patches/musl-rawmemchr.patch

diff --git a/srcpkgs/ell/patches/linux-types.patch b/srcpkgs/ell/patches/linux-types.patch
new file mode 100644
index 00000000000..a3b6baa3cef
--- /dev/null
+++ b/srcpkgs/ell/patches/linux-types.patch
@@ -0,0 +1,10 @@
+--- ell/dhcp-server.c.orig	2020-11-30 12:16:40.821110152 -0500
++++ ell/dhcp-server.c	2020-11-30 12:16:55.123140621 -0500
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <linux/types.h>
+ #include <net/ethernet.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
diff --git a/srcpkgs/ell/patches/musl-rawmemchr.patch b/srcpkgs/ell/patches/musl-rawmemchr.patch
new file mode 100644
index 00000000000..e6c8e7bc9ea
--- /dev/null
+++ b/srcpkgs/ell/patches/musl-rawmemchr.patch
@@ -0,0 +1,14 @@
+--- ell/pem.c.orig	2020-11-30 09:02:25.583791998 -0500
++++ ell/pem.c	2020-11-30 09:03:23.548913496 -0500
+@@ -224,7 +224,11 @@
+ 
+ 		/* Check that each header line has a key and a colon */
+ 		while (start < end) {
++#if defined(__GLIBC__)
+ 			const char *lf = rawmemchr(start, '\n');
++#else
++			const char *lf = memchr(start, '\n', end - start);
++#endif
+ 			const char *colon = memchr(start, ':', lf - start);
+ 
+ 			if (!colon)
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index bdf4f40c3b2..af209cf8cc1 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,6 +1,6 @@
 # Template file for 'ell'
 pkgname=ell
-version=0.33
+version=0.35
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
@@ -11,7 +11,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d9e40e641164150394b74b719b9726fc734f24b2cde679cf5f3be6915c34eded
+checksum=2bfe9da7781f65f1cb1595a5a068a3ae74d4b68b74f287c6f0c892cfe623913f
 
 ell-devel_package() {
 	depends="ell-${version}_${revision}"

From c866aba3158d5b8a99531bbc7c5afbd8d656c10b Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Nov 2020 09:18:12 -0500
Subject: [PATCH 2/2] iwd: update to 1.10.

- Drop unnecessary musl-rawmemchr patch.
---
 srcpkgs/iwd/patches/dhcp-fix.patch       | 32 ------------------------
 srcpkgs/iwd/patches/musl-rawmemchr.patch | 14 -----------
 srcpkgs/iwd/template                     |  6 ++---
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/iwd/patches/dhcp-fix.patch
 delete mode 100644 srcpkgs/iwd/patches/musl-rawmemchr.patch

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 <denkenz@gmail.com>
-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"

Re: [PR REVIEW] iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

New review comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532766449

Comment:
OK, I have removed the match from iwd.

Re: [PR REVIEW] iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

New review comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532766767

Comment:
Ah, I had thought of that... I've updated the patch to do this instead of modifying the headers.

Re: [PR REVIEW] iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

New review comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532766449

Comment:
OK, I have removed the patch from iwd (but kept the one in ell for now).

Re: iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 967 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#issuecomment-735993589

Comment:
Please apply

```diff
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index af209cf8cc..427104e5e1 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-glib"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
+checkdepends="dbus"
 short_desc="Linux library for embedded development"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-only"
@@ -13,6 +14,10 @@ homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=2bfe9da7781f65f1cb1595a5a068a3ae74d4b68b74f287c6f0c892cfe623913f
 
+do_check() {
+	dbus-run-session make check
+}
+
 ell-devel_package() {
 	depends="ell-${version}_${revision}"
 	short_desc+=" - development files"
```

Re: [PR PATCH] [Updated] iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

There is an updated pull request by pbui against master on the void-packages repository

https://github.com/pbui/void-packages iwd
https://github.com/void-linux/void-packages/pull/26824

iwd: update to 1.10.
- Built for x86_64, x86_64-musl.
- Tested on x86_64 with WPA2 network.

- Added new patches to ell to make it build for musl.
- Removed dhcp-fix patch (included upstream)


A patch file from https://github.com/void-linux/void-packages/pull/26824.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iwd-26824.patch --]
[-- Type: text/x-diff, Size: 6004 bytes --]

From c09586dca2c5be5432c3f05ea3c97f3db29e242f Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Nov 2020 09:12:34 -0500
Subject: [PATCH 1/2] ell: update to 0.35.

- Add patch to replace rawmemchr with memchar for musl
- Add patch to include linux/types.h for __be16 and __be32 types
- Add checking capability
---
 srcpkgs/ell/patches/linux-types.patch    | 10 ++++++++++
 srcpkgs/ell/patches/musl-rawmemchr.patch | 14 ++++++++++++++
 srcpkgs/ell/template                     |  9 +++++++--
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ell/patches/linux-types.patch
 create mode 100644 srcpkgs/ell/patches/musl-rawmemchr.patch

diff --git a/srcpkgs/ell/patches/linux-types.patch b/srcpkgs/ell/patches/linux-types.patch
new file mode 100644
index 00000000000..a3b6baa3cef
--- /dev/null
+++ b/srcpkgs/ell/patches/linux-types.patch
@@ -0,0 +1,10 @@
+--- ell/dhcp-server.c.orig	2020-11-30 12:16:40.821110152 -0500
++++ ell/dhcp-server.c	2020-11-30 12:16:55.123140621 -0500
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <linux/types.h>
+ #include <net/ethernet.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
diff --git a/srcpkgs/ell/patches/musl-rawmemchr.patch b/srcpkgs/ell/patches/musl-rawmemchr.patch
new file mode 100644
index 00000000000..e6c8e7bc9ea
--- /dev/null
+++ b/srcpkgs/ell/patches/musl-rawmemchr.patch
@@ -0,0 +1,14 @@
+--- ell/pem.c.orig	2020-11-30 09:02:25.583791998 -0500
++++ ell/pem.c	2020-11-30 09:03:23.548913496 -0500
+@@ -224,7 +224,11 @@
+ 
+ 		/* Check that each header line has a key and a colon */
+ 		while (start < end) {
++#if defined(__GLIBC__)
+ 			const char *lf = rawmemchr(start, '\n');
++#else
++			const char *lf = memchr(start, '\n', end - start);
++#endif
+ 			const char *colon = memchr(start, ':', lf - start);
+ 
+ 			if (!colon)
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index bdf4f40c3b2..427104e5e16 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,17 +1,22 @@
 # Template file for 'ell'
 pkgname=ell
-version=0.33
+version=0.35
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
+checkdepends="dbus"
 short_desc="Linux library for embedded development"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d9e40e641164150394b74b719b9726fc734f24b2cde679cf5f3be6915c34eded
+checksum=2bfe9da7781f65f1cb1595a5a068a3ae74d4b68b74f287c6f0c892cfe623913f
+
+do_check() {
+	dbus-run-session make check
+}
 
 ell-devel_package() {
 	depends="ell-${version}_${revision}"

From 3c22e9b93d212b2e3e478ff78c3f13fdc77a3b2c Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Nov 2020 09:18:12 -0500
Subject: [PATCH 2/2] iwd: update to 1.10.

- Drop unnecessary musl-rawmemchr patch.
---
 srcpkgs/iwd/patches/dhcp-fix.patch       | 32 ------------------------
 srcpkgs/iwd/patches/musl-rawmemchr.patch | 14 -----------
 srcpkgs/iwd/template                     |  6 ++---
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/iwd/patches/dhcp-fix.patch
 delete mode 100644 srcpkgs/iwd/patches/musl-rawmemchr.patch

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 <denkenz@gmail.com>
-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"

Re: iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#issuecomment-735998927

Comment:
@ericonr Ok, applied.

Re: [PR REVIEW] iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 372 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532885220

Comment:
If you want, leave a comment that next release fixes this (there's an upstream commit too, if you'd like to cherry-pick it: https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81 )

Re: iwd: update to 1.10.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 884 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#issuecomment-736064043

Comment:
This release totally breaks stateless autoconfig for IPv6. With 1.9, `iwd` ignored IPv6, so the kernel was able to use its built-in SLAAC mechanism to configure IPv6 when router advertisements were received. With the new "support", `iwd` unconditionally disabled router advertisement receipts by setting the `net.ipv6.conf.<interface>.accept_ra=0` sysctl. Furthermore, unless `EnableIPv6=true` or `EnableNetworkConfiguration=false` in the `main.conf` for `iwd`, it will also set `net.ipv6.conf.<interface>.disable_ipv6=0`.

I have not been able to restore old in-kernel IPv6 behavior, so the only way I can get SLAAC with this version of `iwd` is to force `EnableNetworkConfiguration=false` and fall back to `dhcpcd` for address assignment.

Re: [PR PATCH] [Updated] iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

There is an updated pull request by pbui against master on the void-packages repository

https://github.com/pbui/void-packages iwd
https://github.com/void-linux/void-packages/pull/26824

iwd: update to 1.10.
- Built for x86_64, x86_64-musl.
- Tested on x86_64 with WPA2 network.

- Added new patches to ell to make it build for musl.
- Removed dhcp-fix patch (included upstream)


A patch file from https://github.com/void-linux/void-packages/pull/26824.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iwd-26824.patch --]
[-- Type: text/x-diff, Size: 6199 bytes --]

From a97dad4c04eed19360a8b9bfe980e1aba55a8c21 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Nov 2020 09:12:34 -0500
Subject: [PATCH 1/2] ell: update to 0.35.

- Add temporary patch to replace rawmemchr with memchar for musl
- Add patch to include linux/types.h for __be16 and __be32 types
- Add checking capability
---
 srcpkgs/ell/patches/linux-types.patch    | 10 ++++++++++
 srcpkgs/ell/patches/musl-rawmemchr.patch | 18 ++++++++++++++++++
 srcpkgs/ell/template                     |  9 +++++++--
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ell/patches/linux-types.patch
 create mode 100644 srcpkgs/ell/patches/musl-rawmemchr.patch

diff --git a/srcpkgs/ell/patches/linux-types.patch b/srcpkgs/ell/patches/linux-types.patch
new file mode 100644
index 00000000000..a3b6baa3cef
--- /dev/null
+++ b/srcpkgs/ell/patches/linux-types.patch
@@ -0,0 +1,10 @@
+--- ell/dhcp-server.c.orig	2020-11-30 12:16:40.821110152 -0500
++++ ell/dhcp-server.c	2020-11-30 12:16:55.123140621 -0500
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <linux/types.h>
+ #include <net/ethernet.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
diff --git a/srcpkgs/ell/patches/musl-rawmemchr.patch b/srcpkgs/ell/patches/musl-rawmemchr.patch
new file mode 100644
index 00000000000..8bbe4f5236b
--- /dev/null
+++ b/srcpkgs/ell/patches/musl-rawmemchr.patch
@@ -0,0 +1,18 @@
+This will be addressed in the next upstream release (>1.10) as shown here:
+
+https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81
+
+--- ell/pem.c.orig	2020-11-30 09:02:25.583791998 -0500
++++ ell/pem.c	2020-11-30 09:03:23.548913496 -0500
+@@ -224,7 +224,11 @@
+ 
+ 		/* Check that each header line has a key and a colon */
+ 		while (start < end) {
++#if defined(__GLIBC__)
+ 			const char *lf = rawmemchr(start, '\n');
++#else
++			const char *lf = memchr(start, '\n', end - start);
++#endif
+ 			const char *colon = memchr(start, ':', lf - start);
+ 
+ 			if (!colon)
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index bdf4f40c3b2..427104e5e16 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,17 +1,22 @@
 # Template file for 'ell'
 pkgname=ell
-version=0.33
+version=0.35
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
+checkdepends="dbus"
 short_desc="Linux library for embedded development"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=d9e40e641164150394b74b719b9726fc734f24b2cde679cf5f3be6915c34eded
+checksum=2bfe9da7781f65f1cb1595a5a068a3ae74d4b68b74f287c6f0c892cfe623913f
+
+do_check() {
+	dbus-run-session make check
+}
 
 ell-devel_package() {
 	depends="ell-${version}_${revision}"

From e1a04a7fc6d419d54dd466311b2e5c6a3fcaa481 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Mon, 30 Nov 2020 09:18:12 -0500
Subject: [PATCH 2/2] iwd: update to 1.10.

- Drop unnecessary musl-rawmemchr patch.
---
 srcpkgs/iwd/patches/dhcp-fix.patch       | 32 ------------------------
 srcpkgs/iwd/patches/musl-rawmemchr.patch | 14 -----------
 srcpkgs/iwd/template                     |  6 ++---
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/iwd/patches/dhcp-fix.patch
 delete mode 100644 srcpkgs/iwd/patches/musl-rawmemchr.patch

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 <denkenz@gmail.com>
-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"

Re: [PR REVIEW] iwd: update to 1.10.

[pbui]

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

New review comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532961406

Comment:
Ok, I've made a note in the current patch.  

I did not cherry-pick upstream's change because I believe I would also need to run autotools (autoconf) a pre_configure hook to make it go into effect (changes modify configure.ac but not configure) and don't feel it is that necessary.  Please correct me if I am wrong.

Re: [PR REVIEW] iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#discussion_r532967199

Comment:
Sounds good to me, thanks :)

Re: iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#issuecomment-736833112

Comment:
About the ipv6 issues:

```
@denkenz | yes, that was expected
@denkenz | iwd with network config enabled was only managing ipv4 and the fact that ipv6 was done by the kernel was semi-unintentional
@denkenz | we now want to do ipv6 as well, but SLAAC is still TODO
ericonr | also, are there any possible workarounds?
@denkenz | besides disabling EnableNetworkConfiguration, not really
@denkenz | Or just enable DHCPv6 on the router and become a beta-tester ;)
```

Re: iwd: update to 1.10.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 405 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/26824#issuecomment-736888459

Comment:
It might have been nice if, knowing SLAAC was broken and IPv6 is a new addition, `EnableIPv6=false` would just ignore IPv6 rather than actively disable it.

I'm back to `dhcpcd` for now, so broken IPv6 here is an annoyance but not a blocker from my perspective.

Re: [PR PATCH] [Merged]: iwd: update to 1.10.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

There's a merged pull request on the void-packages repository

iwd: update to 1.10.
https://github.com/void-linux/void-packages/pull/26824

Description:
- Built for x86_64, x86_64-musl.
- Tested on x86_64 with WPA2 network.

- Added new patches to ell to make it build for musl.
- Removed dhcp-fix patch (included upstream)