From 6dd8c08b3476097b764bfcf43faaa634211f781e Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Thu, 7 Jan 2021 12:07:21 -0500 Subject: [PATCH] ell: update to 0.36. - Drop musl-rawmemchr patch. - Make @ericon maintainer. --- srcpkgs/ell/patches/linux-types.patch | 10 ---------- srcpkgs/ell/patches/musl-rawmemchr.patch | 18 ------------------ srcpkgs/ell/template | 11 +++++++---- 3 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/ell/patches/linux-types.patch delete mode 100644 srcpkgs/ell/patches/musl-rawmemchr.patch diff --git a/srcpkgs/ell/patches/linux-types.patch b/srcpkgs/ell/patches/linux-types.patch deleted file mode 100644 index a3b6baa3cef..00000000000 --- a/srcpkgs/ell/patches/linux-types.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 8bbe4f5236b..00000000000 --- a/srcpkgs/ell/patches/musl-rawmemchr.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 427104e5e16..a221184180e 100644 --- a/srcpkgs/ell/template +++ b/srcpkgs/ell/template @@ -1,6 +1,6 @@ # Template file for 'ell' pkgname=ell -version=0.35 +version=0.36 revision=1 build_style=gnu-configure configure_args="--enable-glib" @@ -8,14 +8,17 @@ hostmakedepends="pkg-config" makedepends="libglib-devel" checkdepends="dbus" short_desc="Linux library for embedded development" -maintainer="Peter Bui " +maintainer="Érico Nogueira " license="GPL-2.0-only" homepage="https://01.org/ell" distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=2bfe9da7781f65f1cb1595a5a068a3ae74d4b68b74f287c6f0c892cfe623913f +checksum=2f99e743a235b1c834b19112e4e0283d02da93b863899381466cde47bf159cf6 do_check() { - dbus-run-session make check + if [ "$XBPS_CHECK_PKGS" = full]; then + # tests depend on kernel features + dbus-run-session make check + fi } ell-devel_package() {