From: Peter Seiderer <ps.report@gmx.net>
Date: Mon, 22 Feb 2021 22:08:01 +0000 (+0100)
Subject: package/ell: bump version to 0.38
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=24575ad614fecc50bfa2c3d586104f7134a46770;p=buildroot.git

package/ell: bump version to 0.38

- remove 0001-build-Add-rawmemchr-to-missing.h.patch
  (upstream [1])

- remove 0002-ell-add-missing-include-in-dhcp-server.patch
  (upstream [2])

[1] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81
[2] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=6dfff19d4716ba216de1a3298ed0f667d7782810

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch b/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch
deleted file mode 100644
index 3e00023001..0000000000
--- a/package/ell/0001-build-Add-rawmemchr-to-missing.h.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3916c1cc32be205e185a8a56de5cde1b9ec60e81 Mon Sep 17 00:00:00 2001
-From: Denis Kenzior <denkenz@gmail.com>
-Date: Mon, 30 Nov 2020 13:00:11 -0600
-Subject: [PATCH] build: Add rawmemchr to missing.h
-
-For those systems (i.e. musl) that do not support this
-
-[Upstream: https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=3916c1cc32be205e185a8a56de5cde1b9ec60e81]
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- configure.ac  |  1 +
- ell/missing.h | 10 ++++++++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 1e5ead9..f34add1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -98,6 +98,7 @@ AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan],
- ])
- 
- AC_CHECK_FUNCS(explicit_bzero)
-+AC_CHECK_FUNCS(rawmemchr)
- 
- AC_CHECK_FUNC(signalfd, dummy=yes,
- 			AC_MSG_ERROR(signalfd support is required))
-diff --git a/ell/missing.h b/ell/missing.h
-index 6b9b0fd..2a3e647 100644
---- a/ell/missing.h
-+++ b/ell/missing.h
-@@ -67,3 +67,13 @@ static inline void explicit_bzero(void *s, size_t n)
- #ifndef SO_BINDTOIFINDEX
- #define SO_BINDTOIFINDEX 62
- #endif
-+
-+#ifndef HAVE_RAWMEMCHR
-+static inline void *rawmemchr(const void *s, int c)
-+{
-+_Pragma("GCC diagnostic push")
-+_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"")
-+	return memchr(s, c, (size_t) -1);
-+_Pragma("GCC diagnostic pop")
-+}
-+#endif
--- 
-2.29.2
-
diff --git a/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch b/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch
deleted file mode 100644
index a2ac7b0965..0000000000
--- a/package/ell/0002-ell-add-missing-include-in-dhcp-server.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6dfff19d4716ba216de1a3298ed0f667d7782810 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <ericonr@disroot.org>
-Date: Mon, 30 Nov 2020 18:40:33 -0300
-Subject: [PATCH] ell: add missing include in dhcp-server.
-
-[Upstream: https://git.kernel.org/pub/scm/libs/ell/ell.git/patch/?id=6dfff19d4716ba216de1a3298ed0f667d7782810]
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- ell/dhcp-server.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c
-index c983ed4..144e83e 100644
---- a/ell/dhcp-server.c
-+++ b/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>
--- 
-2.29.2
-
diff --git a/package/ell/ell.hash b/package/ell/ell.hash
index efd39b31db..cbefd79bb8 100644
--- a/package/ell/ell.hash
+++ b/package/ell/ell.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256  c2b3848568c75bcf5a0e7d1f2efce4fdb2733d28226ed21c6a6542f0be05d784  ell-0.35-br1.tar.gz
+sha256  7767306f20db41c28b3138b5323bca05fef92238b6b61f81f66c2af684a13886  ell-0.38-br1.tar.gz
 
 # License files
 sha256  ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5  COPYING
diff --git a/package/ell/ell.mk b/package/ell/ell.mk
index 8aec067bc0..18f1cf2aac 100644
--- a/package/ell/ell.mk
+++ b/package/ell/ell.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ELL_VERSION = 0.35
+ELL_VERSION = 0.38
 ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git
 ELL_SITE_METHOD = git
 ELL_LICENSE = LGPL-2.1+