From 6d29cc32471e74f098fe14f84c970d1cb0c19462 Mon Sep 17 00:00:00 2001 From: Peter Bui 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 + #endif + ++#include + #include + #include + #include 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 " 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 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 -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"