summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/ell/ell
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-12-26 10:27:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-31 11:56:41 +0000
commit9535f14f1b415bd4ccff1ec38bb07d9f52962a29 (patch)
tree2c0451560a172a9318b35264063b28b71f1995a8 /meta/recipes-core/ell/ell
parentbcbbd13c636742a91dd0df12fbdf408f2f8b3a02 (diff)
downloadpoky-9535f14f1b415bd4ccff1ec38bb07d9f52962a29.tar.gz
ell: upgrade 0.33 -> 0.35
(From OE-Core rev: 69952f5bf247fc42103a249a48213017f50e319d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ell/ell')
-rw-r--r--meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch23
-rw-r--r--meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch27
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch b/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch
new file mode 100644
index 0000000000..2460d26bdc
--- /dev/null
+++ b/meta/recipes-core/ell/ell/0001-ell-add-missing-include-in-dhcp-server.patch
@@ -0,0 +1,23 @@
1From dd350f4e2258b5a638bc8fb26a6193147902d292 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?=C3=89rico=20Nogueira?= <ericonr@disroot.org>
3Date: Mon, 30 Nov 2020 18:40:33 -0300
4Subject: [PATCH] ell: add missing include in dhcp-server.
5
6Upstream-Status: Backport
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 ell/dhcp-server.c | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/ell/dhcp-server.c b/ell/dhcp-server.c
13index c983ed4..144e83e 100644
14--- a/ell/dhcp-server.c
15+++ b/ell/dhcp-server.c
16@@ -24,6 +24,7 @@
17 #include <config.h>
18 #endif
19
20+#include <linux/types.h>
21 #include <net/ethernet.h>
22 #include <sys/socket.h>
23 #include <arpa/inet.h>
diff --git a/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch b/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch
new file mode 100644
index 0000000000..f0ce6f1364
--- /dev/null
+++ b/meta/recipes-core/ell/ell/0001-pem.c-do-not-use-rawmemchr.patch
@@ -0,0 +1,27 @@
1From 277e1eca67fcc23cb31be7b826d83a19d9b89bd2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 22 Dec 2020 10:30:54 +0000
4Subject: [PATCH] pem.c: do not use rawmemchr()
5
6This is a glibc-only function, and causes build failures with
7alternative libc implementations such as musl.
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 ell/pem.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/ell/pem.c b/ell/pem.c
16index 790f2c2..237ae02 100644
17--- a/ell/pem.c
18+++ b/ell/pem.c
19@@ -224,7 +224,7 @@ static uint8_t *pem_load_buffer(const void *buf, size_t buf_len,
20
21 /* Check that each header line has a key and a colon */
22 while (start < end) {
23- const char *lf = rawmemchr(start, '\n');
24+ const char *lf = memchr(start, '\n', end - start);
25 const char *colon = memchr(start, ':', lf - start);
26
27 if (!colon)