summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch38
-rw-r--r--meta/recipes-core/systemd/systemd_242.bb4
2 files changed, 3 insertions, 39 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
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb
index 73e03c7a77..20714fc70a 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -36,7 +36,6 @@ SRC_URI_MUSL = "file://0001-Use-getenv-when-secure-versions-are-not-available.pa
36 file://0006-Include-netinet-if_ether.h.patch \ 36 file://0006-Include-netinet-if_ether.h.patch \
37 file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch \ 37 file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch \
38 file://0008-add-missing-FTW_-macros-for-musl.patch \ 38 file://0008-add-missing-FTW_-macros-for-musl.patch \
39 file://0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \
40 file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ 39 file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \
41 file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ 40 file://0011-Use-uintmax_t-for-handling-rlim_t.patch \
42 file://0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch \ 41 file://0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch \
@@ -71,6 +70,7 @@ PACKAGECONFIG ??= " \
71 gshadow \ 70 gshadow \
72 hibernate \ 71 hibernate \
73 hostnamed \ 72 hostnamed \
73 idn \
74 ima \ 74 ima \
75 kmod \ 75 kmod \
76 localed \ 76 localed \
@@ -95,6 +95,7 @@ PACKAGECONFIG ??= " \
95 95
96PACKAGECONFIG_remove_libc-musl = " \ 96PACKAGECONFIG_remove_libc-musl = " \
97 gshadow \ 97 gshadow \
98 idn \
98 localed \ 99 localed \
99 myhostname \ 100 myhostname \
100 nss \ 101 nss \
@@ -129,6 +130,7 @@ PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
129PACKAGECONFIG[gshadow] = "-Dgshadow=true,-Dgshadow=false" 130PACKAGECONFIG[gshadow] = "-Dgshadow=true,-Dgshadow=false"
130PACKAGECONFIG[hibernate] = "-Dhibernate=true,-Dhibernate=false" 131PACKAGECONFIG[hibernate] = "-Dhibernate=true,-Dhibernate=false"
131PACKAGECONFIG[hostnamed] = "-Dhostnamed=true,-Dhostnamed=false" 132PACKAGECONFIG[hostnamed] = "-Dhostnamed=true,-Dhostnamed=false"
133PACKAGECONFIG[idn] = "-Didn=true,-Didn=false"
132PACKAGECONFIG[ima] = "-Dima=true,-Dima=false" 134PACKAGECONFIG[ima] = "-Dima=true,-Dima=false"
133# importd requires curl/xz/zlib/bzip2/gcrypt 135# importd requires curl/xz/zlib/bzip2/gcrypt
134PACKAGECONFIG[importd] = "-Dimportd=true,-Dimportd=false" 136PACKAGECONFIG[importd] = "-Dimportd=true,-Dimportd=false"