summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-02-06 17:40:09 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-08 14:47:16 +0000
commit9c7f1052f01fe54113ec28e5a0a0190185a95049 (patch)
tree71179eca7f88d4d9aa9d43cc9c3d79aebf8157c7
parentc43b253bc590b7d6d54690e36254882168cd4e50 (diff)
downloadpoky-9c7f1052f01fe54113ec28e5a0a0190185a95049.tar.gz
systemd: Fix build on musl
include "missing_stdlib.h" is needed for strndupa() (From OE-Core rev: 87c9ed35fce8c9358d8a5dda20ece0a46cbff325) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch113
1 files changed, 10 insertions, 103 deletions
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 154e57b540..d63e3c0d09 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
@@ -70,8 +70,6 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
70 src/udev/udev-rules.c | 1 + 70 src/udev/udev-rules.c | 1 +
71 50 files changed, 61 insertions(+) 71 50 files changed, 61 insertions(+)
72 72
73diff --git a/meson.build b/meson.build
74index 6aa47fc755..0d0fa4963c 100644
75--- a/meson.build 73--- a/meson.build
76+++ b/meson.build 74+++ b/meson.build
77@@ -535,6 +535,7 @@ foreach ident : [ 75@@ -535,6 +535,7 @@ foreach ident : [
@@ -82,8 +80,6 @@ index 6aa47fc755..0d0fa4963c 100644
82 ] 80 ]
83 81
84 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') 82 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE')
85diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
86index d1b6a81e33..38b7008371 100644
87--- a/src/backlight/backlight.c 83--- a/src/backlight/backlight.c
88+++ b/src/backlight/backlight.c 84+++ b/src/backlight/backlight.c
89@@ -19,6 +19,7 @@ 85@@ -19,6 +19,7 @@
@@ -94,8 +90,6 @@ index d1b6a81e33..38b7008371 100644
94 90
95 static int help(void) { 91 static int help(void) {
96 _cleanup_free_ char *link = NULL; 92 _cleanup_free_ char *link = NULL;
97diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
98index f28bf1866a..bb960f183c 100644
99--- a/src/basic/cgroup-util.c 93--- a/src/basic/cgroup-util.c
100+++ b/src/basic/cgroup-util.c 94+++ b/src/basic/cgroup-util.c
101@@ -38,6 +38,7 @@ 95@@ -38,6 +38,7 @@
@@ -106,8 +100,6 @@ index f28bf1866a..bb960f183c 100644
106 100
107 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { 101 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) {
108 _cleanup_free_ char *fs = NULL; 102 _cleanup_free_ char *fs = NULL;
109diff --git a/src/basic/env-util.c b/src/basic/env-util.c
110index a84863ff22..d4f5d57231 100644
111--- a/src/basic/env-util.c 103--- a/src/basic/env-util.c
112+++ b/src/basic/env-util.c 104+++ b/src/basic/env-util.c
113@@ -15,6 +15,7 @@ 105@@ -15,6 +15,7 @@
@@ -118,8 +110,6 @@ index a84863ff22..d4f5d57231 100644
118 110
119 /* We follow bash for the character set. Different shells have different rules. */ 111 /* We follow bash for the character set. Different shells have different rules. */
120 #define VALID_BASH_ENV_NAME_CHARS \ 112 #define VALID_BASH_ENV_NAME_CHARS \
121diff --git a/src/basic/log.c b/src/basic/log.c
122index d4054cf46a..b608863e45 100644
123--- a/src/basic/log.c 113--- a/src/basic/log.c
124+++ b/src/basic/log.c 114+++ b/src/basic/log.c
125@@ -36,6 +36,7 @@ 115@@ -36,6 +36,7 @@
@@ -130,8 +120,6 @@ index d4054cf46a..b608863e45 100644
130 120
131 #define SNDBUF_SIZE (8*1024*1024) 121 #define SNDBUF_SIZE (8*1024*1024)
132 122
133diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
134index 8c76f93eb2..9068bfb4f0 100644
135--- a/src/basic/missing_stdlib.h 123--- a/src/basic/missing_stdlib.h
136+++ b/src/basic/missing_stdlib.h 124+++ b/src/basic/missing_stdlib.h
137@@ -11,3 +11,15 @@ 125@@ -11,3 +11,15 @@
@@ -150,8 +138,6 @@ index 8c76f93eb2..9068bfb4f0 100644
150+ (char *)memcpy(__new, __old, __len); \ 138+ (char *)memcpy(__new, __old, __len); \
151+ }) 139+ })
152+#endif 140+#endif
153diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
154index f91f8f7a08..fb31596216 100644
155--- a/src/basic/mkdir.c 141--- a/src/basic/mkdir.c
156+++ b/src/basic/mkdir.c 142+++ b/src/basic/mkdir.c
157@@ -14,6 +14,7 @@ 143@@ -14,6 +14,7 @@
@@ -162,8 +148,6 @@ index f91f8f7a08..fb31596216 100644
162 148
163 int mkdir_safe_internal( 149 int mkdir_safe_internal(
164 const char *path, 150 const char *path,
165diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
166index 5d4dafe3a5..70749750d4 100644
167--- a/src/basic/parse-util.c 151--- a/src/basic/parse-util.c
168+++ b/src/basic/parse-util.c 152+++ b/src/basic/parse-util.c
169@@ -22,6 +22,7 @@ 153@@ -22,6 +22,7 @@
@@ -174,8 +158,6 @@ index 5d4dafe3a5..70749750d4 100644
174 158
175 int parse_boolean(const char *v) { 159 int parse_boolean(const char *v) {
176 if (!v) 160 if (!v)
177diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
178index 96b82170d0..71342b46af 100644
179--- a/src/basic/path-lookup.c 161--- a/src/basic/path-lookup.c
180+++ b/src/basic/path-lookup.c 162+++ b/src/basic/path-lookup.c
181@@ -15,6 +15,7 @@ 163@@ -15,6 +15,7 @@
@@ -186,8 +168,6 @@ index 96b82170d0..71342b46af 100644
186 168
187 int xdg_user_runtime_dir(char **ret, const char *suffix) { 169 int xdg_user_runtime_dir(char **ret, const char *suffix) {
188 const char *e; 170 const char *e;
189diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
190index 0b6fb137bd..e8e8c7b270 100644
191--- a/src/basic/proc-cmdline.c 171--- a/src/basic/proc-cmdline.c
192+++ b/src/basic/proc-cmdline.c 172+++ b/src/basic/proc-cmdline.c
193@@ -15,6 +15,7 @@ 173@@ -15,6 +15,7 @@
@@ -198,8 +178,6 @@ index 0b6fb137bd..e8e8c7b270 100644
198 178
199 int proc_cmdline(char **ret) { 179 int proc_cmdline(char **ret) {
200 const char *e; 180 const char *e;
201diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
202index ccab71f7d2..8f9eee8d36 100644
203--- a/src/basic/procfs-util.c 181--- a/src/basic/procfs-util.c
204+++ b/src/basic/procfs-util.c 182+++ b/src/basic/procfs-util.c
205@@ -11,6 +11,7 @@ 183@@ -11,6 +11,7 @@
@@ -210,8 +188,6 @@ index ccab71f7d2..8f9eee8d36 100644
210 188
211 int procfs_tasks_get_limit(uint64_t *ret) { 189 int procfs_tasks_get_limit(uint64_t *ret) {
212 _cleanup_free_ char *value = NULL; 190 _cleanup_free_ char *value = NULL;
213diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
214index 4989f4f37c..ca00bf99d8 100644
215--- a/src/basic/selinux-util.c 191--- a/src/basic/selinux-util.c
216+++ b/src/basic/selinux-util.c 192+++ b/src/basic/selinux-util.c
217@@ -27,6 +27,7 @@ 193@@ -27,6 +27,7 @@
@@ -222,8 +198,6 @@ index 4989f4f37c..ca00bf99d8 100644
222 198
223 #if HAVE_SELINUX 199 #if HAVE_SELINUX
224 DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); 200 DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free);
225diff --git a/src/basic/time-util.c b/src/basic/time-util.c
226index 5318d6378d..23c2f77675 100644
227--- a/src/basic/time-util.c 201--- a/src/basic/time-util.c
228+++ b/src/basic/time-util.c 202+++ b/src/basic/time-util.c
229@@ -27,6 +27,7 @@ 203@@ -27,6 +27,7 @@
@@ -234,8 +208,6 @@ index 5318d6378d..23c2f77675 100644
234 208
235 static clockid_t map_clock_id(clockid_t c) { 209 static clockid_t map_clock_id(clockid_t c) {
236 210
237diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
238index cd34f88bb9..3a77b6f2ca 100644
239--- a/src/boot/bless-boot.c 211--- a/src/boot/bless-boot.c
240+++ b/src/boot/bless-boot.c 212+++ b/src/boot/bless-boot.c
241@@ -18,6 +18,7 @@ 213@@ -18,6 +18,7 @@
@@ -246,8 +218,6 @@ index cd34f88bb9..3a77b6f2ca 100644
246 218
247 static char **arg_path = NULL; 219 static char **arg_path = NULL;
248 220
249diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
250index 37c581fb22..e02789d689 100644
251--- a/src/core/dbus-cgroup.c 221--- a/src/core/dbus-cgroup.c
252+++ b/src/core/dbus-cgroup.c 222+++ b/src/core/dbus-cgroup.c
253@@ -16,6 +16,7 @@ 223@@ -16,6 +16,7 @@
@@ -258,8 +228,6 @@ index 37c581fb22..e02789d689 100644
258 228
259 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); 229 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve);
260 230
261diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
262index abe009c395..0451e58d1c 100644
263--- a/src/core/dbus-execute.c 231--- a/src/core/dbus-execute.c
264+++ b/src/core/dbus-execute.c 232+++ b/src/core/dbus-execute.c
265@@ -41,6 +41,7 @@ 233@@ -41,6 +41,7 @@
@@ -270,8 +238,6 @@ index abe009c395..0451e58d1c 100644
270 238
271 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); 239 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
272 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); 240 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput);
273diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
274index d6223db305..3654c344ee 100644
275--- a/src/core/dbus-util.c 241--- a/src/core/dbus-util.c
276+++ b/src/core/dbus-util.c 242+++ b/src/core/dbus-util.c
277@@ -7,6 +7,7 @@ 243@@ -7,6 +7,7 @@
@@ -282,8 +248,6 @@ index d6223db305..3654c344ee 100644
282 248
283 int bus_property_get_triggered_unit( 249 int bus_property_get_triggered_unit(
284 sd_bus *bus, 250 sd_bus *bus,
285diff --git a/src/core/execute.c b/src/core/execute.c
286index c992b8d5d3..89632e0582 100644
287--- a/src/core/execute.c 251--- a/src/core/execute.c
288+++ b/src/core/execute.c 252+++ b/src/core/execute.c
289@@ -96,6 +96,7 @@ 253@@ -96,6 +96,7 @@
@@ -294,8 +258,6 @@ index c992b8d5d3..89632e0582 100644
294 258
295 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) 259 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
296 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) 260 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
297diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
298index a56f12f47f..6b8729ef67 100644
299--- a/src/core/kmod-setup.c 261--- a/src/core/kmod-setup.c
300+++ b/src/core/kmod-setup.c 262+++ b/src/core/kmod-setup.c
301@@ -11,6 +11,7 @@ 263@@ -11,6 +11,7 @@
@@ -306,8 +268,6 @@ index a56f12f47f..6b8729ef67 100644
306 268
307 #if HAVE_KMOD 269 #if HAVE_KMOD
308 #include "module-util.h" 270 #include "module-util.h"
309diff --git a/src/core/service.c b/src/core/service.c
310index d7bdeb7cca..bfd483b2c0 100644
311--- a/src/core/service.c 271--- a/src/core/service.c
312+++ b/src/core/service.c 272+++ b/src/core/service.c
313@@ -41,6 +41,7 @@ 273@@ -41,6 +41,7 @@
@@ -318,8 +278,6 @@ index d7bdeb7cca..bfd483b2c0 100644
318 278
319 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { 279 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
320 [SERVICE_DEAD] = UNIT_INACTIVE, 280 [SERVICE_DEAD] = UNIT_INACTIVE,
321diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
322index 30c67ffe7c..595bc30726 100644
323--- a/src/coredump/coredump-vacuum.c 281--- a/src/coredump/coredump-vacuum.c
324+++ b/src/coredump/coredump-vacuum.c 282+++ b/src/coredump/coredump-vacuum.c
325@@ -16,6 +16,7 @@ 283@@ -16,6 +16,7 @@
@@ -330,8 +288,6 @@ index 30c67ffe7c..595bc30726 100644
330 288
331 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ 289 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */
332 #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ 290 #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */
333diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
334index d2aa1815c2..a851aa203f 100644
335--- a/src/journal-remote/journal-remote-main.c 291--- a/src/journal-remote/journal-remote-main.c
336+++ b/src/journal-remote/journal-remote-main.c 292+++ b/src/journal-remote/journal-remote-main.c
337@@ -22,6 +22,7 @@ 293@@ -22,6 +22,7 @@
@@ -342,8 +298,6 @@ index d2aa1815c2..a851aa203f 100644
342 298
343 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" 299 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem"
344 #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" 300 #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem"
345diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
346index bcf2e01d5c..5394d1dc01 100644
347--- a/src/journal/journalctl.c 301--- a/src/journal/journalctl.c
348+++ b/src/journal/journalctl.c 302+++ b/src/journal/journalctl.c
349@@ -73,6 +73,7 @@ 303@@ -73,6 +73,7 @@
@@ -354,8 +308,6 @@ index bcf2e01d5c..5394d1dc01 100644
354 308
355 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) 309 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
356 #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ 310 #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */
357diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
358index cb1ab88ca5..7f35759540 100644
359--- a/src/journal/sd-journal.c 311--- a/src/journal/sd-journal.c
360+++ b/src/journal/sd-journal.c 312+++ b/src/journal/sd-journal.c
361@@ -40,6 +40,7 @@ 313@@ -40,6 +40,7 @@
@@ -366,8 +318,6 @@ index cb1ab88ca5..7f35759540 100644
366 318
367 #define JOURNAL_FILES_MAX 7168 319 #define JOURNAL_FILES_MAX 7168
368 320
369diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
370index 86ff5bdfa2..3fd053a358 100644
371--- a/src/libsystemd/sd-bus/bus-message.c 321--- a/src/libsystemd/sd-bus/bus-message.c
372+++ b/src/libsystemd/sd-bus/bus-message.c 322+++ b/src/libsystemd/sd-bus/bus-message.c
373@@ -21,6 +21,7 @@ 323@@ -21,6 +21,7 @@
@@ -378,8 +328,6 @@ index 86ff5bdfa2..3fd053a358 100644
378 328
379 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); 329 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
380 330
381diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
382index 275c4318a1..5ffee59d17 100644
383--- a/src/libsystemd/sd-bus/bus-objects.c 331--- a/src/libsystemd/sd-bus/bus-objects.c
384+++ b/src/libsystemd/sd-bus/bus-objects.c 332+++ b/src/libsystemd/sd-bus/bus-objects.c
385@@ -13,6 +13,7 @@ 333@@ -13,6 +13,7 @@
@@ -390,8 +338,6 @@ index 275c4318a1..5ffee59d17 100644
390 338
391 static int node_vtable_get_userdata( 339 static int node_vtable_get_userdata(
392 sd_bus *bus, 340 sd_bus *bus,
393diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
394index 4881fd0d32..c865f1133b 100644
395--- a/src/libsystemd/sd-bus/bus-socket.c 341--- a/src/libsystemd/sd-bus/bus-socket.c
396+++ b/src/libsystemd/sd-bus/bus-socket.c 342+++ b/src/libsystemd/sd-bus/bus-socket.c
397@@ -28,6 +28,7 @@ 343@@ -28,6 +28,7 @@
@@ -402,8 +348,6 @@ index 4881fd0d32..c865f1133b 100644
402 348
403 #define SNDBUF_SIZE (8*1024*1024) 349 #define SNDBUF_SIZE (8*1024*1024)
404 350
405diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
406index b8d4dc8d95..a8bac2665d 100644
407--- a/src/libsystemd/sd-bus/sd-bus.c 351--- a/src/libsystemd/sd-bus/sd-bus.c
408+++ b/src/libsystemd/sd-bus/sd-bus.c 352+++ b/src/libsystemd/sd-bus/sd-bus.c
409@@ -41,6 +41,7 @@ 353@@ -41,6 +41,7 @@
@@ -414,8 +358,6 @@ index b8d4dc8d95..a8bac2665d 100644
414 358
415 #define log_debug_bus_message(m) \ 359 #define log_debug_bus_message(m) \
416 do { \ 360 do { \
417diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
418index 8c6711797a..fac178823a 100644
419--- a/src/libsystemd/sd-bus/test-bus-benchmark.c 361--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
420+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c 362+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
421@@ -14,6 +14,7 @@ 363@@ -14,6 +14,7 @@
@@ -426,8 +368,6 @@ index 8c6711797a..fac178823a 100644
426 368
427 #define MAX_SIZE (2*1024*1024) 369 #define MAX_SIZE (2*1024*1024)
428 370
429diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
430index cb8153f4fe..d52a56019d 100644
431--- a/src/locale/keymap-util.c 371--- a/src/locale/keymap-util.c
432+++ b/src/locale/keymap-util.c 372+++ b/src/locale/keymap-util.c
433@@ -21,6 +21,7 @@ 373@@ -21,6 +21,7 @@
@@ -438,8 +378,6 @@ index cb8153f4fe..d52a56019d 100644
438 378
439 static bool startswith_comma(const char *s, const char *prefix) { 379 static bool startswith_comma(const char *s, const char *prefix) {
440 s = startswith(s, prefix); 380 s = startswith(s, prefix);
441diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
442index 8e7a94db55..b5c368c6d1 100644
443--- a/src/login/pam_systemd.c 381--- a/src/login/pam_systemd.c
444+++ b/src/login/pam_systemd.c 382+++ b/src/login/pam_systemd.c
445@@ -31,6 +31,7 @@ 383@@ -31,6 +31,7 @@
@@ -450,8 +388,6 @@ index 8e7a94db55..b5c368c6d1 100644
450 #include "pam-util.h" 388 #include "pam-util.h"
451 #include "parse-util.h" 389 #include "parse-util.h"
452 #include "path-util.h" 390 #include "path-util.h"
453diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
454index 2fa21a067a..2e9995aa62 100644
455--- a/src/network/generator/network-generator.c 391--- a/src/network/generator/network-generator.c
456+++ b/src/network/generator/network-generator.c 392+++ b/src/network/generator/network-generator.c
457@@ -13,6 +13,7 @@ 393@@ -13,6 +13,7 @@
@@ -462,8 +398,6 @@ index 2fa21a067a..2e9995aa62 100644
462 398
463 /* 399 /*
464 # .network 400 # .network
465diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
466index 92bb5120ab..eeca905c75 100644
467--- a/src/nspawn/nspawn-settings.c 401--- a/src/nspawn/nspawn-settings.c
468+++ b/src/nspawn/nspawn-settings.c 402+++ b/src/nspawn/nspawn-settings.c
469@@ -16,6 +16,7 @@ 403@@ -16,6 +16,7 @@
@@ -474,8 +408,6 @@ index 92bb5120ab..eeca905c75 100644
474 408
475 Settings *settings_new(void) { 409 Settings *settings_new(void) {
476 Settings *s; 410 Settings *s;
477diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
478index 53f0492116..c71941fdd7 100644
479--- a/src/nss-mymachines/nss-mymachines.c 411--- a/src/nss-mymachines/nss-mymachines.c
480+++ b/src/nss-mymachines/nss-mymachines.c 412+++ b/src/nss-mymachines/nss-mymachines.c
481@@ -19,6 +19,7 @@ 413@@ -19,6 +19,7 @@
@@ -486,8 +418,6 @@ index 53f0492116..c71941fdd7 100644
486 418
487 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); 419 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines);
488 NSS_GETPW_PROTOTYPES(mymachines); 420 NSS_GETPW_PROTOTYPES(mymachines);
489diff --git a/src/portable/portable.c b/src/portable/portable.c
490index ed7eac0291..78986977f8 100644
491--- a/src/portable/portable.c 421--- a/src/portable/portable.c
492+++ b/src/portable/portable.c 422+++ b/src/portable/portable.c
493@@ -31,6 +31,7 @@ 423@@ -31,6 +31,7 @@
@@ -498,8 +428,6 @@ index ed7eac0291..78986977f8 100644
498 428
499 static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); 429 static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile");
500 430
501diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
502index b479335769..212d0bed20 100644
503--- a/src/resolve/resolvectl.c 431--- a/src/resolve/resolvectl.c
504+++ b/src/resolve/resolvectl.c 432+++ b/src/resolve/resolvectl.c
505@@ -37,6 +37,7 @@ 433@@ -37,6 +37,7 @@
@@ -510,8 +438,6 @@ index b479335769..212d0bed20 100644
510 438
511 static int arg_family = AF_UNSPEC; 439 static int arg_family = AF_UNSPEC;
512 static int arg_ifindex = 0; 440 static int arg_ifindex = 0;
513diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c
514index 32f68d5e6a..bda1e1ef4f 100644
515--- a/src/shared/bus-get-properties.c 441--- a/src/shared/bus-get-properties.c
516+++ b/src/shared/bus-get-properties.c 442+++ b/src/shared/bus-get-properties.c
517@@ -4,6 +4,7 @@ 443@@ -4,6 +4,7 @@
@@ -522,8 +448,6 @@ index 32f68d5e6a..bda1e1ef4f 100644
522 448
523 int bus_property_get_bool( 449 int bus_property_get_bool(
524 sd_bus *bus, 450 sd_bus *bus,
525diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c
526index 3e97be9671..2b8ca838f7 100644
527--- a/src/shared/bus-unit-procs.c 451--- a/src/shared/bus-unit-procs.c
528+++ b/src/shared/bus-unit-procs.c 452+++ b/src/shared/bus-unit-procs.c
529@@ -10,6 +10,7 @@ 453@@ -10,6 +10,7 @@
@@ -534,8 +458,6 @@ index 3e97be9671..2b8ca838f7 100644
534 458
535 struct CGroupInfo { 459 struct CGroupInfo {
536 char *cgroup_path; 460 char *cgroup_path;
537diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
538index 2bab2299fb..62afdc7973 100644
539--- a/src/shared/bus-unit-util.c 461--- a/src/shared/bus-unit-util.c
540+++ b/src/shared/bus-unit-util.c 462+++ b/src/shared/bus-unit-util.c
541@@ -44,6 +44,7 @@ 463@@ -44,6 +44,7 @@
@@ -546,8 +468,6 @@ index 2bab2299fb..62afdc7973 100644
546 468
547 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { 469 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
548 assert(message); 470 assert(message);
549diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
550index fbda218b3b..aae0be75c6 100644
551--- a/src/shared/bus-util.c 471--- a/src/shared/bus-util.c
552+++ b/src/shared/bus-util.c 472+++ b/src/shared/bus-util.c
553@@ -21,6 +21,7 @@ 473@@ -21,6 +21,7 @@
@@ -558,8 +478,6 @@ index fbda218b3b..aae0be75c6 100644
558 478
559 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { 479 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
560 sd_event *e = userdata; 480 sd_event *e = userdata;
561diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
562index 8bd1e3a6ac..f8d6eab9bd 100644
563--- a/src/shared/dns-domain.c 481--- a/src/shared/dns-domain.c
564+++ b/src/shared/dns-domain.c 482+++ b/src/shared/dns-domain.c
565@@ -17,6 +17,7 @@ 483@@ -17,6 +17,7 @@
@@ -570,8 +488,6 @@ index 8bd1e3a6ac..f8d6eab9bd 100644
570 488
571 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { 489 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) {
572 const char *n; 490 const char *n;
573diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
574index e95b638f4d..a1bf15baa8 100644
575--- a/src/shared/journal-importer.c 491--- a/src/shared/journal-importer.c
576+++ b/src/shared/journal-importer.c 492+++ b/src/shared/journal-importer.c
577@@ -14,6 +14,7 @@ 493@@ -14,6 +14,7 @@
@@ -582,8 +498,6 @@ index e95b638f4d..a1bf15baa8 100644
582 498
583 enum { 499 enum {
584 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ 500 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */
585diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
586index bf574d32a5..a09c79d2fb 100644
587--- a/src/shared/logs-show.c 501--- a/src/shared/logs-show.c
588+++ b/src/shared/logs-show.c 502+++ b/src/shared/logs-show.c
589@@ -41,6 +41,7 @@ 503@@ -41,6 +41,7 @@
@@ -594,8 +508,6 @@ index bf574d32a5..a09c79d2fb 100644
594 508
595 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ 509 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
596 #define PRINT_LINE_THRESHOLD 3 510 #define PRINT_LINE_THRESHOLD 3
597diff --git a/src/shared/pager.c b/src/shared/pager.c
598index f689d9f28f..aae3957c2f 100644
599--- a/src/shared/pager.c 511--- a/src/shared/pager.c
600+++ b/src/shared/pager.c 512+++ b/src/shared/pager.c
601@@ -26,6 +26,7 @@ 513@@ -26,6 +26,7 @@
@@ -606,8 +518,6 @@ index f689d9f28f..aae3957c2f 100644
606 518
607 static pid_t pager_pid = 0; 519 static pid_t pager_pid = 0;
608 520
609diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
610index 5d5bf7f21d..f1002ffa6c 100644
611--- a/src/shared/uid-range.c 521--- a/src/shared/uid-range.c
612+++ b/src/shared/uid-range.c 522+++ b/src/shared/uid-range.c
613@@ -9,6 +9,7 @@ 523@@ -9,6 +9,7 @@
@@ -618,8 +528,6 @@ index 5d5bf7f21d..f1002ffa6c 100644
618 528
619 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { 529 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
620 assert(range); 530 assert(range);
621diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
622index 4391d9f1f5..9b73cd0aeb 100644
623--- a/src/socket-proxy/socket-proxyd.c 531--- a/src/socket-proxy/socket-proxyd.c
624+++ b/src/socket-proxy/socket-proxyd.c 532+++ b/src/socket-proxy/socket-proxyd.c
625@@ -26,6 +26,7 @@ 533@@ -26,6 +26,7 @@
@@ -630,8 +538,6 @@ index 4391d9f1f5..9b73cd0aeb 100644
630 538
631 #define BUFFER_SIZE (256 * 1024) 539 #define BUFFER_SIZE (256 * 1024)
632 540
633diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
634index f0f9679769..128fc164da 100644
635--- a/src/test/test-hexdecoct.c 541--- a/src/test/test-hexdecoct.c
636+++ b/src/test/test-hexdecoct.c 542+++ b/src/test/test-hexdecoct.c
637@@ -6,6 +6,7 @@ 543@@ -6,6 +6,7 @@
@@ -642,8 +548,6 @@ index f0f9679769..128fc164da 100644
642 548
643 static void test_hexchar(void) { 549 static void test_hexchar(void) {
644 assert_se(hexchar(0xa) == 'a'); 550 assert_se(hexchar(0xa) == 'a');
645diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
646index 0da59e2c75..66da3741ee 100644
647--- a/src/udev/udev-builtin-path_id.c 551--- a/src/udev/udev-builtin-path_id.c
648+++ b/src/udev/udev-builtin-path_id.c 552+++ b/src/udev/udev-builtin-path_id.c
649@@ -22,6 +22,7 @@ 553@@ -22,6 +22,7 @@
@@ -654,8 +558,6 @@ index 0da59e2c75..66da3741ee 100644
654 558
655 _printf_(2,3) 559 _printf_(2,3)
656 static void path_prepend(char **path, const char *fmt, ...) { 560 static void path_prepend(char **path, const char *fmt, ...) {
657diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
658index 5159d19a38..0ed5b65844 100644
659--- a/src/udev/udev-event.c 561--- a/src/udev/udev-event.c
660+++ b/src/udev/udev-event.c 562+++ b/src/udev/udev-event.c
661@@ -34,6 +34,7 @@ 563@@ -34,6 +34,7 @@
@@ -666,8 +568,6 @@ index 5159d19a38..0ed5b65844 100644
666 568
667 typedef struct Spawn { 569 typedef struct Spawn {
668 sd_device *device; 570 sd_device *device;
669diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
670index ef6a0c112c..422fc19127 100644
671--- a/src/udev/udev-rules.c 571--- a/src/udev/udev-rules.c
672+++ b/src/udev/udev-rules.c 572+++ b/src/udev/udev-rules.c
673@@ -30,6 +30,7 @@ 573@@ -30,6 +30,7 @@
@@ -678,6 +578,13 @@ index ef6a0c112c..422fc19127 100644
678 578
679 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") 579 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d")
680 580
681-- 581--- a/src/basic/mountpoint-util.c
6822.27.0 582+++ b/src/basic/mountpoint-util.c
683 583@@ -10,6 +10,7 @@
584 #include "fs-util.h"
585 #include "missing_stat.h"
586 #include "missing_syscall.h"
587+#include "missing_stdlib.h"
588 #include "mountpoint-util.h"
589 #include "parse-util.h"
590 #include "path-util.h"