diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch | 55 |
1 files changed, 26 insertions, 29 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 680930ca3c..9e02666698 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 | |||
@@ -73,10 +73,10 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
73 | 52 files changed, 63 insertions(+) | 73 | 52 files changed, 63 insertions(+) |
74 | 74 | ||
75 | diff --git a/meson.build b/meson.build | 75 | diff --git a/meson.build b/meson.build |
76 | index cb9936ee8b..7ab201c6d9 100644 | 76 | index 30b5305b89..0189ef8ce6 100644 |
77 | --- a/meson.build | 77 | --- a/meson.build |
78 | +++ b/meson.build | 78 | +++ b/meson.build |
79 | @@ -507,6 +507,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] | 79 | @@ -512,6 +512,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] |
80 | endforeach | 80 | endforeach |
81 | 81 | ||
82 | foreach ident : [ | 82 | foreach ident : [ |
@@ -85,19 +85,19 @@ index cb9936ee8b..7ab201c6d9 100644 | |||
85 | ['gettid', '''#include <sys/types.h> | 85 | ['gettid', '''#include <sys/types.h> |
86 | #include <unistd.h>'''], | 86 | #include <unistd.h>'''], |
87 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c | 87 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c |
88 | index 5a3095cbba..22cfa4d526 100644 | 88 | index a4e5d77f6c..fc12da4c53 100644 |
89 | --- a/src/backlight/backlight.c | 89 | --- a/src/backlight/backlight.c |
90 | +++ b/src/backlight/backlight.c | 90 | +++ b/src/backlight/backlight.c |
91 | @@ -19,6 +19,7 @@ | 91 | @@ -20,6 +20,7 @@ |
92 | #include "string-util.h" | ||
93 | #include "strv.h" | 92 | #include "strv.h" |
93 | #include "terminal-util.h" | ||
94 | #include "util.h" | 94 | #include "util.h" |
95 | +#include "missing_stdlib.h" | 95 | +#include "missing_stdlib.h" |
96 | 96 | ||
97 | static int help(void) { | 97 | static int help(void) { |
98 | _cleanup_free_ char *link = NULL; | 98 | _cleanup_free_ char *link = NULL; |
99 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | 99 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
100 | index a626ecf2e2..f7dc6c8421 100644 | 100 | index b03cc70e2e..f4615ffce1 100644 |
101 | --- a/src/basic/cgroup-util.c | 101 | --- a/src/basic/cgroup-util.c |
102 | +++ b/src/basic/cgroup-util.c | 102 | +++ b/src/basic/cgroup-util.c |
103 | @@ -37,6 +37,7 @@ | 103 | @@ -37,6 +37,7 @@ |
@@ -249,10 +249,10 @@ index b659d6905d..020112be24 100644 | |||
249 | static clockid_t map_clock_id(clockid_t c) { | 249 | static clockid_t map_clock_id(clockid_t c) { |
250 | 250 | ||
251 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c | 251 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c |
252 | index 9e4b0d1f72..d640316ff7 100644 | 252 | index d9c901d73b..79a035274c 100644 |
253 | --- a/src/boot/bless-boot.c | 253 | --- a/src/boot/bless-boot.c |
254 | +++ b/src/boot/bless-boot.c | 254 | +++ b/src/boot/bless-boot.c |
255 | @@ -19,6 +19,7 @@ | 255 | @@ -22,6 +22,7 @@ |
256 | #include "util.h" | 256 | #include "util.h" |
257 | #include "verbs.h" | 257 | #include "verbs.h" |
258 | #include "virt.h" | 258 | #include "virt.h" |
@@ -297,10 +297,10 @@ index 32a2ec0ff9..36be2511e4 100644 | |||
297 | int bus_property_get_triggered_unit( | 297 | int bus_property_get_triggered_unit( |
298 | sd_bus *bus, | 298 | sd_bus *bus, |
299 | diff --git a/src/core/execute.c b/src/core/execute.c | 299 | diff --git a/src/core/execute.c b/src/core/execute.c |
300 | index 0b20d386d3..fccfb9268c 100644 | 300 | index 2762b10287..a8aeec7f6e 100644 |
301 | --- a/src/core/execute.c | 301 | --- a/src/core/execute.c |
302 | +++ b/src/core/execute.c | 302 | +++ b/src/core/execute.c |
303 | @@ -102,6 +102,7 @@ | 303 | @@ -103,6 +103,7 @@ |
304 | #include "unit-serialize.h" | 304 | #include "unit-serialize.h" |
305 | #include "user-util.h" | 305 | #include "user-util.h" |
306 | #include "utmp-wtmp.h" | 306 | #include "utmp-wtmp.h" |
@@ -309,19 +309,19 @@ index 0b20d386d3..fccfb9268c 100644 | |||
309 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) | 309 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) |
310 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) | 310 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) |
311 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | 311 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c |
312 | index d054668b8e..9b4caa7651 100644 | 312 | index f4488dd692..1d331a7ee2 100644 |
313 | --- a/src/core/kmod-setup.c | 313 | --- a/src/core/kmod-setup.c |
314 | +++ b/src/core/kmod-setup.c | 314 | +++ b/src/core/kmod-setup.c |
315 | @@ -10,6 +10,7 @@ | 315 | @@ -11,6 +11,7 @@ |
316 | #include "macro.h" | ||
317 | #include "recurse-dir.h" | 316 | #include "recurse-dir.h" |
318 | #include "string-util.h" | 317 | #include "string-util.h" |
318 | #include "virt.h" | ||
319 | +#include "missing_stdlib.h" | 319 | +#include "missing_stdlib.h" |
320 | 320 | ||
321 | #if HAVE_KMOD | 321 | #if HAVE_KMOD |
322 | #include "module-util.h" | 322 | #include "module-util.h" |
323 | diff --git a/src/core/service.c b/src/core/service.c | 323 | diff --git a/src/core/service.c b/src/core/service.c |
324 | index 87f0d34c8c..ccda3feb29 100644 | 324 | index 9f7af9dffb..3ec5e30c8b 100644 |
325 | --- a/src/core/service.c | 325 | --- a/src/core/service.c |
326 | +++ b/src/core/service.c | 326 | +++ b/src/core/service.c |
327 | @@ -42,6 +42,7 @@ | 327 | @@ -42,6 +42,7 @@ |
@@ -330,13 +330,13 @@ index 87f0d34c8c..ccda3feb29 100644 | |||
330 | #include "util.h" | 330 | #include "util.h" |
331 | +#include "missing_stdlib.h" | 331 | +#include "missing_stdlib.h" |
332 | 332 | ||
333 | static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { | 333 | #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__) |
334 | [SERVICE_DEAD] = UNIT_INACTIVE, | 334 | |
335 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c | 335 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c |
336 | index dcf9cc03cd..8f8d992ec2 100644 | 336 | index c6e201ecf2..ab034475e2 100644 |
337 | --- a/src/coredump/coredump-vacuum.c | 337 | --- a/src/coredump/coredump-vacuum.c |
338 | +++ b/src/coredump/coredump-vacuum.c | 338 | +++ b/src/coredump/coredump-vacuum.c |
339 | @@ -16,6 +16,7 @@ | 339 | @@ -17,6 +17,7 @@ |
340 | #include "string-util.h" | 340 | #include "string-util.h" |
341 | #include "time-util.h" | 341 | #include "time-util.h" |
342 | #include "user-util.h" | 342 | #include "user-util.h" |
@@ -369,10 +369,10 @@ index 3e3646e45f..6a8fc60f6d 100644 | |||
369 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" | 369 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" |
370 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" | 370 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" |
371 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c | 371 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c |
372 | index 3c4a7c0a7a..6a792404f2 100644 | 372 | index cff34fd585..a5003e47e9 100644 |
373 | --- a/src/journal/journalctl.c | 373 | --- a/src/journal/journalctl.c |
374 | +++ b/src/journal/journalctl.c | 374 | +++ b/src/journal/journalctl.c |
375 | @@ -73,6 +73,7 @@ | 375 | @@ -74,6 +74,7 @@ |
376 | #include "unit-name.h" | 376 | #include "unit-name.h" |
377 | #include "user-util.h" | 377 | #include "user-util.h" |
378 | #include "varlink.h" | 378 | #include "varlink.h" |
@@ -393,11 +393,11 @@ index 96529b422b..ddb5e9c698 100644 | |||
393 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); | 393 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); |
394 | 394 | ||
395 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c | 395 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c |
396 | index 28d8336718..5d3ce88a53 100644 | 396 | index 909dfe4d3a..254b7ce866 100644 |
397 | --- a/src/libsystemd/sd-bus/bus-objects.c | 397 | --- a/src/libsystemd/sd-bus/bus-objects.c |
398 | +++ b/src/libsystemd/sd-bus/bus-objects.c | 398 | +++ b/src/libsystemd/sd-bus/bus-objects.c |
399 | @@ -12,6 +12,7 @@ | 399 | @@ -11,6 +11,7 @@ |
400 | #include "set.h" | 400 | #include "missing_capability.h" |
401 | #include "string-util.h" | 401 | #include "string-util.h" |
402 | #include "strv.h" | 402 | #include "strv.h" |
403 | +#include "missing_stdlib.h" | 403 | +#include "missing_stdlib.h" |
@@ -633,11 +633,11 @@ index f75ef62d2d..530001a821 100644 | |||
633 | static pid_t pager_pid = 0; | 633 | static pid_t pager_pid = 0; |
634 | 634 | ||
635 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c | 635 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c |
636 | index 2c07a1b7a8..2a9d6ef4ab 100644 | 636 | index 1b4396a34c..c2f72b185f 100644 |
637 | --- a/src/shared/uid-range.c | 637 | --- a/src/shared/uid-range.c |
638 | +++ b/src/shared/uid-range.c | 638 | +++ b/src/shared/uid-range.c |
639 | @@ -9,6 +9,7 @@ | 639 | @@ -14,6 +14,7 @@ |
640 | #include "sort-util.h" | 640 | #include "stat-util.h" |
641 | #include "uid-range.h" | 641 | #include "uid-range.h" |
642 | #include "user-util.h" | 642 | #include "user-util.h" |
643 | +#include "missing_stdlib.h" | 643 | +#include "missing_stdlib.h" |
@@ -704,6 +704,3 @@ index 1a384d6b38..0089833e3f 100644 | |||
704 | 704 | ||
705 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") | 705 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") |
706 | 706 | ||
707 | -- | ||
708 | 2.34.1 | ||
709 | |||