diff options
| author |   Adrian Bunk <bunk@stusta.de> | 2019-05-16 20:16:11 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-17 07:07:21 +0100 |
| commit | e9d132c25c7e1feca1d078b0891c0f4baba70f81 (patch) | |
| tree | 1d8b441032bccad06b19a891c42e1dfe148a4a01 | |
| parent | 0563003fea0ff432e61f7361fa8c1524ffbc925a (diff) | |
| download | openembedded-core-contrib-e9d132c25c7e1feca1d078b0891c0f4baba70f81.tar.gz | |
systemd: Disable idn properly for musl instead of NI_IDN workarounds
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.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_242.bb | 4 |
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 @@ -From 6a2cadd6b70cb40ac74fc0d0f8557b914bd38ac2 Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Mon, 2 Jul 2018 13:22:41 +0800 -Subject: [PATCH 09/24] socket-util: don't fail if libc doesn't support IDN - -Upstream-Status: Inappropriate [musl specific] - -Signed-off-by: Emil Renner Berthing <systemd@esmil.dk> -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - src/basic/socket-util.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c -index 904bafb..a7a009d 100644 ---- a/src/basic/socket-util.c -+++ b/src/basic/socket-util.c -@@ -34,6 +34,16 @@ - #include "user-util.h" - #include "utf8.h" - -+/* Don't fail if the standard library -+ * doesn't support IDN */ -+#ifndef NI_IDN -+#define NI_IDN 0 -+#endif -+ -+#ifndef NI_IDN_USE_STD3_ASCII_RULES -+#define NI_IDN_USE_STD3_ASCII_RULES 0 -+#endif -+ - #if ENABLE_IDN - # define IDN_FLAGS NI_IDN - #else --- -2.11.0 - 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 file://0006-Include-netinet-if_ether.h.patch \ file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch \ file://0008-add-missing-FTW_-macros-for-musl.patch \ - file://0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \ file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ file://0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch \ @@ -71,6 +70,7 @@ PACKAGECONFIG ??= " \ gshadow \ hibernate \ hostnamed \ + idn \ ima \ kmod \ localed \ @@ -95,6 +95,7 @@ PACKAGECONFIG ??= " \ PACKAGECONFIG_remove_libc-musl = " \ gshadow \ + idn \ localed \ myhostname \ nss \ @@ -129,6 +130,7 @@ PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" PACKAGECONFIG[gshadow] = "-Dgshadow=true,-Dgshadow=false" PACKAGECONFIG[hibernate] = "-Dhibernate=true,-Dhibernate=false" PACKAGECONFIG[hostnamed] = "-Dhostnamed=true,-Dhostnamed=false" +PACKAGECONFIG[idn] = "-Didn=true,-Didn=false" PACKAGECONFIG[ima] = "-Dima=true,-Dima=false" # importd requires curl/xz/zlib/bzip2/gcrypt PACKAGECONFIG[importd] = "-Dimportd=true,-Dimportd=false" |