summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-core/systemd/systemd-boot_249.3.bb (renamed from meta/recipes-core/systemd/systemd-boot_249.1.bb)1
-rw-r--r--meta/recipes-core/systemd/systemd.inc2
-rw-r--r--meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch104
-rw-r--r--meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch16
-rw-r--r--meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch247
-rw-r--r--meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch246
-rw-r--r--meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch12
-rw-r--r--meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch6
-rw-r--r--meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch12
-rw-r--r--meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch14
-rw-r--r--meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch6
-rw-r--r--meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch6
-rw-r--r--meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch6
-rw-r--r--meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch136
-rw-r--r--meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch20
-rw-r--r--meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch4
-rw-r--r--meta/recipes-core/systemd/systemd_249.3.bb (renamed from meta/recipes-core/systemd/systemd_249.1.bb)0
27 files changed, 532 insertions, 332 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_249.1.bb b/meta/recipes-core/systemd/systemd-boot_249.3.bb
index c93bc3160b..af2be162a3 100644
--- a/meta/recipes-core/systemd/systemd-boot_249.1.bb
+++ b/meta/recipes-core/systemd/systemd-boot_249.3.bb
@@ -71,3 +71,4 @@ do_deploy () {
71} 71}
72 72
73addtask deploy before do_build after do_compile 73addtask deploy before do_build after do_compile
74
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 0e92a72bb7..05341724f4 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ 14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" 15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
16 16
17SRCREV = "764b74113e36ac5219a4b82a05f311b5a92136ce" 17SRCREV = "090378dcb1de5ca66900503210e85d63075fa70a"
18SRCBRANCH = "v249-stable" 18SRCBRANCH = "v249-stable"
19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ 19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \
20" 20"
diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
index 9db22cd9d2..15fa0c4546 100644
--- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
+++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
@@ -1,4 +1,4 @@
1From 159c53612444ec1df492bae528a5a88a275b93bf Mon Sep 17 00:00:00 2001 1From 40acdb90031cfeb7140cee5205bce24f8c91d857 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 13:41:41 +0800 3Date: Mon, 25 Feb 2019 13:41:41 +0800
4Subject: [PATCH] don't use glibc-specific qsort_r 4Subject: [PATCH] don't use glibc-specific qsort_r
@@ -14,14 +14,16 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
14Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> 14Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
15 15
16--- 16---
17 src/basic/sort-util.h | 14 ------------ 17 src/basic/sort-util.h | 14 --------------
18 src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- 18 src/shared/format-table.c | 36 ++++++++++++++++++++++++------------
19 src/shared/format-table.c | 36 ++++++++++++++++++++---------- 19 src/shared/hwdb-util.c | 19 ++++++++++++++-----
20 3 files changed, 38 insertions(+), 31 deletions(-) 20 3 files changed, 38 insertions(+), 31 deletions(-)
21 21
22diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
23index 49586a4a24..d92a5ab0ed 100644
22--- a/src/basic/sort-util.h 24--- a/src/basic/sort-util.h
23+++ b/src/basic/sort-util.h 25+++ b/src/basic/sort-util.h
24@@ -56,18 +56,4 @@ static inline void _qsort_safe(void *bas 26@@ -55,18 +55,4 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, __compar_f
25 _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ 27 _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \
26 }) 28 })
27 29
@@ -40,51 +42,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
40- }) 42- })
41- 43-
42 int cmp_int(const int *a, const int *b); 44 int cmp_int(const int *a, const int *b);
43--- a/src/shared/hwdb-util.c 45diff --git a/src/shared/format-table.c b/src/shared/format-table.c
44+++ b/src/shared/hwdb-util.c 46index 4c4e4593d8..17b329f315 100644
45@@ -127,9 +127,13 @@ static struct trie* trie_free(struct tri
46
47 DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free);
48
49-static int trie_values_cmp(const struct trie_value_entry *a, const struct trie_value_entry *b, struct trie *trie) {
50- return strcmp(trie->strings->buf + a->key_off,
51- trie->strings->buf + b->key_off);
52+static struct trie *trie_node_add_value_trie;
53+static int trie_values_cmp(const void *v1, const void *v2) {
54+ const struct trie_value_entry *a = v1;
55+ const struct trie_value_entry *b = v2;
56+
57+ return strcmp(trie_node_add_value_trie->strings->buf + a->key_off,
58+ trie_node_add_value_trie->strings->buf + b->key_off);
59 }
60
61 static int trie_node_add_value(struct trie *trie, struct trie_node *node,
62@@ -157,7 +161,10 @@ static int trie_node_add_value(struct tr
63 .value_off = v,
64 };
65
66- val = typesafe_bsearch_r(&search, node->values, node->values_count, trie_values_cmp, trie);
67+ trie_node_add_value_trie = trie;
68+ val = bsearch(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp);
69+ trie_node_add_value_trie = NULL;
70+
71 if (val) {
72 /* At this point we have 2 identical properties on the same match-string.
73 * Since we process files in order, we just replace the previous value. */
74@@ -183,7 +190,9 @@ static int trie_node_add_value(struct tr
75 .line_number = line_number,
76 };
77 node->values_count++;
78- typesafe_qsort_r(node->values, node->values_count, trie_values_cmp, trie);
79+ trie_node_add_value_trie = trie;
80+ qsort(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp);
81+ trie_node_add_value_trie = NULL;
82 return 0;
83 }
84
85--- a/src/shared/format-table.c 47--- a/src/shared/format-table.c
86+++ b/src/shared/format-table.c 48+++ b/src/shared/format-table.c
87@@ -1282,30 +1282,32 @@ static int cell_data_compare(TableData * 49@@ -1282,30 +1282,32 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t
88 return CMP(index_a, index_b); 50 return CMP(index_a, index_b);
89 } 51 }
90 52
@@ -141,7 +103,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
141 } 103 }
142 104
143 if (t->display_map) 105 if (t->display_map)
144@@ -2572,7 +2579,12 @@ int table_to_json(Table *t, JsonVariant 106@@ -2572,7 +2579,12 @@ int table_to_json(Table *t, JsonVariant **ret) {
145 for (size_t i = 0; i < n_rows; i++) 107 for (size_t i = 0; i < n_rows; i++)
146 sorted[i] = i * t->n_columns; 108 sorted[i] = i * t->n_columns;
147 109
@@ -155,3 +117,47 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
155 } 117 }
156 118
157 if (t->display_map) 119 if (t->display_map)
120diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c
121index d7626aed95..2003fac7c3 100644
122--- a/src/shared/hwdb-util.c
123+++ b/src/shared/hwdb-util.c
124@@ -127,9 +127,13 @@ static struct trie* trie_free(struct trie *trie) {
125
126 DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free);
127
128-static int trie_values_cmp(const struct trie_value_entry *a, const struct trie_value_entry *b, struct trie *trie) {
129- return strcmp(trie->strings->buf + a->key_off,
130- trie->strings->buf + b->key_off);
131+static struct trie *trie_node_add_value_trie;
132+static int trie_values_cmp(const void *v1, const void *v2) {
133+ const struct trie_value_entry *a = v1;
134+ const struct trie_value_entry *b = v2;
135+
136+ return strcmp(trie_node_add_value_trie->strings->buf + a->key_off,
137+ trie_node_add_value_trie->strings->buf + b->key_off);
138 }
139
140 static int trie_node_add_value(struct trie *trie, struct trie_node *node,
141@@ -157,7 +161,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
142 .value_off = v,
143 };
144
145- val = typesafe_bsearch_r(&search, node->values, node->values_count, trie_values_cmp, trie);
146+ trie_node_add_value_trie = trie;
147+ val = bsearch(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp);
148+ trie_node_add_value_trie = NULL;
149+
150 if (val) {
151 /* At this point we have 2 identical properties on the same match-string.
152 * Since we process files in order, we just replace the previous value. */
153@@ -183,7 +190,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
154 .line_number = line_number,
155 };
156 node->values_count++;
157- typesafe_qsort_r(node->values, node->values_count, trie_values_cmp, trie);
158+ trie_node_add_value_trie = trie;
159+ qsort(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp);
160+ trie_node_add_value_trie = NULL;
161 return 0;
162 }
163
diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
index 9b1768d9ca..d0110a2388 100644
--- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
+++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
@@ -1,4 +1,4 @@
1From 4afb8adc83348bf75964fc10af7902e04dd62637 Mon Sep 17 00:00:00 2001 1From 2a2f95b6dc16d2ea7a8e9349c6b19cc50c34777b Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 13:55:12 +0800 3Date: Mon, 25 Feb 2019 13:55:12 +0800
4Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t 4Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t
@@ -63,7 +63,7 @@ index 8a7f82812a..a56f12f47f 100644
63 #if HAVE_KMOD 63 #if HAVE_KMOD
64 #include "module-util.h" 64 #include "module-util.h"
65diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c 65diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c
66index aea3241d18..75e6c56a28 100644 66index ce8d47ccc3..00845f9776 100644
67--- a/src/libsystemd/sd-journal/catalog.c 67--- a/src/libsystemd/sd-journal/catalog.c
68+++ b/src/libsystemd/sd-journal/catalog.c 68+++ b/src/libsystemd/sd-journal/catalog.c
69@@ -28,6 +28,7 @@ 69@@ -28,6 +28,7 @@
diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
index dc40a2fe8d..1d61367da4 100644
--- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
+++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
@@ -1,7 +1,7 @@
1From 6c18e5f9373da3e3b38f2c5727e2aefe07fcbbd9 Mon Sep 17 00:00:00 2001 1From b19f800e178516d4f4d344457647e4a018bd6855 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sat, 22 May 2021 20:26:24 +0200 3Date: Sat, 22 May 2021 20:26:24 +0200
4Subject: [PATCH] [PATCH] add fallback parse_printf_format implementation 4Subject: [PATCH] add fallback parse_printf_format implementation
5 5
6Upstream-Status: Inappropriate [musl specific] 6Upstream-Status: Inappropriate [musl specific]
7 7
@@ -10,6 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 10Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
11[rebased for systemd 243] 11[rebased for systemd 243]
12Signed-off-by: Scott Murray <scott.murray@konsulko.com> 12Signed-off-by: Scott Murray <scott.murray@konsulko.com>
13
13--- 14---
14 meson.build | 1 + 15 meson.build | 1 +
15 src/basic/meson.build | 5 + 16 src/basic/meson.build | 5 +
@@ -22,10 +23,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
22 create mode 100644 src/basic/parse-printf-format.h 23 create mode 100644 src/basic/parse-printf-format.h
23 24
24diff --git a/meson.build b/meson.build 25diff --git a/meson.build b/meson.build
25index 27186d63a3..2abb7b3188 100644 26index 738879eb21..1aa20b8246 100644
26--- a/meson.build 27--- a/meson.build
27+++ b/meson.build 28+++ b/meson.build
28@@ -675,6 +675,7 @@ endif 29@@ -656,6 +656,7 @@ endif
29 foreach header : ['crypt.h', 30 foreach header : ['crypt.h',
30 'linux/memfd.h', 31 'linux/memfd.h',
31 'linux/vm_sockets.h', 32 'linux/vm_sockets.h',
@@ -34,10 +35,10 @@ index 27186d63a3..2abb7b3188 100644
34 'valgrind/memcheck.h', 35 'valgrind/memcheck.h',
35 'valgrind/valgrind.h', 36 'valgrind/valgrind.h',
36diff --git a/src/basic/meson.build b/src/basic/meson.build 37diff --git a/src/basic/meson.build b/src/basic/meson.build
37index 60ef801a25..aba2172edd 100644 38index 9b016ce5e8..a9ce21b02e 100644
38--- a/src/basic/meson.build 39--- a/src/basic/meson.build
39+++ b/src/basic/meson.build 40+++ b/src/basic/meson.build
40@@ -341,6 +341,11 @@ endforeach 41@@ -322,6 +322,11 @@ endforeach
41 42
42 basic_sources += generated_gperf_headers 43 basic_sources += generated_gperf_headers
43 44
@@ -430,6 +431,3 @@ index fd3fd7ef9c..e8e6ad555b 100644
430 431
431 #define SNDBUF_SIZE (8*1024*1024) 432 #define SNDBUF_SIZE (8*1024*1024)
432 433
433--
4342.24.0
435
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
index c863fc995c..0462d52d5e 100644
--- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
+++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
@@ -1,4 +1,4 @@
1From 6b0732ac7164914ce16e231e35980b849bdfc4c8 Mon Sep 17 00:00:00 2001 1From db6551741a3654d8e75aff93ea00fbff579f7b02 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 14:18:21 +0800 3Date: Mon, 25 Feb 2019 14:18:21 +0800
4Subject: [PATCH] src/basic/missing.h: check for missing strndupa 4Subject: [PATCH] src/basic/missing.h: check for missing strndupa
@@ -29,9 +29,9 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
29 src/basic/mountpoint-util.c | 1 + 29 src/basic/mountpoint-util.c | 1 +
30 src/basic/parse-util.c | 1 + 30 src/basic/parse-util.c | 1 +
31 src/basic/path-lookup.c | 1 + 31 src/basic/path-lookup.c | 1 +
32 src/basic/percent-util.c | 1 +
32 src/basic/proc-cmdline.c | 1 + 33 src/basic/proc-cmdline.c | 1 +
33 src/basic/procfs-util.c | 1 + 34 src/basic/procfs-util.c | 1 +
34 src/basic/selinux-util.c | 1 +
35 src/basic/time-util.c | 1 + 35 src/basic/time-util.c | 1 +
36 src/boot/bless-boot.c | 1 + 36 src/boot/bless-boot.c | 1 +
37 src/core/dbus-cgroup.c | 1 + 37 src/core/dbus-cgroup.c | 1 +
@@ -72,16 +72,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
72 src/udev/udev-rules.c | 1 + 72 src/udev/udev-rules.c | 1 +
73 51 files changed, 62 insertions(+) 73 51 files changed, 62 insertions(+)
74 74
75diff --git a/meson.build b/meson.build
76index 1aa20b8246..aafee71eb4 100644
75--- a/meson.build 77--- a/meson.build
76+++ b/meson.build 78+++ b/meson.build
77@@ -480,6 +480,7 @@ foreach ident : ['secure_getenv', '__sec 79@@ -480,6 +480,7 @@ foreach ident : ['secure_getenv', '__secure_getenv']
78 endforeach 80 endforeach
79 81
80 foreach ident : [ 82 foreach ident : [
81+ ['strndupa' , '''#include <string.h>'''], 83+ ['strndupa' , '''#include <string.h>'''],
82 ['memfd_create', '''#include <sys/mman.h>'''], 84 ['memfd_create', '''#include <sys/mman.h>'''],
83 ['gettid', '''#include <sys/types.h> 85 ['gettid', '''#include <sys/types.h>
84 #include <unistd.h>'''], 86 #include <unistd.h>'''],
87diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
88index 7c0970a60c..c129ff0f4f 100644
85--- a/src/backlight/backlight.c 89--- a/src/backlight/backlight.c
86+++ b/src/backlight/backlight.c 90+++ b/src/backlight/backlight.c
87@@ -19,6 +19,7 @@ 91@@ -19,6 +19,7 @@
@@ -89,9 +93,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
89 #include "strv.h" 93 #include "strv.h"
90 #include "util.h" 94 #include "util.h"
91+#include "missing_stdlib.h" 95+#include "missing_stdlib.h"
92 96
93 static int help(void) { 97 static int help(void) {
94 _cleanup_free_ char *link = NULL; 98 _cleanup_free_ char *link = NULL;
99diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
100index 1ff6160dc8..c9efd862a2 100644
95--- a/src/basic/cgroup-util.c 101--- a/src/basic/cgroup-util.c
96+++ b/src/basic/cgroup-util.c 102+++ b/src/basic/cgroup-util.c
97@@ -38,6 +38,7 @@ 103@@ -38,6 +38,7 @@
@@ -99,9 +105,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
99 #include "user-util.h" 105 #include "user-util.h"
100 #include "xattr-util.h" 106 #include "xattr-util.h"
101+#include "missing_stdlib.h" 107+#include "missing_stdlib.h"
102 108
103 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { 109 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) {
104 _cleanup_free_ char *fs = NULL; 110 _cleanup_free_ char *fs = NULL;
111diff --git a/src/basic/env-util.c b/src/basic/env-util.c
112index 81b1e3f10e..8fedcfd1cd 100644
105--- a/src/basic/env-util.c 113--- a/src/basic/env-util.c
106+++ b/src/basic/env-util.c 114+++ b/src/basic/env-util.c
107@@ -18,6 +18,7 @@ 115@@ -18,6 +18,7 @@
@@ -109,9 +117,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
109 #include "strv.h" 117 #include "strv.h"
110 #include "utf8.h" 118 #include "utf8.h"
111+#include "missing_stdlib.h" 119+#include "missing_stdlib.h"
112 120
113 /* We follow bash for the character set. Different shells have different rules. */ 121 /* We follow bash for the character set. Different shells have different rules. */
114 #define VALID_BASH_ENV_NAME_CHARS \ 122 #define VALID_BASH_ENV_NAME_CHARS \
123diff --git a/src/basic/log.c b/src/basic/log.c
124index fb183ea9e7..82e7bdff60 100644
115--- a/src/basic/log.c 125--- a/src/basic/log.c
116+++ b/src/basic/log.c 126+++ b/src/basic/log.c
117@@ -36,6 +36,7 @@ 127@@ -36,6 +36,7 @@
@@ -119,9 +129,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
119 #include "time-util.h" 129 #include "time-util.h"
120 #include "utf8.h" 130 #include "utf8.h"
121+#include "missing_stdlib.h" 131+#include "missing_stdlib.h"
122 132
123 #define SNDBUF_SIZE (8*1024*1024) 133 #define SNDBUF_SIZE (8*1024*1024)
124 134
135diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
136index 8c76f93eb2..9068bfb4f0 100644
125--- a/src/basic/missing_stdlib.h 137--- a/src/basic/missing_stdlib.h
126+++ b/src/basic/missing_stdlib.h 138+++ b/src/basic/missing_stdlib.h
127@@ -11,3 +11,15 @@ 139@@ -11,3 +11,15 @@
@@ -140,6 +152,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
140+ (char *)memcpy(__new, __old, __len); \ 152+ (char *)memcpy(__new, __old, __len); \
141+ }) 153+ })
142+#endif 154+#endif
155diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
156index f91f8f7a08..fb31596216 100644
143--- a/src/basic/mkdir.c 157--- a/src/basic/mkdir.c
144+++ b/src/basic/mkdir.c 158+++ b/src/basic/mkdir.c
145@@ -14,6 +14,7 @@ 159@@ -14,6 +14,7 @@
@@ -147,9 +161,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
147 #include "stdio-util.h" 161 #include "stdio-util.h"
148 #include "user-util.h" 162 #include "user-util.h"
149+#include "missing_stdlib.h" 163+#include "missing_stdlib.h"
150 164
151 int mkdir_safe_internal( 165 int mkdir_safe_internal(
152 const char *path, 166 const char *path,
167diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
168index 8c836a1b74..2eb7e5a634 100644
153--- a/src/basic/mountpoint-util.c 169--- a/src/basic/mountpoint-util.c
154+++ b/src/basic/mountpoint-util.c 170+++ b/src/basic/mountpoint-util.c
155@@ -11,6 +11,7 @@ 171@@ -11,6 +11,7 @@
@@ -160,6 +176,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
160 #include "mountpoint-util.h" 176 #include "mountpoint-util.h"
161 #include "parse-util.h" 177 #include "parse-util.h"
162 #include "path-util.h" 178 #include "path-util.h"
179diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
180index b79c885dfd..6dabda5691 100644
163--- a/src/basic/parse-util.c 181--- a/src/basic/parse-util.c
164+++ b/src/basic/parse-util.c 182+++ b/src/basic/parse-util.c
165@@ -19,6 +19,7 @@ 183@@ -19,6 +19,7 @@
@@ -167,9 +185,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
167 #include "string-util.h" 185 #include "string-util.h"
168 #include "strv.h" 186 #include "strv.h"
169+#include "missing_stdlib.h" 187+#include "missing_stdlib.h"
170 188
171 int parse_boolean(const char *v) { 189 int parse_boolean(const char *v) {
172 if (!v) 190 if (!v)
191diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
192index 05eb17d66c..b6026aab28 100644
173--- a/src/basic/path-lookup.c 193--- a/src/basic/path-lookup.c
174+++ b/src/basic/path-lookup.c 194+++ b/src/basic/path-lookup.c
175@@ -15,6 +15,7 @@ 195@@ -15,6 +15,7 @@
@@ -177,9 +197,23 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
177 #include "tmpfile-util.h" 197 #include "tmpfile-util.h"
178 #include "user-util.h" 198 #include "user-util.h"
179+#include "missing_stdlib.h" 199+#include "missing_stdlib.h"
180 200
181 int xdg_user_runtime_dir(char **ret, const char *suffix) { 201 int xdg_user_runtime_dir(char **ret, const char *suffix) {
182 const char *e; 202 const char *e;
203diff --git a/src/basic/percent-util.c b/src/basic/percent-util.c
204index 06f20fd61e..8159d721bb 100644
205--- a/src/basic/percent-util.c
206+++ b/src/basic/percent-util.c
207@@ -3,6 +3,7 @@
208 #include "percent-util.h"
209 #include "string-util.h"
210 #include "parse-util.h"
211+#include "missing_stdlib.h"
212
213 static int parse_parts_value_whole(const char *p, const char *symbol) {
214 const char *pc, *n;
215diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
216index 410b8a3eb5..f2c4355609 100644
183--- a/src/basic/proc-cmdline.c 217--- a/src/basic/proc-cmdline.c
184+++ b/src/basic/proc-cmdline.c 218+++ b/src/basic/proc-cmdline.c
185@@ -15,6 +15,7 @@ 219@@ -15,6 +15,7 @@
@@ -187,9 +221,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
187 #include "util.h" 221 #include "util.h"
188 #include "virt.h" 222 #include "virt.h"
189+#include "missing_stdlib.h" 223+#include "missing_stdlib.h"
190 224
191 int proc_cmdline(char **ret) { 225 int proc_cmdline(char **ret) {
192 const char *e; 226 const char *e;
227diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
228index 9234ccaf85..8c57094225 100644
193--- a/src/basic/procfs-util.c 229--- a/src/basic/procfs-util.c
194+++ b/src/basic/procfs-util.c 230+++ b/src/basic/procfs-util.c
195@@ -11,6 +11,7 @@ 231@@ -11,6 +11,7 @@
@@ -197,9 +233,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
197 #include "stdio-util.h" 233 #include "stdio-util.h"
198 #include "string-util.h" 234 #include "string-util.h"
199+#include "missing_stdlib.h" 235+#include "missing_stdlib.h"
200 236
201 int procfs_tasks_get_limit(uint64_t *ret) { 237 int procfs_tasks_get_limit(uint64_t *ret) {
202 _cleanup_free_ char *value = NULL; 238 _cleanup_free_ char *value = NULL;
239diff --git a/src/basic/time-util.c b/src/basic/time-util.c
240index 5d162e8ffe..1cde8e4262 100644
203--- a/src/basic/time-util.c 241--- a/src/basic/time-util.c
204+++ b/src/basic/time-util.c 242+++ b/src/basic/time-util.c
205@@ -26,6 +26,7 @@ 243@@ -26,6 +26,7 @@
@@ -207,9 +245,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
207 #include "strv.h" 245 #include "strv.h"
208 #include "time-util.h" 246 #include "time-util.h"
209+#include "missing_stdlib.h" 247+#include "missing_stdlib.h"
210 248
211 static clockid_t map_clock_id(clockid_t c) { 249 static clockid_t map_clock_id(clockid_t c) {
212 250
251diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
252index 3fc319ca27..90064c90f3 100644
213--- a/src/boot/bless-boot.c 253--- a/src/boot/bless-boot.c
214+++ b/src/boot/bless-boot.c 254+++ b/src/boot/bless-boot.c
215@@ -18,6 +18,7 @@ 255@@ -18,6 +18,7 @@
@@ -217,9 +257,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
217 #include "verbs.h" 257 #include "verbs.h"
218 #include "virt.h" 258 #include "virt.h"
219+#include "missing_stdlib.h" 259+#include "missing_stdlib.h"
220 260
221 static char **arg_path = NULL; 261 static char **arg_path = NULL;
222 262
263diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
264index 84c3caf3a5..0fa84eaa38 100644
223--- a/src/core/dbus-cgroup.c 265--- a/src/core/dbus-cgroup.c
224+++ b/src/core/dbus-cgroup.c 266+++ b/src/core/dbus-cgroup.c
225@@ -20,6 +20,7 @@ 267@@ -20,6 +20,7 @@
@@ -227,9 +269,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
227 #include "path-util.h" 269 #include "path-util.h"
228 #include "percent-util.h" 270 #include "percent-util.h"
229+#include "missing_stdlib.h" 271+#include "missing_stdlib.h"
230 272
231 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); 273 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve);
232 274
275diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
276index 50daef6702..1cc6d91e64 100644
233--- a/src/core/dbus-execute.c 277--- a/src/core/dbus-execute.c
234+++ b/src/core/dbus-execute.c 278+++ b/src/core/dbus-execute.c
235@@ -42,6 +42,7 @@ 279@@ -42,6 +42,7 @@
@@ -237,9 +281,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
237 #include "user-util.h" 281 #include "user-util.h"
238 #include "utf8.h" 282 #include "utf8.h"
239+#include "missing_stdlib.h" 283+#include "missing_stdlib.h"
240 284
241 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); 285 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
242 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); 286 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput);
287diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
288index ca9b399d8c..b864480a8c 100644
243--- a/src/core/dbus-util.c 289--- a/src/core/dbus-util.c
244+++ b/src/core/dbus-util.c 290+++ b/src/core/dbus-util.c
245@@ -9,6 +9,7 @@ 291@@ -9,6 +9,7 @@
@@ -247,9 +293,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
247 #include "user-util.h" 293 #include "user-util.h"
248 #include "unit.h" 294 #include "unit.h"
249+#include "missing_stdlib.h" 295+#include "missing_stdlib.h"
250 296
251 int bus_property_get_triggered_unit( 297 int bus_property_get_triggered_unit(
252 sd_bus *bus, 298 sd_bus *bus,
299diff --git a/src/core/execute.c b/src/core/execute.c
300index 2a337b55a2..2a64675c5f 100644
253--- a/src/core/execute.c 301--- a/src/core/execute.c
254+++ b/src/core/execute.c 302+++ b/src/core/execute.c
255@@ -98,6 +98,7 @@ 303@@ -98,6 +98,7 @@
@@ -257,9 +305,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
257 #include "user-util.h" 305 #include "user-util.h"
258 #include "utmp-wtmp.h" 306 #include "utmp-wtmp.h"
259+#include "missing_stdlib.h" 307+#include "missing_stdlib.h"
260 308
261 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) 309 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
262 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) 310 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
311diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
312index a56f12f47f..6b8729ef67 100644
263--- a/src/core/kmod-setup.c 313--- a/src/core/kmod-setup.c
264+++ b/src/core/kmod-setup.c 314+++ b/src/core/kmod-setup.c
265@@ -11,6 +11,7 @@ 315@@ -11,6 +11,7 @@
@@ -267,9 +317,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
267 #include "string-util.h" 317 #include "string-util.h"
268 #include "missing_type.h" 318 #include "missing_type.h"
269+#include "missing_stdlib.h" 319+#include "missing_stdlib.h"
270 320
271 #if HAVE_KMOD 321 #if HAVE_KMOD
272 #include "module-util.h" 322 #include "module-util.h"
323diff --git a/src/core/service.c b/src/core/service.c
324index cb0a528f0d..740d305710 100644
273--- a/src/core/service.c 325--- a/src/core/service.c
274+++ b/src/core/service.c 326+++ b/src/core/service.c
275@@ -41,6 +41,7 @@ 327@@ -41,6 +41,7 @@
@@ -277,9 +329,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
277 #include "utf8.h" 329 #include "utf8.h"
278 #include "util.h" 330 #include "util.h"
279+#include "missing_stdlib.h" 331+#include "missing_stdlib.h"
280 332
281 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { 333 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
282 [SERVICE_DEAD] = UNIT_INACTIVE, 334 [SERVICE_DEAD] = UNIT_INACTIVE,
335diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
336index 95c3fca661..d4a9f27b08 100644
283--- a/src/coredump/coredump-vacuum.c 337--- a/src/coredump/coredump-vacuum.c
284+++ b/src/coredump/coredump-vacuum.c 338+++ b/src/coredump/coredump-vacuum.c
285@@ -16,6 +16,7 @@ 339@@ -16,6 +16,7 @@
@@ -287,9 +341,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
287 #include "time-util.h" 341 #include "time-util.h"
288 #include "user-util.h" 342 #include "user-util.h"
289+#include "missing_stdlib.h" 343+#include "missing_stdlib.h"
290 344
291 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ 345 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */
292 #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ 346 #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */
347diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
348index ae1d43756a..24de98c9f3 100644
293--- a/src/journal-remote/journal-remote-main.c 349--- a/src/journal-remote/journal-remote-main.c
294+++ b/src/journal-remote/journal-remote-main.c 350+++ b/src/journal-remote/journal-remote-main.c
295@@ -24,6 +24,7 @@ 351@@ -24,6 +24,7 @@
@@ -297,9 +353,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
297 #include "string-table.h" 353 #include "string-table.h"
298 #include "strv.h" 354 #include "strv.h"
299+#include "missing_stdlib.h" 355+#include "missing_stdlib.h"
300 356
301 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" 357 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem"
302 #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" 358 #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem"
359diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
360index c8fb726d42..858a425d12 100644
303--- a/src/journal/journalctl.c 361--- a/src/journal/journalctl.c
304+++ b/src/journal/journalctl.c 362+++ b/src/journal/journalctl.c
305@@ -72,6 +72,7 @@ 363@@ -72,6 +72,7 @@
@@ -307,9 +365,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
307 #include "user-util.h" 365 #include "user-util.h"
308 #include "varlink.h" 366 #include "varlink.h"
309+#include "missing_stdlib.h" 367+#include "missing_stdlib.h"
310 368
311 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) 369 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
312 #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ 370 #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */
371diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
372index 20f7396c74..3471311ef5 100644
313--- a/src/libsystemd/sd-bus/bus-message.c 373--- a/src/libsystemd/sd-bus/bus-message.c
314+++ b/src/libsystemd/sd-bus/bus-message.c 374+++ b/src/libsystemd/sd-bus/bus-message.c
315@@ -20,6 +20,7 @@ 375@@ -20,6 +20,7 @@
@@ -317,9 +377,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
317 #include "time-util.h" 377 #include "time-util.h"
318 #include "utf8.h" 378 #include "utf8.h"
319+#include "missing_stdlib.h" 379+#include "missing_stdlib.h"
320 380
321 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); 381 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
322 382
383diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
384index bfd42aea7d..daefc56e3e 100644
323--- a/src/libsystemd/sd-bus/bus-objects.c 385--- a/src/libsystemd/sd-bus/bus-objects.c
324+++ b/src/libsystemd/sd-bus/bus-objects.c 386+++ b/src/libsystemd/sd-bus/bus-objects.c
325@@ -12,6 +12,7 @@ 387@@ -12,6 +12,7 @@
@@ -327,9 +389,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
327 #include "string-util.h" 389 #include "string-util.h"
328 #include "strv.h" 390 #include "strv.h"
329+#include "missing_stdlib.h" 391+#include "missing_stdlib.h"
330 392
331 static int node_vtable_get_userdata( 393 static int node_vtable_get_userdata(
332 sd_bus *bus, 394 sd_bus *bus,
395diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
396index 378774fe8b..2694c177d5 100644
333--- a/src/libsystemd/sd-bus/bus-socket.c 397--- a/src/libsystemd/sd-bus/bus-socket.c
334+++ b/src/libsystemd/sd-bus/bus-socket.c 398+++ b/src/libsystemd/sd-bus/bus-socket.c
335@@ -27,6 +27,7 @@ 399@@ -27,6 +27,7 @@
@@ -337,9 +401,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
337 #include "user-util.h" 401 #include "user-util.h"
338 #include "utf8.h" 402 #include "utf8.h"
339+#include "missing_stdlib.h" 403+#include "missing_stdlib.h"
340 404
341 #define SNDBUF_SIZE (8*1024*1024) 405 #define SNDBUF_SIZE (8*1024*1024)
342 406
407diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
408index a32e2f5e20..97fd3aec82 100644
343--- a/src/libsystemd/sd-bus/sd-bus.c 409--- a/src/libsystemd/sd-bus/sd-bus.c
344+++ b/src/libsystemd/sd-bus/sd-bus.c 410+++ b/src/libsystemd/sd-bus/sd-bus.c
345@@ -42,6 +42,7 @@ 411@@ -42,6 +42,7 @@
@@ -347,9 +413,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
347 #include "strv.h" 413 #include "strv.h"
348 #include "user-util.h" 414 #include "user-util.h"
349+#include "missing_stdlib.h" 415+#include "missing_stdlib.h"
350 416
351 #define log_debug_bus_message(m) \ 417 #define log_debug_bus_message(m) \
352 do { \ 418 do { \
419diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
420index 13c08fe295..9aae83486e 100644
353--- a/src/libsystemd/sd-bus/test-bus-benchmark.c 421--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
354+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c 422+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
355@@ -14,6 +14,7 @@ 423@@ -14,6 +14,7 @@
@@ -357,9 +425,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
357 #include "time-util.h" 425 #include "time-util.h"
358 #include "util.h" 426 #include "util.h"
359+#include "missing_stdlib.h" 427+#include "missing_stdlib.h"
360 428
361 #define MAX_SIZE (2*1024*1024) 429 #define MAX_SIZE (2*1024*1024)
362 430
431diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c
432index 5728c537bc..94885b0bf6 100644
363--- a/src/libsystemd/sd-journal/sd-journal.c 433--- a/src/libsystemd/sd-journal/sd-journal.c
364+++ b/src/libsystemd/sd-journal/sd-journal.c 434+++ b/src/libsystemd/sd-journal/sd-journal.c
365@@ -40,6 +40,7 @@ 435@@ -40,6 +40,7 @@
@@ -367,9 +437,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
367 #include "strv.h" 437 #include "strv.h"
368 #include "syslog-util.h" 438 #include "syslog-util.h"
369+#include "missing_stdlib.h" 439+#include "missing_stdlib.h"
370 440
371 #define JOURNAL_FILES_MAX 7168 441 #define JOURNAL_FILES_MAX 7168
372 442
443diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
444index d2f0566dbc..3b7746557e 100644
373--- a/src/locale/keymap-util.c 445--- a/src/locale/keymap-util.c
374+++ b/src/locale/keymap-util.c 446+++ b/src/locale/keymap-util.c
375@@ -24,6 +24,7 @@ 447@@ -24,6 +24,7 @@
@@ -377,9 +449,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
377 #include "strv.h" 449 #include "strv.h"
378 #include "tmpfile-util.h" 450 #include "tmpfile-util.h"
379+#include "missing_stdlib.h" 451+#include "missing_stdlib.h"
380 452
381 static bool startswith_comma(const char *s, const char *prefix) { 453 static bool startswith_comma(const char *s, const char *prefix) {
382 s = startswith(s, prefix); 454 s = startswith(s, prefix);
455diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
456index f8bd17eefe..9633fbc152 100644
383--- a/src/login/pam_systemd.c 457--- a/src/login/pam_systemd.c
384+++ b/src/login/pam_systemd.c 458+++ b/src/login/pam_systemd.c
385@@ -31,6 +31,7 @@ 459@@ -31,6 +31,7 @@
@@ -390,6 +464,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
390 #include "pam-util.h" 464 #include "pam-util.h"
391 #include "parse-util.h" 465 #include "parse-util.h"
392 #include "path-util.h" 466 #include "path-util.h"
467diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
468index 60e074e99b..a728e3b7a1 100644
393--- a/src/network/generator/network-generator.c 469--- a/src/network/generator/network-generator.c
394+++ b/src/network/generator/network-generator.c 470+++ b/src/network/generator/network-generator.c
395@@ -13,6 +13,7 @@ 471@@ -13,6 +13,7 @@
@@ -397,9 +473,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
397 #include "string-util.h" 473 #include "string-util.h"
398 #include "strv.h" 474 #include "strv.h"
399+#include "missing_stdlib.h" 475+#include "missing_stdlib.h"
400 476
401 /* 477 /*
402 # .network 478 # .network
479diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
480index 3847fe4ec4..3696b57baa 100644
403--- a/src/nspawn/nspawn-settings.c 481--- a/src/nspawn/nspawn-settings.c
404+++ b/src/nspawn/nspawn-settings.c 482+++ b/src/nspawn/nspawn-settings.c
405@@ -17,6 +17,7 @@ 483@@ -17,6 +17,7 @@
@@ -407,9 +485,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
407 #include "user-util.h" 485 #include "user-util.h"
408 #include "util.h" 486 #include "util.h"
409+#include "missing_stdlib.h" 487+#include "missing_stdlib.h"
410 488
411 Settings *settings_new(void) { 489 Settings *settings_new(void) {
412 Settings *s; 490 Settings *s;
491diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
492index 44715bb3e5..bc1e688b5e 100644
413--- a/src/nss-mymachines/nss-mymachines.c 493--- a/src/nss-mymachines/nss-mymachines.c
414+++ b/src/nss-mymachines/nss-mymachines.c 494+++ b/src/nss-mymachines/nss-mymachines.c
415@@ -21,6 +21,7 @@ 495@@ -21,6 +21,7 @@
@@ -417,9 +497,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
417 #include "signal-util.h" 497 #include "signal-util.h"
418 #include "string-util.h" 498 #include "string-util.h"
419+#include "missing_stdlib.h" 499+#include "missing_stdlib.h"
420 500
421 static void setup_logging(void) { 501 static void setup_logging(void) {
422 /* We need a dummy function because log_parse_environment is a macro. */ 502 /* We need a dummy function because log_parse_environment is a macro. */
503diff --git a/src/portable/portable.c b/src/portable/portable.c
504index 4cf5fb4f0a..577dc5c8d7 100644
423--- a/src/portable/portable.c 505--- a/src/portable/portable.c
424+++ b/src/portable/portable.c 506+++ b/src/portable/portable.c
425@@ -34,6 +34,7 @@ 507@@ -34,6 +34,7 @@
@@ -427,9 +509,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
427 #include "tmpfile-util.h" 509 #include "tmpfile-util.h"
428 #include "user-util.h" 510 #include "user-util.h"
429+#include "missing_stdlib.h" 511+#include "missing_stdlib.h"
430 512
431 static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); 513 static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile");
432 514
515diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
516index 7d13ed3905..ddc37115b8 100644
433--- a/src/resolve/resolvectl.c 517--- a/src/resolve/resolvectl.c
434+++ b/src/resolve/resolvectl.c 518+++ b/src/resolve/resolvectl.c
435@@ -41,6 +41,7 @@ 519@@ -41,6 +41,7 @@
@@ -437,9 +521,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
437 #include "utf8.h" 521 #include "utf8.h"
438 #include "verbs.h" 522 #include "verbs.h"
439+#include "missing_stdlib.h" 523+#include "missing_stdlib.h"
440 524
441 static int arg_family = AF_UNSPEC; 525 static int arg_family = AF_UNSPEC;
442 static int arg_ifindex = 0; 526 static int arg_ifindex = 0;
527diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c
528index feb6d3807f..eb11d29e50 100644
443--- a/src/shared/bus-get-properties.c 529--- a/src/shared/bus-get-properties.c
444+++ b/src/shared/bus-get-properties.c 530+++ b/src/shared/bus-get-properties.c
445@@ -4,6 +4,7 @@ 531@@ -4,6 +4,7 @@
@@ -447,9 +533,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
447 #include "stdio-util.h" 533 #include "stdio-util.h"
448 #include "string-util.h" 534 #include "string-util.h"
449+#include "missing_stdlib.h" 535+#include "missing_stdlib.h"
450 536
451 int bus_property_get_bool( 537 int bus_property_get_bool(
452 sd_bus *bus, 538 sd_bus *bus,
539diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c
540index 6f4a71138c..4a46de2c1b 100644
453--- a/src/shared/bus-unit-procs.c 541--- a/src/shared/bus-unit-procs.c
454+++ b/src/shared/bus-unit-procs.c 542+++ b/src/shared/bus-unit-procs.c
455@@ -10,6 +10,7 @@ 543@@ -10,6 +10,7 @@
@@ -457,9 +545,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
457 #include "string-util.h" 545 #include "string-util.h"
458 #include "terminal-util.h" 546 #include "terminal-util.h"
459+#include "missing_stdlib.h" 547+#include "missing_stdlib.h"
460 548
461 struct CGroupInfo { 549 struct CGroupInfo {
462 char *cgroup_path; 550 char *cgroup_path;
551diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
552index d3a5b25d18..003594e2d7 100644
463--- a/src/shared/bus-unit-util.c 553--- a/src/shared/bus-unit-util.c
464+++ b/src/shared/bus-unit-util.c 554+++ b/src/shared/bus-unit-util.c
465@@ -47,6 +47,7 @@ 555@@ -47,6 +47,7 @@
@@ -467,9 +557,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
467 #include "user-util.h" 557 #include "user-util.h"
468 #include "utf8.h" 558 #include "utf8.h"
469+#include "missing_stdlib.h" 559+#include "missing_stdlib.h"
470 560
471 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { 561 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
472 assert(message); 562 assert(message);
563diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
564index 64ca67993c..31e3d148ea 100644
473--- a/src/shared/bus-util.c 565--- a/src/shared/bus-util.c
474+++ b/src/shared/bus-util.c 566+++ b/src/shared/bus-util.c
475@@ -21,6 +21,7 @@ 567@@ -21,6 +21,7 @@
@@ -477,9 +569,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
477 #include "socket-util.h" 569 #include "socket-util.h"
478 #include "stdio-util.h" 570 #include "stdio-util.h"
479+#include "missing_stdlib.h" 571+#include "missing_stdlib.h"
480 572
481 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { 573 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
482 sd_event *e = userdata; 574 sd_event *e = userdata;
575diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
576index 787bb8fec9..009589a16f 100644
483--- a/src/shared/dns-domain.c 577--- a/src/shared/dns-domain.c
484+++ b/src/shared/dns-domain.c 578+++ b/src/shared/dns-domain.c
485@@ -17,6 +17,7 @@ 579@@ -17,6 +17,7 @@
@@ -487,9 +581,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
487 #include "strv.h" 581 #include "strv.h"
488 #include "utf8.h" 582 #include "utf8.h"
489+#include "missing_stdlib.h" 583+#include "missing_stdlib.h"
490 584
491 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { 585 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) {
492 const char *n; 586 const char *n;
587diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
588index 9e11dc09c1..f9954c1520 100644
493--- a/src/shared/journal-importer.c 589--- a/src/shared/journal-importer.c
494+++ b/src/shared/journal-importer.c 590+++ b/src/shared/journal-importer.c
495@@ -15,6 +15,7 @@ 591@@ -15,6 +15,7 @@
@@ -497,9 +593,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
497 #include "string-util.h" 593 #include "string-util.h"
498 #include "unaligned.h" 594 #include "unaligned.h"
499+#include "missing_stdlib.h" 595+#include "missing_stdlib.h"
500 596
501 enum { 597 enum {
502 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ 598 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */
599diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
600index e63c59bd94..dd9773c009 100644
503--- a/src/shared/logs-show.c 601--- a/src/shared/logs-show.c
504+++ b/src/shared/logs-show.c 602+++ b/src/shared/logs-show.c
505@@ -41,6 +41,7 @@ 603@@ -41,6 +41,7 @@
@@ -507,9 +605,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
507 #include "util.h" 605 #include "util.h"
508 #include "web-util.h" 606 #include "web-util.h"
509+#include "missing_stdlib.h" 607+#include "missing_stdlib.h"
510 608
511 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ 609 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
512 #define PRINT_LINE_THRESHOLD 3 610 #define PRINT_LINE_THRESHOLD 3
611diff --git a/src/shared/pager.c b/src/shared/pager.c
612index 4bbad7e37b..eefcdd068c 100644
513--- a/src/shared/pager.c 613--- a/src/shared/pager.c
514+++ b/src/shared/pager.c 614+++ b/src/shared/pager.c
515@@ -26,6 +26,7 @@ 615@@ -26,6 +26,7 @@
@@ -517,9 +617,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
517 #include "terminal-util.h" 617 #include "terminal-util.h"
518 #include "util.h" 618 #include "util.h"
519+#include "missing_stdlib.h" 619+#include "missing_stdlib.h"
520 620
521 static pid_t pager_pid = 0; 621 static pid_t pager_pid = 0;
522 622
623diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
624index 5d5bf7f21d..f1002ffa6c 100644
523--- a/src/shared/uid-range.c 625--- a/src/shared/uid-range.c
524+++ b/src/shared/uid-range.c 626+++ b/src/shared/uid-range.c
525@@ -9,6 +9,7 @@ 627@@ -9,6 +9,7 @@
@@ -527,9 +629,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
527 #include "uid-range.h" 629 #include "uid-range.h"
528 #include "user-util.h" 630 #include "user-util.h"
529+#include "missing_stdlib.h" 631+#include "missing_stdlib.h"
530 632
531 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { 633 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
532 assert(range); 634 assert(range);
635diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
636index 6e3ee0d76b..7727e33d95 100644
533--- a/src/socket-proxy/socket-proxyd.c 637--- a/src/socket-proxy/socket-proxyd.c
534+++ b/src/socket-proxy/socket-proxyd.c 638+++ b/src/socket-proxy/socket-proxyd.c
535@@ -26,6 +26,7 @@ 639@@ -26,6 +26,7 @@
@@ -537,9 +641,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
537 #include "string-util.h" 641 #include "string-util.h"
538 #include "util.h" 642 #include "util.h"
539+#include "missing_stdlib.h" 643+#include "missing_stdlib.h"
540 644
541 #define BUFFER_SIZE (256 * 1024) 645 #define BUFFER_SIZE (256 * 1024)
542 646
647diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
648index c9d318b8d1..fcb8d40805 100644
543--- a/src/test/test-hexdecoct.c 649--- a/src/test/test-hexdecoct.c
544+++ b/src/test/test-hexdecoct.c 650+++ b/src/test/test-hexdecoct.c
545@@ -6,6 +6,7 @@ 651@@ -6,6 +6,7 @@
@@ -547,9 +653,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
547 #include "macro.h" 653 #include "macro.h"
548 #include "string-util.h" 654 #include "string-util.h"
549+#include "missing_stdlib.h" 655+#include "missing_stdlib.h"
550 656
551 static void test_hexchar(void) { 657 static void test_hexchar(void) {
552 assert_se(hexchar(0xa) == 'a'); 658 assert_se(hexchar(0xa) == 'a');
659diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
660index 65c40de4c8..4ef9a0c6c8 100644
553--- a/src/udev/udev-builtin-path_id.c 661--- a/src/udev/udev-builtin-path_id.c
554+++ b/src/udev/udev-builtin-path_id.c 662+++ b/src/udev/udev-builtin-path_id.c
555@@ -22,6 +22,7 @@ 663@@ -22,6 +22,7 @@
@@ -557,9 +665,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
557 #include "udev-builtin.h" 665 #include "udev-builtin.h"
558 #include "udev-util.h" 666 #include "udev-util.h"
559+#include "missing_stdlib.h" 667+#include "missing_stdlib.h"
560 668
561 _printf_(2,3) 669 _printf_(2,3)
562 static void path_prepend(char **path, const char *fmt, ...) { 670 static void path_prepend(char **path, const char *fmt, ...) {
671diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
672index b28089be71..a7e2232299 100644
563--- a/src/udev/udev-event.c 673--- a/src/udev/udev-event.c
564+++ b/src/udev/udev-event.c 674+++ b/src/udev/udev-event.c
565@@ -34,6 +34,7 @@ 675@@ -34,6 +34,7 @@
@@ -567,9 +677,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
567 #include "udev-watch.h" 677 #include "udev-watch.h"
568 #include "user-util.h" 678 #include "user-util.h"
569+#include "missing_stdlib.h" 679+#include "missing_stdlib.h"
570 680
571 typedef struct Spawn { 681 typedef struct Spawn {
572 sd_device *device; 682 sd_device *device;
683diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
684index bf997fc0ed..e3f5f1f2e2 100644
573--- a/src/udev/udev-rules.c 685--- a/src/udev/udev-rules.c
574+++ b/src/udev/udev-rules.c 686+++ b/src/udev/udev-rules.c
575@@ -33,6 +33,7 @@ 687@@ -33,6 +33,7 @@
@@ -577,17 +689,6 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
577 #include "user-util.h" 689 #include "user-util.h"
578 #include "virt.h" 690 #include "virt.h"
579+#include "missing_stdlib.h" 691+#include "missing_stdlib.h"
580 692
581 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") 693 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d")
582 694
583--- a/src/basic/percent-util.c
584+++ b/src/basic/percent-util.c
585@@ -3,6 +3,7 @@
586 #include "percent-util.h"
587 #include "string-util.h"
588 #include "parse-util.h"
589+#include "missing_stdlib.h"
590
591 static int parse_parts_value_whole(const char *p, const char *symbol) {
592 const char *pc, *n;
593
diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
index 2dfc7a3cfb..855607e6a8 100644
--- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
+++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
@@ -1,4 +1,4 @@
1From 2069f0b0d5ab8f869aeba635a347e0b11d362b30 Mon Sep 17 00:00:00 2001 1From d7ae3aadc70555932e03349907f8be04d03a50ee Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 26 Oct 2017 22:10:42 -0700 3Date: Thu, 26 Oct 2017 22:10:42 -0700
4Subject: [PATCH] Include netinet/if_ether.h 4Subject: [PATCH] Include netinet/if_ether.h
@@ -33,29 +33,77 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
33Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> 33Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
34 34
35--- 35---
36 src/libsystemd-network/sd-dhcp6-client.c | 1 - 36 src/basic/linux/in6.h | 14 +++++++-------
37 src/libsystemd/sd-netlink/netlink-types.c | 1 + 37 src/libsystemd-network/sd-dhcp6-client.c | 1 -
38 src/machine/machine-dbus.c | 1 + 38 src/libsystemd/sd-netlink/netlink-types.c | 1 +
39 src/network/netdev/bond.c | 1 + 39 src/machine/machine-dbus.c | 1 +
40 src/network/netdev/bridge.c | 1 + 40 src/network/netdev/bond.c | 1 +
41 src/network/netdev/macsec.c | 1 + 41 src/network/netdev/bridge.c | 1 +
42 src/network/netdev/netdev-gperf.gperf | 1 + 42 src/network/netdev/macsec.c | 1 +
43 src/network/netdev/netdev.c | 1 + 43 src/network/netdev/netdev-gperf.gperf | 1 +
44 src/network/networkd-brvlan.c | 1 + 44 src/network/netdev/netdev.c | 1 +
45 src/network/networkd-dhcp-common.c | 4 +++- 45 src/network/networkd-bridge-vlan.c | 1 +
46 src/network/networkd-dhcp-server.c | 4 ++-- 46 src/network/networkd-dhcp-common.c | 4 +++-
47 src/network/networkd-dhcp4.c | 2 +- 47 src/network/networkd-dhcp-server.c | 4 ++--
48 src/network/networkd-dhcp6.c | 2 +- 48 src/network/networkd-dhcp4.c | 2 +-
49 src/network/networkd-link.c | 2 +- 49 src/network/networkd-dhcp6.c | 2 +-
50 src/network/networkd-network.c | 1 + 50 src/network/networkd-link.c | 2 +-
51 src/network/networkd-route.c | 5 ++++- 51 src/network/networkd-network.c | 1 +
52 src/network/test-network-tables.c | 1 + 52 src/network/networkd-route.c | 1 +
53 src/shared/ethtool-util.c | 1 + 53 src/network/networkd-setlink.c | 2 +-
54 src/shared/ethtool-util.h | 1 + 54 src/network/test-network-tables.c | 1 +
55 src/udev/net/link-config.c | 1 + 55 src/shared/ethtool-util.c | 1 +
56 src/udev/udev-builtin-net_setup_link.c | 1 + 56 src/shared/ethtool-util.h | 1 +
57 21 files changed, 26 insertions(+), 8 deletions(-) 57 src/udev/net/link-config.c | 1 +
58 src/udev/udev-builtin-net_setup_link.c | 1 +
59 23 files changed, 31 insertions(+), 15 deletions(-)
58 60
61diff --git a/src/basic/linux/in6.h b/src/basic/linux/in6.h
62index 5ad396a57e..1dc007fe13 100644
63--- a/src/basic/linux/in6.h
64+++ b/src/basic/linux/in6.h
65@@ -1,10 +1,10 @@
66 /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
67 /*
68- * Types and definitions for AF_INET6
69- * Linux INET6 implementation
70+ * Types and definitions for AF_INET6
71+ * Linux INET6 implementation
72 *
73 * Authors:
74- * Pedro Roque <roque@di.fc.ul.pt>
75+ * Pedro Roque <roque@di.fc.ul.pt>
76 *
77 * Sources:
78 * IPv6 Program Interfaces for BSD Systems
79@@ -19,8 +19,8 @@
80 * 2 of the License, or (at your option) any later version.
81 */
82
83-#ifndef _UAPI_LINUX_IN6_H
84-#define _UAPI_LINUX_IN6_H
85+#ifndef _LINUX_IN6_H
86+#define _LINUX_IN6_H
87
88 #include <linux/types.h>
89 #include <linux/libc-compat.h>
90@@ -97,7 +97,7 @@ struct in6_flowlabel_req {
91
92
93 /*
94- * Bitmask constant declarations to help applications select out the
95+ * Bitmask constant declarations to help applications select out the
96 * flow label and priority fields.
97 *
98 * Note that this are in host byte order while the flowinfo field of
99@@ -298,4 +298,4 @@ struct in6_flowlabel_req {
100 * ...
101 * MRT6_MAX
102 */
103-#endif /* _UAPI_LINUX_IN6_H */
104+#endif /* _LINUX_IN6_H */
105diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
106index e8c47f429a..359922c1b3 100644
59--- a/src/libsystemd-network/sd-dhcp6-client.c 107--- a/src/libsystemd-network/sd-dhcp6-client.c
60+++ b/src/libsystemd-network/sd-dhcp6-client.c 108+++ b/src/libsystemd-network/sd-dhcp6-client.c
61@@ -5,7 +5,6 @@ 109@@ -5,7 +5,6 @@
@@ -66,6 +114,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
66 #include <linux/if_infiniband.h> 114 #include <linux/if_infiniband.h>
67 115
68 #include "sd-dhcp6-client.h" 116 #include "sd-dhcp6-client.h"
117diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
118index beb926d40b..41de212242 100644
69--- a/src/libsystemd/sd-netlink/netlink-types.c 119--- a/src/libsystemd/sd-netlink/netlink-types.c
70+++ b/src/libsystemd/sd-netlink/netlink-types.c 120+++ b/src/libsystemd/sd-netlink/netlink-types.c
71@@ -3,6 +3,7 @@ 121@@ -3,6 +3,7 @@
@@ -76,6 +126,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
76 #include <linux/can/vxcan.h> 126 #include <linux/can/vxcan.h>
77 #include <linux/netlink.h> 127 #include <linux/netlink.h>
78 #include <linux/rtnetlink.h> 128 #include <linux/rtnetlink.h>
129diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
130index 0022a980c5..fc22e51409 100644
79--- a/src/machine/machine-dbus.c 131--- a/src/machine/machine-dbus.c
80+++ b/src/machine/machine-dbus.c 132+++ b/src/machine/machine-dbus.c
81@@ -3,6 +3,7 @@ 133@@ -3,6 +3,7 @@
@@ -86,6 +138,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
86 138
87 /* When we include libgen.h because we need dirname() we immediately 139 /* When we include libgen.h because we need dirname() we immediately
88 * undefine basename() since libgen.h defines it as a macro to the POSIX 140 * undefine basename() since libgen.h defines it as a macro to the POSIX
141diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
142index a7a4adce45..eb111a6c48 100644
89--- a/src/network/netdev/bond.c 143--- a/src/network/netdev/bond.c
90+++ b/src/network/netdev/bond.c 144+++ b/src/network/netdev/bond.c
91@@ -1,5 +1,6 @@ 145@@ -1,5 +1,6 @@
@@ -95,6 +149,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
95 #include "alloc-util.h" 149 #include "alloc-util.h"
96 #include "bond.h" 150 #include "bond.h"
97 #include "bond-util.h" 151 #include "bond-util.h"
152diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
153index 99fb9e1c3c..ecc6ca91bf 100644
98--- a/src/network/netdev/bridge.c 154--- a/src/network/netdev/bridge.c
99+++ b/src/network/netdev/bridge.c 155+++ b/src/network/netdev/bridge.c
100@@ -1,5 +1,6 @@ 156@@ -1,5 +1,6 @@
@@ -104,6 +160,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
104 #include <net/if.h> 160 #include <net/if.h>
105 161
106 #include "bridge.h" 162 #include "bridge.h"
163diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
164index 77c5f8c4e7..04be1b4ab2 100644
107--- a/src/network/netdev/macsec.c 165--- a/src/network/netdev/macsec.c
108+++ b/src/network/netdev/macsec.c 166+++ b/src/network/netdev/macsec.c
109@@ -1,5 +1,6 @@ 167@@ -1,5 +1,6 @@
@@ -113,6 +171,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
113 #include <netinet/in.h> 171 #include <netinet/in.h>
114 #include <linux/if_ether.h> 172 #include <linux/if_ether.h>
115 #include <linux/if_macsec.h> 173 #include <linux/if_macsec.h>
174diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
175index 9dd081425e..130e5b3d3c 100644
116--- a/src/network/netdev/netdev-gperf.gperf 176--- a/src/network/netdev/netdev-gperf.gperf
117+++ b/src/network/netdev/netdev-gperf.gperf 177+++ b/src/network/netdev/netdev-gperf.gperf
118@@ -3,6 +3,7 @@ 178@@ -3,6 +3,7 @@
@@ -123,6 +183,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
123 #include <stddef.h> 183 #include <stddef.h>
124 #include "bareudp.h" 184 #include "bareudp.h"
125 #include "batadv.h" 185 #include "batadv.h"
186diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
187index 53534d4873..1cfda9469f 100644
126--- a/src/network/netdev/netdev.c 188--- a/src/network/netdev/netdev.c
127+++ b/src/network/netdev/netdev.c 189+++ b/src/network/netdev/netdev.c
128@@ -1,5 +1,6 @@ 190@@ -1,5 +1,6 @@
@@ -132,6 +194,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
132 #include <net/if.h> 194 #include <net/if.h>
133 #include <netinet/in.h> 195 #include <netinet/in.h>
134 #include <unistd.h> 196 #include <unistd.h>
197diff --git a/src/network/networkd-bridge-vlan.c b/src/network/networkd-bridge-vlan.c
198index 3153bf6984..687a26b057 100644
199--- a/src/network/networkd-bridge-vlan.c
200+++ b/src/network/networkd-bridge-vlan.c
201@@ -4,6 +4,7 @@
202 ***/
203
204 #include <netinet/in.h>
205+#include <netinet/if_ether.h>
206 #include <linux/if_bridge.h>
207 #include <stdbool.h>
208
209diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
210index 249d780887..edd2e9adf8 100644
135--- a/src/network/networkd-dhcp-common.c 211--- a/src/network/networkd-dhcp-common.c
136+++ b/src/network/networkd-dhcp-common.c 212+++ b/src/network/networkd-dhcp-common.c
137@@ -1,7 +1,8 @@ 213@@ -1,7 +1,8 @@
@@ -152,6 +228,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
152 #include "networkd-network.h" 228 #include "networkd-network.h"
153 #include "parse-util.h" 229 #include "parse-util.h"
154 #include "socket-util.h" 230 #include "socket-util.h"
231diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
232index 9e2faa5675..fd8d817569 100644
155--- a/src/network/networkd-dhcp-server.c 233--- a/src/network/networkd-dhcp-server.c
156+++ b/src/network/networkd-dhcp-server.c 234+++ b/src/network/networkd-dhcp-server.c
157@@ -1,8 +1,8 @@ 235@@ -1,8 +1,8 @@
@@ -165,6 +243,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
165 243
166 #include "sd-dhcp-server.h" 244 #include "sd-dhcp-server.h"
167 245
246diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
247index f80adcdbcf..3311e2a718 100644
168--- a/src/network/networkd-dhcp4.c 248--- a/src/network/networkd-dhcp4.c
169+++ b/src/network/networkd-dhcp4.c 249+++ b/src/network/networkd-dhcp4.c
170@@ -1,9 +1,9 @@ 250@@ -1,9 +1,9 @@
@@ -178,6 +258,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
178 258
179 #include "escape.h" 259 #include "escape.h"
180 #include "alloc-util.h" 260 #include "alloc-util.h"
261diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
262index 2b72b618fc..d0d4cfb384 100644
181--- a/src/network/networkd-dhcp6.c 263--- a/src/network/networkd-dhcp6.c
182+++ b/src/network/networkd-dhcp6.c 264+++ b/src/network/networkd-dhcp6.c
183@@ -3,9 +3,9 @@ 265@@ -3,9 +3,9 @@
@@ -191,9 +273,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
191 273
192 #include "sd-dhcp6-client.h" 274 #include "sd-dhcp6-client.h"
193 275
276diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
277index 9421ce1aa6..3e37cbcc39 100644
194--- a/src/network/networkd-link.c 278--- a/src/network/networkd-link.c
195+++ b/src/network/networkd-link.c 279+++ b/src/network/networkd-link.c
196@@ -1,9 +1,10 @@ 280@@ -1,8 +1,8 @@
197 /* SPDX-License-Identifier: LGPL-2.1-or-later */ 281 /* SPDX-License-Identifier: LGPL-2.1-or-later */
198 282
199+#include <netinet/if_ether.h> 283+#include <netinet/if_ether.h>
@@ -201,10 +285,10 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
201 #include <linux/if.h> 285 #include <linux/if.h>
202-#include <linux/if_arp.h> 286-#include <linux/if_arp.h>
203 #include <linux/if_link.h> 287 #include <linux/if_link.h>
204+#include <linux/netdevice.h> 288 #include <linux/netdevice.h>
205 #include <sys/socket.h> 289 #include <sys/socket.h>
206 #include <unistd.h> 290diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
207 291index 850b4f449e..6f85d41328 100644
208--- a/src/network/networkd-network.c 292--- a/src/network/networkd-network.c
209+++ b/src/network/networkd-network.c 293+++ b/src/network/networkd-network.c
210@@ -1,5 +1,6 @@ 294@@ -1,5 +1,6 @@
@@ -214,6 +298,33 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
214 #include <net/if.h> 298 #include <net/if.h>
215 #include <netinet/in.h> 299 #include <netinet/in.h>
216 #include <linux/netdevice.h> 300 #include <linux/netdevice.h>
301diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
302index 77a93beca9..3bf9ae8837 100644
303--- a/src/network/networkd-route.c
304+++ b/src/network/networkd-route.c
305@@ -1,5 +1,6 @@
306 /* SPDX-License-Identifier: LGPL-2.1-or-later */
307
308+#include <netinet/in.h>
309 #include <linux/icmpv6.h>
310 #include <linux/ipv6_route.h>
311 #include <linux/nexthop.h>
312diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c
313index 10c312c480..e44fbb5c35 100644
314--- a/src/network/networkd-setlink.c
315+++ b/src/network/networkd-setlink.c
316@@ -1,8 +1,8 @@
317 /* SPDX-License-Identifier: LGPL-2.1-or-later */
318
319 #include <netinet/in.h>
320+#include <net/if_arp.h>
321 #include <linux/if.h>
322-#include <linux/if_arp.h>
323
324 #include "missing_network.h"
325 #include "netlink-util.h"
326diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
327index f55e524ae9..83d5c7cef3 100644
217--- a/src/network/test-network-tables.c 328--- a/src/network/test-network-tables.c
218+++ b/src/network/test-network-tables.c 329+++ b/src/network/test-network-tables.c
219@@ -1,5 +1,6 @@ 330@@ -1,5 +1,6 @@
@@ -223,6 +334,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
223 #include "bond.h" 334 #include "bond.h"
224 #include "dhcp6-internal.h" 335 #include "dhcp6-internal.h"
225 #include "dhcp6-protocol.h" 336 #include "dhcp6-protocol.h"
337diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c
338index f77f6943ca..0e1506e04b 100644
226--- a/src/shared/ethtool-util.c 339--- a/src/shared/ethtool-util.c
227+++ b/src/shared/ethtool-util.c 340+++ b/src/shared/ethtool-util.c
228@@ -1,5 +1,6 @@ 341@@ -1,5 +1,6 @@
@@ -232,6 +345,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
232 #include <net/if.h> 345 #include <net/if.h>
233 #include <sys/ioctl.h> 346 #include <sys/ioctl.h>
234 #include <linux/ethtool.h> 347 #include <linux/ethtool.h>
348diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h
349index 7d28766624..e98a25418b 100644
235--- a/src/shared/ethtool-util.h 350--- a/src/shared/ethtool-util.h
236+++ b/src/shared/ethtool-util.h 351+++ b/src/shared/ethtool-util.h
237@@ -3,6 +3,7 @@ 352@@ -3,6 +3,7 @@
@@ -242,6 +357,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
242 #include <linux/ethtool.h> 357 #include <linux/ethtool.h>
243 358
244 #include "conf-parser.h" 359 #include "conf-parser.h"
360diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
361index 8dfe23691b..e269856337 100644
245--- a/src/udev/net/link-config.c 362--- a/src/udev/net/link-config.c
246+++ b/src/udev/net/link-config.c 363+++ b/src/udev/net/link-config.c
247@@ -1,5 +1,6 @@ 364@@ -1,5 +1,6 @@
@@ -251,6 +368,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
251 #include <linux/netdevice.h> 368 #include <linux/netdevice.h>
252 #include <netinet/ether.h> 369 #include <netinet/ether.h>
253 #include <unistd.h> 370 #include <unistd.h>
371diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
372index d40251331c..89566c05f5 100644
254--- a/src/udev/udev-builtin-net_setup_link.c 373--- a/src/udev/udev-builtin-net_setup_link.c
255+++ b/src/udev/udev-builtin-net_setup_link.c 374+++ b/src/udev/udev-builtin-net_setup_link.c
256@@ -1,5 +1,6 @@ 375@@ -1,5 +1,6 @@
@@ -260,76 +379,3 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
260 #include "alloc-util.h" 379 #include "alloc-util.h"
261 #include "device-util.h" 380 #include "device-util.h"
262 #include "errno-util.h" 381 #include "errno-util.h"
263--- a/src/network/networkd-bridge-vlan.c
264+++ b/src/network/networkd-bridge-vlan.c
265@@ -4,6 +4,7 @@
266 ***/
267
268 #include <netinet/in.h>
269+#include <netinet/if_ether.h>
270 #include <linux/if_bridge.h>
271 #include <stdbool.h>
272
273--- a/src/basic/linux/in6.h
274+++ b/src/basic/linux/in6.h
275@@ -1,10 +1,10 @@
276 /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
277 /*
278- * Types and definitions for AF_INET6
279- * Linux INET6 implementation
280+ * Types and definitions for AF_INET6
281+ * Linux INET6 implementation
282 *
283 * Authors:
284- * Pedro Roque <roque@di.fc.ul.pt>
285+ * Pedro Roque <roque@di.fc.ul.pt>
286 *
287 * Sources:
288 * IPv6 Program Interfaces for BSD Systems
289@@ -19,8 +19,8 @@
290 * 2 of the License, or (at your option) any later version.
291 */
292
293-#ifndef _UAPI_LINUX_IN6_H
294-#define _UAPI_LINUX_IN6_H
295+#ifndef _LINUX_IN6_H
296+#define _LINUX_IN6_H
297
298 #include <linux/types.h>
299 #include <linux/libc-compat.h>
300@@ -97,7 +97,7 @@ struct in6_flowlabel_req {
301
302
303 /*
304- * Bitmask constant declarations to help applications select out the
305+ * Bitmask constant declarations to help applications select out the
306 * flow label and priority fields.
307 *
308 * Note that this are in host byte order while the flowinfo field of
309@@ -298,4 +298,4 @@ struct in6_flowlabel_req {
310 * ...
311 * MRT6_MAX
312 */
313-#endif /* _UAPI_LINUX_IN6_H */
314+#endif /* _LINUX_IN6_H */
315--- a/src/network/networkd-route.c
316+++ b/src/network/networkd-route.c
317@@ -1,5 +1,6 @@
318 /* SPDX-License-Identifier: LGPL-2.1-or-later */
319
320+#include <netinet/in.h>
321 #include <linux/icmpv6.h>
322 #include <linux/ipv6_route.h>
323 #include <linux/nexthop.h>
324--- a/src/network/networkd-setlink.c
325+++ b/src/network/networkd-setlink.c
326@@ -1,8 +1,8 @@
327 /* SPDX-License-Identifier: LGPL-2.1-or-later */
328
329 #include <netinet/in.h>
330+#include <net/if_arp.h>
331 #include <linux/if.h>
332-#include <linux/if_arp.h>
333
334 #include "missing_network.h"
335 #include "netlink-util.h"
diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
index 4a60ee32ef..28846935e0 100644
--- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
+++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
@@ -1,4 +1,4 @@
1From bca73ff2fbff2dc311040a87a4f536f89af07ad6 Mon Sep 17 00:00:00 2001 1From e2d70a1735fc6b9d3c079814831ab0b1b2a9d1e0 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 14:56:21 +0800 3Date: Mon, 25 Feb 2019 14:56:21 +0800
4Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined 4Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined
@@ -23,6 +23,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
23 src/tmpfiles/tmpfiles.c | 10 ++++++++++ 23 src/tmpfiles/tmpfiles.c | 10 ++++++++++
24 3 files changed, 38 insertions(+) 24 3 files changed, 38 insertions(+)
25 25
26diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
27index e026b29478..815e56ef68 100644
26--- a/src/basic/glob-util.c 28--- a/src/basic/glob-util.c
27+++ b/src/basic/glob-util.c 29+++ b/src/basic/glob-util.c
28@@ -12,6 +12,12 @@ 30@@ -12,6 +12,12 @@
@@ -46,7 +48,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
46 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ 48 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */
47 assert(!(flags & GLOB_ALTDIRFUNC)); 49 assert(!(flags & GLOB_ALTDIRFUNC));
48 50
49@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flag 51@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
50 pglob->gl_lstat = lstat; 52 pglob->gl_lstat = lstat;
51 if (!pglob->gl_stat) 53 if (!pglob->gl_stat)
52 pglob->gl_stat = stat; 54 pglob->gl_stat = stat;
@@ -61,6 +63,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
61 if (k == GLOB_NOMATCH) 63 if (k == GLOB_NOMATCH)
62 return -ENOENT; 64 return -ENOENT;
63 if (k == GLOB_NOSPACE) 65 if (k == GLOB_NOSPACE)
66diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
67index 50b4924679..09c0a20aee 100644
64--- a/src/test/test-glob-util.c 68--- a/src/test/test-glob-util.c
65+++ b/src/test/test-glob-util.c 69+++ b/src/test/test-glob-util.c
66@@ -12,6 +12,12 @@ 70@@ -12,6 +12,12 @@
@@ -110,6 +114,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
110 assert_se(r == GLOB_NOMATCH); 114 assert_se(r == GLOB_NOMATCH);
111 115
112 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); 116 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
117diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
118index 7e85c50634..145c48a685 100644
113--- a/src/tmpfiles/tmpfiles.c 119--- a/src/tmpfiles/tmpfiles.c
114+++ b/src/tmpfiles/tmpfiles.c 120+++ b/src/tmpfiles/tmpfiles.c
115@@ -66,6 +66,12 @@ 121@@ -66,6 +66,12 @@
@@ -135,7 +141,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
135 }; 141 };
136 int r = 0, k; 142 int r = 0, k;
137 char **fn; 143 char **fn;
138@@ -2010,7 +2018,9 @@ static int glob_item(Item *i, action_t a 144@@ -2010,7 +2018,9 @@ static int glob_item(Item *i, action_t action) {
139 145
140 static int glob_item_recursively(Item *i, fdaction_t action) { 146 static int glob_item_recursively(Item *i, fdaction_t action) {
141 _cleanup_globfree_ glob_t g = { 147 _cleanup_globfree_ glob_t g = {
diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
index 142ca01345..1de7ccf150 100644
--- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
@@ -1,4 +1,4 @@
1From e0d1912f0246c97e5e7b4177691363d2d077e11d Mon Sep 17 00:00:00 2001 1From 3410d82c9d07aee3e951fc6ae0b41fc1a594e00d Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 15:00:06 +0800 3Date: Mon, 25 Feb 2019 15:00:06 +0800
4Subject: [PATCH] add missing FTW_ macros for musl 4Subject: [PATCH] add missing FTW_ macros for musl
diff --git a/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch
index 53f0a1ba62..4670c232a5 100644
--- a/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch
+++ b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch
@@ -1,4 +1,4 @@
1From bb41fe773881a8f1d9615d388320b9c6fc47bfe5 Mon Sep 17 00:00:00 2001 1From 1e3bc870ded807cff0d3771dd89a850d020df032 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 15:03:47 +0800 3Date: Mon, 25 Feb 2019 15:03:47 +0800
4Subject: [PATCH] fix missing of __register_atfork for non-glibc builds 4Subject: [PATCH] fix missing of __register_atfork for non-glibc builds
@@ -12,7 +12,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12 1 file changed, 7 insertions(+) 12 1 file changed, 7 insertions(+)
13 13
14diff --git a/src/basic/process-util.c b/src/basic/process-util.c 14diff --git a/src/basic/process-util.c b/src/basic/process-util.c
15index 7d4301eadb..caa9dfe3a3 100644 15index 14259ea8df..18681838ef 100644
16--- a/src/basic/process-util.c 16--- a/src/basic/process-util.c
17+++ b/src/basic/process-util.c 17+++ b/src/basic/process-util.c
18@@ -18,6 +18,9 @@ 18@@ -18,6 +18,9 @@
@@ -25,7 +25,7 @@ index 7d4301eadb..caa9dfe3a3 100644
25 25
26 #include "alloc-util.h" 26 #include "alloc-util.h"
27 #include "architecture.h" 27 #include "architecture.h"
28@@ -1121,11 +1124,15 @@ void reset_cached_pid(void) { 28@@ -1202,11 +1205,15 @@ void reset_cached_pid(void) {
29 cached_pid = CACHED_PID_UNSET; 29 cached_pid = CACHED_PID_UNSET;
30 } 30 }
31 31
diff --git a/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch
index 940db4c5c6..e6bb37a65e 100644
--- a/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch
+++ b/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch
@@ -1,4 +1,4 @@
1From dc40487e0ac26e3ca317429b9c3e8f01772de60a Mon Sep 17 00:00:00 2001 1From eeacb75025d8f537d54c35256c5730c9aab15cde Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 15:12:41 +0800 3Date: Mon, 25 Feb 2019 15:12:41 +0800
4Subject: [PATCH] Use uintmax_t for handling rlim_t 4Subject: [PATCH] Use uintmax_t for handling rlim_t
@@ -23,9 +23,9 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
23 23
24--- 24---
25 src/basic/format-util.h | 8 +------- 25 src/basic/format-util.h | 8 +-------
26 src/basic/rlimit-util.c | 10 +++++----- 26 src/basic/rlimit-util.c | 12 ++++++------
27 src/core/execute.c | 4 ++-- 27 src/core/execute.c | 4 ++--
28 3 files changed, 8 insertions(+), 14 deletions(-) 28 3 files changed, 9 insertions(+), 15 deletions(-)
29 29
30diff --git a/src/basic/format-util.h b/src/basic/format-util.h 30diff --git a/src/basic/format-util.h b/src/basic/format-util.h
31index b7e18768e3..3195ab205d 100644 31index b7e18768e3..3195ab205d 100644
@@ -47,7 +47,7 @@ index b7e18768e3..3195ab205d 100644
47 #if SIZEOF_DEV_T == 8 47 #if SIZEOF_DEV_T == 8
48 # define DEV_FMT "%" PRIu64 48 # define DEV_FMT "%" PRIu64
49diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c 49diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
50index 23d108d5df..b037734ee3 100644 50index 23d108d5df..3e6fb438d7 100644
51--- a/src/basic/rlimit-util.c 51--- a/src/basic/rlimit-util.c
52+++ b/src/basic/rlimit-util.c 52+++ b/src/basic/rlimit-util.c
53@@ -43,7 +43,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) { 53@@ -43,7 +43,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) {
@@ -87,10 +87,10 @@ index 23d108d5df..b037734ee3 100644
87 return 1; 87 return 1;
88 } 88 }
89diff --git a/src/core/execute.c b/src/core/execute.c 89diff --git a/src/core/execute.c b/src/core/execute.c
90index f82fc294c0..4696d055a8 100644 90index 2a64675c5f..dca1e0e3b6 100644
91--- a/src/core/execute.c 91--- a/src/core/execute.c
92+++ b/src/core/execute.c 92+++ b/src/core/execute.c
93@@ -5370,9 +5370,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { 93@@ -5391,9 +5391,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
94 for (unsigned i = 0; i < RLIM_NLIMITS; i++) 94 for (unsigned i = 0; i < RLIM_NLIMITS; i++)
95 if (c->rlimit[i]) { 95 if (c->rlimit[i]) {
96 fprintf(f, "%sLimit%s: " RLIM_FMT "\n", 96 fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
diff --git a/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
index b1d782719c..897e332f33 100644
--- a/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
+++ b/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
@@ -1,4 +1,4 @@
1From f8be7b283309e4332eedc088774daac637afef7b Mon Sep 17 00:00:00 2001 1From fa29a572faaeb6fb9ed0bc6802d17139773e1908 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 28 Feb 2018 21:25:22 -0800 3Date: Wed, 28 Feb 2018 21:25:22 -0800
4Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl 4Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl
diff --git a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
index cf06572b82..3bf706fc55 100644
--- a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+++ b/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
@@ -1,4 +1,4 @@
1From 06915b70735caa66987af758ebdc4207757ae758 Mon Sep 17 00:00:00 2001 1From 88c8922f9e4d221402d9cb2e04b9c82e89125827 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 10 Oct 2017 14:33:30 -0700 3Date: Tue, 10 Oct 2017 14:33:30 -0700
4Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() 4Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
@@ -31,9 +31,11 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
31 src/shared/base-filesystem.c | 6 +++--- 31 src/shared/base-filesystem.c | 6 +++---
32 2 files changed, 24 insertions(+), 5 deletions(-) 32 2 files changed, 24 insertions(+), 5 deletions(-)
33 33
34diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
35index 7f15b558ca..4263298cad 100644
34--- a/src/basic/fs-util.h 36--- a/src/basic/fs-util.h
35+++ b/src/basic/fs-util.h 37+++ b/src/basic/fs-util.h
36@@ -47,8 +47,27 @@ int futimens_opath(int fd, const struct 38@@ -47,8 +47,27 @@ int futimens_opath(int fd, const struct timespec ts[2]);
37 int fd_warn_permissions(const char *path, int fd); 39 int fd_warn_permissions(const char *path, int fd);
38 int stat_warn_permissions(const char *path, const struct stat *st); 40 int stat_warn_permissions(const char *path, const struct stat *st);
39 41
@@ -63,9 +65,11 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
63 65
64 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); 66 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
65 int touch(const char *path); 67 int touch(const char *path);
68diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
69index 016eb7b82a..b1967f9f2f 100644
66--- a/src/shared/base-filesystem.c 70--- a/src/shared/base-filesystem.c
67+++ b/src/shared/base-filesystem.c 71+++ b/src/shared/base-filesystem.c
68@@ -53,7 +53,7 @@ int base_filesystem_create(const char *r 72@@ -53,7 +53,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
69 return log_error_errno(errno, "Failed to open root file system: %m"); 73 return log_error_errno(errno, "Failed to open root file system: %m");
70 74
71 for (size_t i = 0; i < ELEMENTSOF(table); i++) { 75 for (size_t i = 0; i < ELEMENTSOF(table); i++) {
@@ -74,7 +78,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
74 continue; 78 continue;
75 79
76 if (table[i].target) { 80 if (table[i].target) {
77@@ -61,7 +61,7 @@ int base_filesystem_create(const char *r 81@@ -61,7 +61,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
78 82
79 /* check if one of the targets exists */ 83 /* check if one of the targets exists */
80 NULSTR_FOREACH(s, table[i].target) { 84 NULSTR_FOREACH(s, table[i].target) {
@@ -83,7 +87,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
83 continue; 87 continue;
84 88
85 /* check if a specific file exists at the target path */ 89 /* check if a specific file exists at the target path */
86@@ -72,7 +72,7 @@ int base_filesystem_create(const char *r 90@@ -72,7 +72,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
87 if (!p) 91 if (!p)
88 return log_oom(); 92 return log_oom();
89 93
diff --git a/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch
index 51b145729d..74008714c1 100644
--- a/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+++ b/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch
@@ -1,4 +1,4 @@
1From 0c44af262cfa07c57db4b32de1f7610af47797f4 Mon Sep 17 00:00:00 2001 1From e07e9b998ad61b09555bc809aa15de9d2516787a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 27 May 2018 08:36:44 -0700 3Date: Sun, 27 May 2018 08:36:44 -0700
4Subject: [PATCH] Define glibc compatible basename() for non-glibc systems 4Subject: [PATCH] Define glibc compatible basename() for non-glibc systems
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 5 insertions(+) 15 1 file changed, 5 insertions(+)
16 16
17diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c 17diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
18index 3a1e4f9072..ab87b9882c 100644 18index fc22e51409..1fed07b941 100644
19--- a/src/machine/machine-dbus.c 19--- a/src/machine/machine-dbus.c
20+++ b/src/machine/machine-dbus.c 20+++ b/src/machine/machine-dbus.c
21@@ -11,6 +11,11 @@ 21@@ -11,6 +11,11 @@
diff --git a/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
index 7444d4375f..c5e20cbb80 100644
--- a/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
+++ b/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
@@ -1,4 +1,4 @@
1From 0f4b60e34a806055c678eb97a7ec7e21291bcf48 Mon Sep 17 00:00:00 2001 1From 2f048d13e100158320bda248635b3c533ac9717b Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 4 Jul 2018 15:00:44 +0800 3Date: Wed, 4 Jul 2018 15:00:44 +0800
4Subject: [PATCH] Do not disable buffering when writing to oom_score_adj 4Subject: [PATCH] Do not disable buffering when writing to oom_score_adj
@@ -25,10 +25,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
25 1 file changed, 1 insertion(+), 1 deletion(-) 25 1 file changed, 1 insertion(+), 1 deletion(-)
26 26
27diff --git a/src/basic/process-util.c b/src/basic/process-util.c 27diff --git a/src/basic/process-util.c b/src/basic/process-util.c
28index caa9dfe3a3..6101f43db5 100644 28index 18681838ef..0fa71ccce0 100644
29--- a/src/basic/process-util.c 29--- a/src/basic/process-util.c
30+++ b/src/basic/process-util.c 30+++ b/src/basic/process-util.c
31@@ -1523,7 +1523,7 @@ int set_oom_score_adjust(int value) { 31@@ -1606,7 +1606,7 @@ int set_oom_score_adjust(int value) {
32 sprintf(t, "%i", value); 32 sprintf(t, "%i", value);
33 33
34 return write_string_file("/proc/self/oom_score_adj", t, 34 return write_string_file("/proc/self/oom_score_adj", t,
diff --git a/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
index 90cc70d216..39804bd364 100644
--- a/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+++ b/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
@@ -1,4 +1,4 @@
1From c30ab62d18ce88187f5eb6c236e0977c9337f68d Mon Sep 17 00:00:00 2001 1From 45148529792c0cda32fdd61610c8d5a700d541fa Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 10 Jul 2018 15:40:17 +0800 3Date: Tue, 10 Jul 2018 15:40:17 +0800
4Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi 4Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi
@@ -25,10 +25,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
25 2 files changed, 10 insertions(+) 25 2 files changed, 10 insertions(+)
26 26
27diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c 27diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
28index 8da2024a50..9605a9b869 100644 28index 7483b46a11..c49be29e46 100644
29--- a/src/libsystemd/sd-bus/bus-error.c 29--- a/src/libsystemd/sd-bus/bus-error.c
30+++ b/src/libsystemd/sd-bus/bus-error.c 30+++ b/src/libsystemd/sd-bus/bus-error.c
31@@ -392,7 +392,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { 31@@ -404,7 +404,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) {
32 return; 32 return;
33 33
34 errno = 0; 34 errno = 0;
diff --git a/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
index de7f9ecfa2..365e2a36f1 100644
--- a/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
+++ b/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
@@ -1,4 +1,4 @@
1From fa86e5578256dddb296fd30128929ea7c4b792a4 Mon Sep 17 00:00:00 2001 1From 02a2772889d6cb08c9ca0561b52e7a9a80e50497 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 15:18:00 +0800 3Date: Mon, 25 Feb 2019 15:18:00 +0800
4Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP 4Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP
@@ -17,7 +17,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
17 1 file changed, 2 insertions(+), 2 deletions(-) 17 1 file changed, 2 insertions(+), 2 deletions(-)
18 18
19diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c 19diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
20index 9605a9b869..38b6cf90c3 100644 20index c49be29e46..90731bd7e7 100644
21--- a/src/libsystemd/sd-bus/bus-error.c 21--- a/src/libsystemd/sd-bus/bus-error.c
22+++ b/src/libsystemd/sd-bus/bus-error.c 22+++ b/src/libsystemd/sd-bus/bus-error.c
23@@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { 23@@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {
diff --git a/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch
index d9ef2b8a47..8a6c03f312 100644
--- a/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch
+++ b/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch
@@ -1,4 +1,4 @@
1From 11e730694706fa354a0e43c588ef66677a777d9a Mon Sep 17 00:00:00 2001 1From 47c4ac80689077b1eb86cf05b4326b1ac345aedf Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 15:27:54 +0800 3Date: Mon, 25 Feb 2019 15:27:54 +0800
4Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition 4Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition
diff --git a/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch
index 3b60854233..e75935a280 100644
--- a/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch
+++ b/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch
@@ -1,4 +1,4 @@
1From 45bae28d3da6607d33d54f4b30a500f5249aadde Mon Sep 17 00:00:00 2001 1From 2cb33d8896a4ad2d3b489fed51f17d5e45dfb4fc Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 15:44:54 +0800 3Date: Mon, 25 Feb 2019 15:44:54 +0800
4Subject: [PATCH] avoid redefinition of prctl_mm_map structure 4Subject: [PATCH] avoid redefinition of prctl_mm_map structure
diff --git a/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch b/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch
index 7d6433f317..629c103627 100644
--- a/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch
+++ b/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch
@@ -1,4 +1,4 @@
1From 6e593ff2afbe4bfe15eee2ec34e51490a38462f5 Mon Sep 17 00:00:00 2001 1From 200a2a2e4f04a7b7078dd455fafbd6774240e30b Mon Sep 17 00:00:00 2001
2From: Alex Kiernan <alex.kiernan@gmail.com> 2From: Alex Kiernan <alex.kiernan@gmail.com>
3Date: Fri, 7 Aug 2020 15:19:27 +0000 3Date: Fri, 7 Aug 2020 15:19:27 +0000
4Subject: [PATCH] Handle missing LOCK_EX 4Subject: [PATCH] Handle missing LOCK_EX
diff --git a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch
index 1faee1c055..ea6e82f466 100644
--- a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch
+++ b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch
@@ -1,4 +1,4 @@
1From ac579b296aa29c2f1dad9425c6d795e154ec8f7c Mon Sep 17 00:00:00 2001 1From 6445b7737a89256f35adc56701a5c47b48618ced Mon Sep 17 00:00:00 2001
2From: Alex Kiernan <alex.kiernan@gmail.com> 2From: Alex Kiernan <alex.kiernan@gmail.com>
3Date: Fri, 7 Aug 2020 15:20:17 +0000 3Date: Fri, 7 Aug 2020 15:20:17 +0000
4Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * 4Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un *
@@ -24,10 +24,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
24 1 file changed, 1 insertion(+), 1 deletion(-) 24 1 file changed, 1 insertion(+), 1 deletion(-)
25 25
26diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c 26diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
27index a4ac8ed2bb..0c41a48d4b 100644 27index 04685fecba..90b12bb5bd 100644
28--- a/src/nspawn/nspawn.c 28--- a/src/nspawn/nspawn.c
29+++ b/src/nspawn/nspawn.c 29+++ b/src/nspawn/nspawn.c
30@@ -5125,7 +5125,7 @@ static int cant_be_in_netns(void) { 30@@ -5354,7 +5354,7 @@ static int cant_be_in_netns(void) {
31 if (fd < 0) 31 if (fd < 0)
32 return log_error_errno(errno, "Failed to allocate udev control socket: %m"); 32 return log_error_errno(errno, "Failed to allocate udev control socket: %m");
33 33
diff --git a/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch
index 14c8ff73a0..60c12b0740 100644
--- a/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch
+++ b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch
@@ -1,4 +1,4 @@
1From 6bc78df50adb48d24a2abfdf65b44b932cc5a571 Mon Sep 17 00:00:00 2001 1From ae71bf2b97dc9d4760defd83463c1d305f332f22 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 16:53:06 +0800 3Date: Mon, 25 Feb 2019 16:53:06 +0800
4Subject: [PATCH] test-json.c: define M_PIl 4Subject: [PATCH] test-json.c: define M_PIl
diff --git a/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch
index 44c3ff0532..6998bf0dd0 100644
--- a/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch
+++ b/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch
@@ -1,4 +1,4 @@
1From 7cb6579572b50ef44bc0a321a4c73cce55b0c2f2 Mon Sep 17 00:00:00 2001 1From 3198690c2dbb4b457a04ef21914dc4d531540273 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Fri, 1 Mar 2019 15:22:15 +0800 3Date: Fri, 1 Mar 2019 15:22:15 +0800
4Subject: [PATCH] do not disable buffer in writing files 4Subject: [PATCH] do not disable buffer in writing files
@@ -22,7 +22,6 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
22--- 22---
23 src/basic/cgroup-util.c | 10 +++++----- 23 src/basic/cgroup-util.c | 10 +++++-----
24 src/basic/procfs-util.c | 4 ++-- 24 src/basic/procfs-util.c | 4 ++--
25 src/basic/smack-util.c | 2 +-
26 src/basic/sysctl-util.c | 2 +- 25 src/basic/sysctl-util.c | 2 +-
27 src/basic/util.c | 2 +- 26 src/basic/util.c | 2 +-
28 src/binfmt/binfmt.c | 6 +++--- 27 src/binfmt/binfmt.c | 6 +++---
@@ -30,17 +29,20 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
30 src/core/smack-setup.c | 8 ++++---- 29 src/core/smack-setup.c | 8 ++++----
31 src/hibernate-resume/hibernate-resume.c | 2 +- 30 src/hibernate-resume/hibernate-resume.c | 2 +-
32 src/libsystemd/sd-device/sd-device.c | 2 +- 31 src/libsystemd/sd-device/sd-device.c | 2 +-
33 src/login/logind-dbus.c | 2 +-
34 src/nspawn/nspawn-cgroup.c | 2 +- 32 src/nspawn/nspawn-cgroup.c | 2 +-
35 src/nspawn/nspawn.c | 6 +++--- 33 src/nspawn/nspawn.c | 6 +++---
36 src/shared/cgroup-setup.c | 4 ++-- 34 src/shared/cgroup-setup.c | 4 ++--
35 src/shared/mount-util.c | 4 ++--
36 src/shared/smack-util.c | 2 +-
37 src/sleep/sleep.c | 8 ++++---- 37 src/sleep/sleep.c | 8 ++++----
38 src/vconsole/vconsole-setup.c | 2 +- 38 src/vconsole/vconsole-setup.c | 2 +-
39 16 files changed, 33 insertions(+), 33 deletions(-) 39 16 files changed, 34 insertions(+), 34 deletions(-)
40 40
41diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
42index c9efd862a2..b3708ea925 100644
41--- a/src/basic/cgroup-util.c 43--- a/src/basic/cgroup-util.c
42+++ b/src/basic/cgroup-util.c 44+++ b/src/basic/cgroup-util.c
43@@ -766,7 +766,7 @@ int cg_install_release_agent(const char 45@@ -766,7 +766,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
44 46
45 sc = strstrip(contents); 47 sc = strstrip(contents);
46 if (isempty(sc)) { 48 if (isempty(sc)) {
@@ -49,7 +51,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
49 if (r < 0) 51 if (r < 0)
50 return r; 52 return r;
51 } else if (!path_equal(sc, agent)) 53 } else if (!path_equal(sc, agent))
52@@ -784,7 +784,7 @@ int cg_install_release_agent(const char 54@@ -784,7 +784,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
53 55
54 sc = strstrip(contents); 56 sc = strstrip(contents);
55 if (streq(sc, "0")) { 57 if (streq(sc, "0")) {
@@ -58,7 +60,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
58 if (r < 0) 60 if (r < 0)
59 return r; 61 return r;
60 62
61@@ -811,7 +811,7 @@ int cg_uninstall_release_agent(const cha 63@@ -811,7 +811,7 @@ int cg_uninstall_release_agent(const char *controller) {
62 if (r < 0) 64 if (r < 0)
63 return r; 65 return r;
64 66
@@ -67,7 +69,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
67 if (r < 0) 69 if (r < 0)
68 return r; 70 return r;
69 71
70@@ -821,7 +821,7 @@ int cg_uninstall_release_agent(const cha 72@@ -821,7 +821,7 @@ int cg_uninstall_release_agent(const char *controller) {
71 if (r < 0) 73 if (r < 0)
72 return r; 74 return r;
73 75
@@ -76,7 +78,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
76 if (r < 0) 78 if (r < 0)
77 return r; 79 return r;
78 80
79@@ -1651,7 +1651,7 @@ int cg_set_attribute(const char *control 81@@ -1651,7 +1651,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
80 if (r < 0) 82 if (r < 0)
81 return r; 83 return r;
82 84
@@ -85,9 +87,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
85 } 87 }
86 88
87 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { 89 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) {
90diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
91index 8c57094225..0cf6ec752b 100644
88--- a/src/basic/procfs-util.c 92--- a/src/basic/procfs-util.c
89+++ b/src/basic/procfs-util.c 93+++ b/src/basic/procfs-util.c
90@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi 94@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) {
91 * decrease it, as threads-max is the much more relevant sysctl. */ 95 * decrease it, as threads-max is the much more relevant sysctl. */
92 if (limit > pid_max-1) { 96 if (limit > pid_max-1) {
93 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ 97 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */
@@ -103,9 +107,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
103 if (r < 0) { 107 if (r < 0) {
104 uint64_t threads_max; 108 uint64_t threads_max;
105 109
110diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c
111index 8913e6ff85..29e6ec0755 100644
106--- a/src/basic/sysctl-util.c 112--- a/src/basic/sysctl-util.c
107+++ b/src/basic/sysctl-util.c 113+++ b/src/basic/sysctl-util.c
108@@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, con 114@@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c
109 115
110 log_debug("Setting '%s' to '%s'", p, value); 116 log_debug("Setting '%s' to '%s'", p, value);
111 117
@@ -114,6 +120,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
114 } 120 }
115 121
116 int sysctl_read(const char *property, char **ret) { 122 int sysctl_read(const char *property, char **ret) {
123diff --git a/src/basic/util.c b/src/basic/util.c
124index 955b18bd2a..6d89c90176 100644
117--- a/src/basic/util.c 125--- a/src/basic/util.c
118+++ b/src/basic/util.c 126+++ b/src/basic/util.c
119@@ -234,7 +234,7 @@ void disable_coredumps(void) { 127@@ -234,7 +234,7 @@ void disable_coredumps(void) {
@@ -125,9 +133,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
125 if (r < 0) 133 if (r < 0)
126 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); 134 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
127 } 135 }
136diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
137index 29530bb691..3ecf6a45a2 100644
128--- a/src/binfmt/binfmt.c 138--- a/src/binfmt/binfmt.c
129+++ b/src/binfmt/binfmt.c 139+++ b/src/binfmt/binfmt.c
130@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) 140@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) {
131 if (!fn) 141 if (!fn)
132 return log_oom(); 142 return log_oom();
133 143
@@ -136,7 +146,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
136 } 146 }
137 147
138 static int apply_rule(const char *rule) { 148 static int apply_rule(const char *rule) {
139@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) 149@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) {
140 150
141 (void) delete_rule(rule); 151 (void) delete_rule(rule);
142 152
@@ -154,9 +164,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
154 164
155 STRV_FOREACH(f, files) { 165 STRV_FOREACH(f, files) {
156 k = apply_file(*f, true); 166 k = apply_file(*f, true);
167diff --git a/src/core/main.c b/src/core/main.c
168index b32a19a1d8..4e1238853e 100644
157--- a/src/core/main.c 169--- a/src/core/main.c
158+++ b/src/core/main.c 170+++ b/src/core/main.c
159@@ -1402,7 +1402,7 @@ static int bump_unix_max_dgram_qlen(void 171@@ -1402,7 +1402,7 @@ static int bump_unix_max_dgram_qlen(void) {
160 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) 172 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN)
161 return 0; 173 return 0;
162 174
@@ -165,7 +177,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
165 if (r < 0) 177 if (r < 0)
166 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, 178 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r,
167 "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); 179 "Failed to bump AF_UNIX datagram queue length, ignoring: %m");
168@@ -1679,7 +1679,7 @@ static void initialize_core_pattern(bool 180@@ -1679,7 +1679,7 @@ static void initialize_core_pattern(bool skip_setup) {
169 if (getpid_cached() != 1) 181 if (getpid_cached() != 1)
170 return; 182 return;
171 183
@@ -174,9 +186,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
174 if (r < 0) 186 if (r < 0)
175 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); 187 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern);
176 } 188 }
189diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
190index 79c4808473..b111ce0a11 100644
177--- a/src/core/smack-setup.c 191--- a/src/core/smack-setup.c
178+++ b/src/core/smack-setup.c 192+++ b/src/core/smack-setup.c
179@@ -323,17 +323,17 @@ int mac_smack_setup(bool *loaded_policy) 193@@ -323,17 +323,17 @@ int mac_smack_setup(bool *loaded_policy) {
180 } 194 }
181 195
182 #ifdef SMACK_RUN_LABEL 196 #ifdef SMACK_RUN_LABEL
@@ -198,6 +212,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
198 if (r < 0) 212 if (r < 0)
199 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); 213 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m");
200 #endif 214 #endif
215diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
216index 58e35e403e..1d0beb4008 100644
201--- a/src/hibernate-resume/hibernate-resume.c 217--- a/src/hibernate-resume/hibernate-resume.c
202+++ b/src/hibernate-resume/hibernate-resume.c 218+++ b/src/hibernate-resume/hibernate-resume.c
203@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { 219@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
@@ -209,9 +225,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
209 if (r < 0) { 225 if (r < 0) {
210 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); 226 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
211 return EXIT_FAILURE; 227 return EXIT_FAILURE;
228diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
229index 388128bf33..695f535ff4 100644
212--- a/src/libsystemd/sd-device/sd-device.c 230--- a/src/libsystemd/sd-device/sd-device.c
213+++ b/src/libsystemd/sd-device/sd-device.c 231+++ b/src/libsystemd/sd-device/sd-device.c
214@@ -2096,7 +2096,7 @@ _public_ int sd_device_set_sysattr_value 232@@ -2096,7 +2096,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
215 if (!value) 233 if (!value)
216 return -ENOMEM; 234 return -ENOMEM;
217 235
@@ -220,9 +238,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
220 if (r < 0) { 238 if (r < 0) {
221 /* On failure, clear cache entry, as we do not know how it fails. */ 239 /* On failure, clear cache entry, as we do not know how it fails. */
222 device_remove_cached_sysattr_value(device, sysattr); 240 device_remove_cached_sysattr_value(device, sysattr);
241diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
242index cb01b25bc6..e92051268b 100644
223--- a/src/nspawn/nspawn-cgroup.c 243--- a/src/nspawn/nspawn-cgroup.c
224+++ b/src/nspawn/nspawn-cgroup.c 244+++ b/src/nspawn/nspawn-cgroup.c
225@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified 245@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
226 fn = strjoina(tree, cgroup, "/cgroup.procs"); 246 fn = strjoina(tree, cgroup, "/cgroup.procs");
227 247
228 sprintf(pid_string, PID_FMT, pid); 248 sprintf(pid_string, PID_FMT, pid);
@@ -231,6 +251,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
231 if (r < 0) { 251 if (r < 0) {
232 log_error_errno(r, "Failed to move process: %m"); 252 log_error_errno(r, "Failed to move process: %m");
233 goto finish; 253 goto finish;
254diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
255index 90b12bb5bd..6a1dafa094 100644
234--- a/src/nspawn/nspawn.c 256--- a/src/nspawn/nspawn.c
235+++ b/src/nspawn/nspawn.c 257+++ b/src/nspawn/nspawn.c
236@@ -2751,7 +2751,7 @@ static int reset_audit_loginuid(void) { 258@@ -2751,7 +2751,7 @@ static int reset_audit_loginuid(void) {
@@ -260,9 +282,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
260 if (r < 0) 282 if (r < 0)
261 return log_error_errno(r, "Failed to write GID map: %m"); 283 return log_error_errno(r, "Failed to write GID map: %m");
262 284
285diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
286index f197f715c7..077f893177 100644
263--- a/src/shared/cgroup-setup.c 287--- a/src/shared/cgroup-setup.c
264+++ b/src/shared/cgroup-setup.c 288+++ b/src/shared/cgroup-setup.c
265@@ -267,7 +267,7 @@ int cg_attach(const char *controller, co 289@@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
266 290
267 xsprintf(c, PID_FMT "\n", pid); 291 xsprintf(c, PID_FMT "\n", pid);
268 292
@@ -280,9 +304,44 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
280 if (r < 0) { 304 if (r < 0) {
281 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", 305 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m",
282 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); 306 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs);
307diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
308index 594efea989..d243b45bc4 100644
309--- a/src/shared/mount-util.c
310+++ b/src/shared/mount-util.c
311@@ -1019,13 +1019,13 @@ static int make_userns(uid_t uid_shift, uid_t uid_range) {
312 xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, uid_shift, uid_range);
313
314 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid);
315- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER);
316+ r = write_string_file(uid_map, line, 0);
317 if (r < 0)
318 return log_error_errno(r, "Failed to write UID map: %m");
319
320 /* We always assign the same UID and GID ranges */
321 xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid);
322- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER);
323+ r = write_string_file(uid_map, line, 0);
324 if (r < 0)
325 return log_error_errno(r, "Failed to write GID map: %m");
326
327diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
328index 3362ee3924..80c0f2a52e 100644
329--- a/src/shared/smack-util.c
330+++ b/src/shared/smack-util.c
331@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) {
332 return 0;
333
334 p = procfs_file_alloca(pid, "attr/current");
335- r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER);
336+ r = write_string_file(p, label, 0);
337 if (r < 0)
338 return r;
339
340diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
341index a3aeb24633..d3e68e1b94 100644
283--- a/src/sleep/sleep.c 342--- a/src/sleep/sleep.c
284+++ b/src/sleep/sleep.c 343+++ b/src/sleep/sleep.c
285@@ -46,7 +46,7 @@ static int write_hibernate_location_info 344@@ -46,7 +46,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca
286 assert(hibernate_location->swap); 345 assert(hibernate_location->swap);
287 346
288 xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); 347 xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno));
@@ -291,7 +350,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
291 if (r < 0) 350 if (r < 0)
292 return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", 351 return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m",
293 hibernate_location->swap->device, resume_str); 352 hibernate_location->swap->device, resume_str);
294@@ -73,7 +73,7 @@ static int write_hibernate_location_info 353@@ -73,7 +73,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca
295 } 354 }
296 355
297 xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); 356 xsprintf(offset_str, "%" PRIu64, hibernate_location->offset);
@@ -309,7 +368,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
309 if (k >= 0) 368 if (k >= 0)
310 return 0; 369 return 0;
311 370
312@@ -112,7 +112,7 @@ static int write_state(FILE **f, char ** 371@@ -112,7 +112,7 @@ static int write_state(FILE **f, char **states) {
313 STRV_FOREACH(state, states) { 372 STRV_FOREACH(state, states) {
314 int k; 373 int k;
315 374
@@ -318,9 +377,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
318 if (k >= 0) 377 if (k >= 0)
319 return 0; 378 return 0;
320 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); 379 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state);
380diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
381index d1c3febdd5..1cc68694d1 100644
321--- a/src/vconsole/vconsole-setup.c 382--- a/src/vconsole/vconsole-setup.c
322+++ b/src/vconsole/vconsole-setup.c 383+++ b/src/vconsole/vconsole-setup.c
323@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *na 384@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) {
324 static int toggle_utf8_sysfs(bool utf8) { 385 static int toggle_utf8_sysfs(bool utf8) {
325 int r; 386 int r;
326 387
@@ -329,32 +390,3 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
329 if (r < 0) 390 if (r < 0)
330 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); 391 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8));
331 392
332--- a/src/shared/mount-util.c
333+++ b/src/shared/mount-util.c
334@@ -1019,13 +1019,13 @@ static int make_userns(uid_t uid_shift,
335 xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, uid_shift, uid_range);
336
337 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid);
338- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER);
339+ r = write_string_file(uid_map, line, 0);
340 if (r < 0)
341 return log_error_errno(r, "Failed to write UID map: %m");
342
343 /* We always assign the same UID and GID ranges */
344 xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid);
345- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER);
346+ r = write_string_file(uid_map, line, 0);
347 if (r < 0)
348 return log_error_errno(r, "Failed to write GID map: %m");
349
350--- a/src/shared/smack-util.c
351+++ b/src/shared/smack-util.c
352@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const
353 return 0;
354
355 p = procfs_file_alloca(pid, "attr/current");
356- r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER);
357+ r = write_string_file(p, label, 0);
358 if (r < 0)
359 return r;
360
diff --git a/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch b/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch
index 7d1bd60255..06702765ee 100644
--- a/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch
+++ b/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch
@@ -1,4 +1,4 @@
1From d73755cc60f401f0f20f357752e45aeeeef8e83f Mon Sep 17 00:00:00 2001 1From b04518c464b526f8b9adc9ce3c08b1881db47989 Mon Sep 17 00:00:00 2001
2From: Scott Murray <scott.murray@konsulko.com> 2From: Scott Murray <scott.murray@konsulko.com>
3Date: Fri, 13 Sep 2019 19:26:27 -0400 3Date: Fri, 13 Sep 2019 19:26:27 -0400
4Subject: [PATCH] Handle __cpu_mask usage 4Subject: [PATCH] Handle __cpu_mask usage
diff --git a/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch
index 9394eeb450..dc63305825 100644
--- a/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch
+++ b/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch
@@ -1,4 +1,4 @@
1From 04e94f9a15101daa8f65a9af269d26cda2a24056 Mon Sep 17 00:00:00 2001 1From 0c8935128b39864b07dfee39cfa9d35d48f056aa Mon Sep 17 00:00:00 2001
2From: Alex Kiernan <alex.kiernan@gmail.com> 2From: Alex Kiernan <alex.kiernan@gmail.com>
3Date: Tue, 10 Mar 2020 11:05:20 +0000 3Date: Tue, 10 Mar 2020 11:05:20 +0000
4Subject: [PATCH] Handle missing gshadow 4Subject: [PATCH] Handle missing gshadow
@@ -14,9 +14,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
14--- 14---
15 src/shared/user-record-nss.c | 20 ++++++++++++++++++++ 15 src/shared/user-record-nss.c | 20 ++++++++++++++++++++
16 src/shared/user-record-nss.h | 4 ++++ 16 src/shared/user-record-nss.h | 4 ++++
17 src/shared/userdb.c | 6 ++++++ 17 src/shared/userdb.c | 7 ++++++-
18 3 files changed, 30 insertions(+) 18 3 files changed, 30 insertions(+), 1 deletion(-)
19 19
20diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c
21index 88b8fc2f8f..a819d41bac 100644
20--- a/src/shared/user-record-nss.c 22--- a/src/shared/user-record-nss.c
21+++ b/src/shared/user-record-nss.c 23+++ b/src/shared/user-record-nss.c
22@@ -331,8 +331,10 @@ int nss_group_to_group_record( 24@@ -331,8 +331,10 @@ int nss_group_to_group_record(
@@ -46,7 +48,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
46 48
47 r = json_build(&g->json, JSON_BUILD_OBJECT( 49 r = json_build(&g->json, JSON_BUILD_OBJECT(
48 JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), 50 JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)),
49@@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct grou 51@@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
50 assert(ret_sgrp); 52 assert(ret_sgrp);
51 assert(ret_buffer); 53 assert(ret_buffer);
52 54
@@ -54,7 +56,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
54 for (;;) { 56 for (;;) {
55 _cleanup_free_ char *buf = NULL; 57 _cleanup_free_ char *buf = NULL;
56 struct sgrp sgrp, *result; 58 struct sgrp sgrp, *result;
57@@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct grou 59@@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
58 buflen *= 2; 60 buflen *= 2;
59 buf = mfree(buf); 61 buf = mfree(buf);
60 } 62 }
@@ -120,6 +122,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
120 if (r < 0) 122 if (r < 0)
121 return r; 123 return r;
122 124
125diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h
126index 22ab04d6ee..4e52e7a911 100644
123--- a/src/shared/user-record-nss.h 127--- a/src/shared/user-record-nss.h
124+++ b/src/shared/user-record-nss.h 128+++ b/src/shared/user-record-nss.h
125@@ -2,7 +2,11 @@ 129@@ -2,7 +2,11 @@
@@ -134,9 +138,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
134 #include <pwd.h> 138 #include <pwd.h>
135 #include <shadow.h> 139 #include <shadow.h>
136 140
141diff --git a/src/shared/userdb.c b/src/shared/userdb.c
142index 91ac7c3832..20881ece84 100644
137--- a/src/shared/userdb.c 143--- a/src/shared/userdb.c
138+++ b/src/shared/userdb.c 144+++ b/src/shared/userdb.c
139@@ -1047,13 +1047,15 @@ int groupdb_iterator_get(UserDBIterator 145@@ -1047,13 +1047,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
140 if (gr) { 146 if (gr) {
141 _cleanup_free_ char *buffer = NULL; 147 _cleanup_free_ char *buffer = NULL;
142 bool incomplete = false; 148 bool incomplete = false;
@@ -153,7 +159,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
153 if (!FLAGS_SET(iterator->flags, USERDB_SUPPRESS_SHADOW)) { 159 if (!FLAGS_SET(iterator->flags, USERDB_SUPPRESS_SHADOW)) {
154 r = nss_sgrp_for_group(gr, &sgrp, &buffer); 160 r = nss_sgrp_for_group(gr, &sgrp, &buffer);
155 if (r < 0) { 161 if (r < 0) {
156@@ -1066,6 +1068,9 @@ int groupdb_iterator_get(UserDBIterator 162@@ -1066,6 +1068,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
157 } 163 }
158 164
159 r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); 165 r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret);
diff --git a/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
index 2289404d8d..ff96a720c5 100644
--- a/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
@@ -1,4 +1,4 @@
1From 366cd28f5f93ba7c861cd32a718251770d74830e Mon Sep 17 00:00:00 2001 1From f5d7fee9620cbcf52be8f8ba477890d28cadfbc8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 12 Apr 2021 23:44:53 -0700 3Date: Mon, 12 Apr 2021 23:44:53 -0700
4Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl 4Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl
@@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 6 insertions(+) 16 1 file changed, 6 insertions(+)
17 17
18diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h 18diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
19index 1384324804..0202d00372 100644 19index 9e3a165857..4d59b3e7b0 100644
20--- a/src/basic/missing_syscall.h 20--- a/src/basic/missing_syscall.h
21+++ b/src/basic/missing_syscall.h 21+++ b/src/basic/missing_syscall.h
22@@ -20,6 +20,12 @@ 22@@ -20,6 +20,12 @@
diff --git a/meta/recipes-core/systemd/systemd_249.1.bb b/meta/recipes-core/systemd/systemd_249.3.bb
index a6759c7a35..a6759c7a35 100644
--- a/meta/recipes-core/systemd/systemd_249.1.bb
+++ b/meta/recipes-core/systemd/systemd_249.3.bb
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 21:59:35 +0000