Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH]  iwd: update to 1.10.
@ 2020-11-30 14:25 pbui
  2020-11-30 14:33 ` [PR REVIEW] " ericonr
                   ` (22 more replies)
  0 siblings, 23 replies; 24+ messages in thread
From: pbui @ 2020-11-30 14:25 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 24+ messages in thread
end of thread, other threads:[~2020-12-01 23:40 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-30 14:25 [PR PATCH]  iwd: update to 1.10 pbui
2020-11-30 14:33 ` [PR REVIEW] " ericonr
2020-11-30 14:33 ` ericonr
2020-11-30 14:33 ` ericonr
2020-11-30 14:38 ` pbui
2020-11-30 14:42 ` ericonr
2020-11-30 15:01 ` [PR REVIEW] " pbui
2020-11-30 17:06 ` ericonr
2020-11-30 17:07 ` ericonr
2020-11-30 17:20 ` [PR PATCH] [Updated] " pbui
2020-11-30 17:21 ` [PR REVIEW] " pbui
2020-11-30 17:21 ` pbui
2020-11-30 17:22 ` pbui
2020-11-30 19:30 ` ericonr
2020-11-30 19:40 ` [PR PATCH] [Updated] " pbui
2020-11-30 19:40 ` pbui
2020-11-30 20:32 ` [PR REVIEW] " ericonr
2020-11-30 21:21 ` ahesford
2020-11-30 23:03 ` [PR PATCH] [Updated] " pbui
2020-11-30 23:06 ` [PR REVIEW] " pbui
2020-11-30 23:20 ` ericonr
2020-12-01 21:31 ` ericonr
2020-12-01 23:33 ` ahesford
2020-12-01 23:40 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).