summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-16 20:16:11 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-17 07:07:28 +0100
commit15070290a12aac444c6784d477186a553f29af82 (patch)
tree40fe6ff2e2f359924c138530e74e488d878a5d65 /meta/recipes-core/systemd/systemd
parent22943d76e87c063ee104aef645ce86d8e042514a (diff)
downloadpoky-15070290a12aac444c6784d477186a553f29af82.tar.gz
systemd: Disable idn properly for musl instead of NI_IDN workarounds
(From OE-Core rev: e9d132c25c7e1feca1d078b0891c0f4baba70f81) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch b/meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
deleted file mode 100644
index 1dedbd3b9b..0000000000
--- a/meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 6a2cadd6b70cb40ac74fc0d0f8557b914bd38ac2 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 2 Jul 2018 13:22:41 +0800
4Subject: [PATCH 09/24] socket-util: don't fail if libc doesn't support IDN
5
6Upstream-Status: Inappropriate [musl specific]
7
8Signed-off-by: Emil Renner Berthing <systemd@esmil.dk>
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
11---
12 src/basic/socket-util.c | 10 ++++++++++
13 1 file changed, 10 insertions(+)
14
15diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
16index 904bafb..a7a009d 100644
17--- a/src/basic/socket-util.c
18+++ b/src/basic/socket-util.c
19@@ -34,6 +34,16 @@
20 #include "user-util.h"
21 #include "utf8.h"
22
23+/* Don't fail if the standard library
24+ * doesn't support IDN */
25+#ifndef NI_IDN
26+#define NI_IDN 0
27+#endif
28+
29+#ifndef NI_IDN_USE_STD3_ASCII_RULES
30+#define NI_IDN_USE_STD3_ASCII_RULES 0
31+#endif
32+
33 #if ENABLE_IDN
34 # define IDN_FLAGS NI_IDN
35 #else
36--
372.11.0
38