diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch index bd5f6a6190..ec451cddb7 100644 --- a/meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch | |||
@@ -17,6 +17,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
17 | [rebased for systemd 244] | 17 | [rebased for systemd 244] |
18 | [Rebased for v247] | 18 | [Rebased for v247] |
19 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | 19 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> |
20 | [Rebased for v254] | ||
20 | --- | 21 | --- |
21 | meson.build | 1 + | 22 | meson.build | 1 + |
22 | src/backlight/backlight.c | 1 + | 23 | src/backlight/backlight.c | 1 + |
@@ -74,7 +75,7 @@ diff --git a/meson.build b/meson.build | |||
74 | index fb96143c37..739b2f7f72 100644 | 75 | index fb96143c37..739b2f7f72 100644 |
75 | --- a/meson.build | 76 | --- a/meson.build |
76 | +++ b/meson.build | 77 | +++ b/meson.build |
77 | @@ -574,6 +574,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] | 78 | @@ -595,6 +595,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] |
78 | endforeach | 79 | endforeach |
79 | 80 | ||
80 | foreach ident : [ | 81 | foreach ident : [ |
@@ -98,7 +99,7 @@ diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | |||
98 | index feda596939..11b4375ed5 100644 | 99 | index feda596939..11b4375ed5 100644 |
99 | --- a/src/basic/cgroup-util.c | 100 | --- a/src/basic/cgroup-util.c |
100 | +++ b/src/basic/cgroup-util.c | 101 | +++ b/src/basic/cgroup-util.c |
101 | @@ -37,6 +37,7 @@ | 102 | @@ -38,6 +38,7 @@ |
102 | #include "unit-name.h" | 103 | #include "unit-name.h" |
103 | #include "user-util.h" | 104 | #include "user-util.h" |
104 | #include "xattr-util.h" | 105 | #include "xattr-util.h" |
@@ -122,14 +123,14 @@ diff --git a/src/basic/log.c b/src/basic/log.c | |||
122 | index fc5793139e..515218fca8 100644 | 123 | index fc5793139e..515218fca8 100644 |
123 | --- a/src/basic/log.c | 124 | --- a/src/basic/log.c |
124 | +++ b/src/basic/log.c | 125 | +++ b/src/basic/log.c |
125 | @@ -39,6 +39,7 @@ | 126 | @@ -40,6 +40,7 @@ |
126 | #include "terminal-util.h" | 127 | #include "terminal-util.h" |
127 | #include "time-util.h" | 128 | #include "time-util.h" |
128 | #include "utf8.h" | 129 | #include "utf8.h" |
129 | +#include "missing_stdlib.h" | 130 | +#include "missing_stdlib.h" |
130 | 131 | ||
131 | #define SNDBUF_SIZE (8*1024*1024) | 132 | #define SNDBUF_SIZE (8*1024*1024) |
132 | #define IOVEC_MAX 128U | 133 | #define IOVEC_MAX 256U |
133 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h | 134 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h |
134 | index 8c76f93eb2..9068bfb4f0 100644 | 135 | index 8c76f93eb2..9068bfb4f0 100644 |
135 | --- a/src/basic/missing_stdlib.h | 136 | --- a/src/basic/missing_stdlib.h |
@@ -166,7 +167,7 @@ diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c | |||
166 | index bc74fbef8f..cdb609bb84 100644 | 167 | index bc74fbef8f..cdb609bb84 100644 |
167 | --- a/src/basic/mountpoint-util.c | 168 | --- a/src/basic/mountpoint-util.c |
168 | +++ b/src/basic/mountpoint-util.c | 169 | +++ b/src/basic/mountpoint-util.c |
169 | @@ -13,6 +13,7 @@ | 170 | @@ -18,6 +18,7 @@ |
170 | #include "missing_stat.h" | 171 | #include "missing_stat.h" |
171 | #include "missing_syscall.h" | 172 | #include "missing_syscall.h" |
172 | #include "mkdir.h" | 173 | #include "mkdir.h" |
@@ -214,14 +215,14 @@ diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c | |||
214 | index eea70d8606..ae3abd8402 100644 | 215 | index eea70d8606..ae3abd8402 100644 |
215 | --- a/src/basic/proc-cmdline.c | 216 | --- a/src/basic/proc-cmdline.c |
216 | +++ b/src/basic/proc-cmdline.c | 217 | +++ b/src/basic/proc-cmdline.c |
217 | @@ -15,6 +15,7 @@ | 218 | @@ -16,6 +16,7 @@ |
218 | #include "special.h" | ||
219 | #include "string-util.h" | 219 | #include "string-util.h" |
220 | #include "strv.h" | ||
220 | #include "virt.h" | 221 | #include "virt.h" |
221 | +#include "missing_stdlib.h" | 222 | +#include "missing_stdlib.h" |
222 | 223 | ||
223 | int proc_cmdline(char **ret) { | 224 | int proc_cmdline_filter_pid1_args(char **argv, char ***ret) { |
224 | const char *e; | 225 | enum { |
225 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | 226 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
226 | index bcba5a5208..64a95dd866 100644 | 227 | index bcba5a5208..64a95dd866 100644 |
227 | --- a/src/basic/procfs-util.c | 228 | --- a/src/basic/procfs-util.c |
@@ -238,7 +239,7 @@ diff --git a/src/basic/time-util.c b/src/basic/time-util.c | |||
238 | index b700f364ef..48a26bcec9 100644 | 239 | index b700f364ef..48a26bcec9 100644 |
239 | --- a/src/basic/time-util.c | 240 | --- a/src/basic/time-util.c |
240 | +++ b/src/basic/time-util.c | 241 | +++ b/src/basic/time-util.c |
241 | @@ -26,6 +26,7 @@ | 242 | @@ -27,6 +27,7 @@ |
242 | #include "string-util.h" | 243 | #include "string-util.h" |
243 | #include "strv.h" | 244 | #include "strv.h" |
244 | #include "time-util.h" | 245 | #include "time-util.h" |
@@ -262,7 +263,7 @@ diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c | |||
262 | index b5484eda78..54ed62c790 100644 | 263 | index b5484eda78..54ed62c790 100644 |
263 | --- a/src/core/dbus-cgroup.c | 264 | --- a/src/core/dbus-cgroup.c |
264 | +++ b/src/core/dbus-cgroup.c | 265 | +++ b/src/core/dbus-cgroup.c |
265 | @@ -21,6 +21,7 @@ | 266 | @@ -23,6 +23,7 @@ |
266 | #include "parse-util.h" | 267 | #include "parse-util.h" |
267 | #include "path-util.h" | 268 | #include "path-util.h" |
268 | #include "percent-util.h" | 269 | #include "percent-util.h" |
@@ -274,7 +275,7 @@ diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c | |||
274 | index f514b8fd12..4febd0d496 100644 | 275 | index f514b8fd12..4febd0d496 100644 |
275 | --- a/src/core/dbus-execute.c | 276 | --- a/src/core/dbus-execute.c |
276 | +++ b/src/core/dbus-execute.c | 277 | +++ b/src/core/dbus-execute.c |
277 | @@ -45,6 +45,7 @@ | 278 | @@ -48,6 +48,7 @@ |
278 | #include "unit-printf.h" | 279 | #include "unit-printf.h" |
279 | #include "user-util.h" | 280 | #include "user-util.h" |
280 | #include "utf8.h" | 281 | #include "utf8.h" |
@@ -298,7 +299,7 @@ diff --git a/src/core/execute.c b/src/core/execute.c | |||
298 | index 853e87450f..8ef76de9ab 100644 | 299 | index 853e87450f..8ef76de9ab 100644 |
299 | --- a/src/core/execute.c | 300 | --- a/src/core/execute.c |
300 | +++ b/src/core/execute.c | 301 | +++ b/src/core/execute.c |
301 | @@ -105,6 +105,7 @@ | 302 | @@ -113,6 +113,7 @@ |
302 | #include "unit-serialize.h" | 303 | #include "unit-serialize.h" |
303 | #include "user-util.h" | 304 | #include "user-util.h" |
304 | #include "utmp-wtmp.h" | 305 | #include "utmp-wtmp.h" |
@@ -310,9 +311,9 @@ diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | |||
310 | index e843743777..e149807492 100644 | 311 | index e843743777..e149807492 100644 |
311 | --- a/src/core/kmod-setup.c | 312 | --- a/src/core/kmod-setup.c |
312 | +++ b/src/core/kmod-setup.c | 313 | +++ b/src/core/kmod-setup.c |
313 | @@ -12,6 +12,7 @@ | 314 | @@ -13,6 +13,7 @@ |
314 | #include "recurse-dir.h" | ||
315 | #include "string-util.h" | 315 | #include "string-util.h" |
316 | #include "strv.h" | ||
316 | #include "virt.h" | 317 | #include "virt.h" |
317 | +#include "missing_stdlib.h" | 318 | +#include "missing_stdlib.h" |
318 | 319 | ||
@@ -322,7 +323,7 @@ diff --git a/src/core/service.c b/src/core/service.c | |||
322 | index 9ad3c3d995..b112d64919 100644 | 323 | index 9ad3c3d995..b112d64919 100644 |
323 | --- a/src/core/service.c | 324 | --- a/src/core/service.c |
324 | +++ b/src/core/service.c | 325 | +++ b/src/core/service.c |
325 | @@ -42,6 +42,7 @@ | 326 | @@ -45,6 +45,7 @@ |
326 | #include "unit-name.h" | 327 | #include "unit-name.h" |
327 | #include "unit.h" | 328 | #include "unit.h" |
328 | #include "utf8.h" | 329 | #include "utf8.h" |
@@ -346,7 +347,7 @@ diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-g | |||
346 | index efc553b698..acea922311 100644 | 347 | index efc553b698..acea922311 100644 |
347 | --- a/src/fstab-generator/fstab-generator.c | 348 | --- a/src/fstab-generator/fstab-generator.c |
348 | +++ b/src/fstab-generator/fstab-generator.c | 349 | +++ b/src/fstab-generator/fstab-generator.c |
349 | @@ -33,6 +33,7 @@ | 350 | @@ -37,6 +37,7 @@ |
350 | #include "unit-name.h" | 351 | #include "unit-name.h" |
351 | #include "virt.h" | 352 | #include "virt.h" |
352 | #include "volatile-util.h" | 353 | #include "volatile-util.h" |
@@ -358,7 +359,7 @@ diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journ | |||
358 | index 7df264fb53..9463a0e9fb 100644 | 359 | index 7df264fb53..9463a0e9fb 100644 |
359 | --- a/src/journal-remote/journal-remote-main.c | 360 | --- a/src/journal-remote/journal-remote-main.c |
360 | +++ b/src/journal-remote/journal-remote-main.c | 361 | +++ b/src/journal-remote/journal-remote-main.c |
361 | @@ -25,6 +25,7 @@ | 362 | @@ -26,6 +26,7 @@ |
362 | #include "stat-util.h" | 363 | #include "stat-util.h" |
363 | #include "string-table.h" | 364 | #include "string-table.h" |
364 | #include "strv.h" | 365 | #include "strv.h" |
@@ -370,7 +371,7 @@ diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c | |||
370 | index da0fac548e..c1c043e0e0 100644 | 371 | index da0fac548e..c1c043e0e0 100644 |
371 | --- a/src/journal/journalctl.c | 372 | --- a/src/journal/journalctl.c |
372 | +++ b/src/journal/journalctl.c | 373 | +++ b/src/journal/journalctl.c |
373 | @@ -72,6 +72,7 @@ | 374 | @@ -77,6 +77,7 @@ |
374 | #include "unit-name.h" | 375 | #include "unit-name.h" |
375 | #include "user-util.h" | 376 | #include "user-util.h" |
376 | #include "varlink.h" | 377 | #include "varlink.h" |
@@ -406,7 +407,7 @@ diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-sock | |||
406 | index 64037e4fe0..9b9ce0aaa9 100644 | 407 | index 64037e4fe0..9b9ce0aaa9 100644 |
407 | --- a/src/libsystemd/sd-bus/bus-socket.c | 408 | --- a/src/libsystemd/sd-bus/bus-socket.c |
408 | +++ b/src/libsystemd/sd-bus/bus-socket.c | 409 | +++ b/src/libsystemd/sd-bus/bus-socket.c |
409 | @@ -27,6 +27,7 @@ | 410 | @@ -28,6 +28,7 @@ |
410 | #include "string-util.h" | 411 | #include "string-util.h" |
411 | #include "user-util.h" | 412 | #include "user-util.h" |
412 | #include "utf8.h" | 413 | #include "utf8.h" |
@@ -418,7 +419,7 @@ diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c | |||
418 | index f6a5e4aa06..b36faa79a3 100644 | 419 | index f6a5e4aa06..b36faa79a3 100644 |
419 | --- a/src/libsystemd/sd-bus/sd-bus.c | 420 | --- a/src/libsystemd/sd-bus/sd-bus.c |
420 | +++ b/src/libsystemd/sd-bus/sd-bus.c | 421 | +++ b/src/libsystemd/sd-bus/sd-bus.c |
421 | @@ -44,6 +44,7 @@ | 422 | @@ -46,6 +46,7 @@ |
422 | #include "string-util.h" | 423 | #include "string-util.h" |
423 | #include "strv.h" | 424 | #include "strv.h" |
424 | #include "user-util.h" | 425 | #include "user-util.h" |
@@ -442,10 +443,10 @@ diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/ | |||
442 | index 9947947ef2..8dc6f93159 100644 | 443 | index 9947947ef2..8dc6f93159 100644 |
443 | --- a/src/libsystemd/sd-journal/sd-journal.c | 444 | --- a/src/libsystemd/sd-journal/sd-journal.c |
444 | +++ b/src/libsystemd/sd-journal/sd-journal.c | 445 | +++ b/src/libsystemd/sd-journal/sd-journal.c |
445 | @@ -41,6 +41,7 @@ | 446 | @@ -44,6 +44,7 @@ |
446 | #include "string-util.h" | ||
447 | #include "strv.h" | 447 | #include "strv.h" |
448 | #include "syslog-util.h" | 448 | #include "syslog-util.h" |
449 | #include "uid-alloc-range.h" | ||
449 | +#include "missing_stdlib.h" | 450 | +#include "missing_stdlib.h" |
450 | 451 | ||
451 | #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC) | 452 | #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC) |
@@ -454,7 +455,7 @@ diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c | |||
454 | index ba2fca32c6..e1f9caa13b 100644 | 455 | index ba2fca32c6..e1f9caa13b 100644 |
455 | --- a/src/login/pam_systemd.c | 456 | --- a/src/login/pam_systemd.c |
456 | +++ b/src/login/pam_systemd.c | 457 | +++ b/src/login/pam_systemd.c |
457 | @@ -32,6 +32,7 @@ | 458 | @@ -34,6 +34,7 @@ |
458 | #include "locale-util.h" | 459 | #include "locale-util.h" |
459 | #include "login-util.h" | 460 | #include "login-util.h" |
460 | #include "macro.h" | 461 | #include "macro.h" |
@@ -466,7 +467,7 @@ diff --git a/src/network/generator/network-generator.c b/src/network/generator/n | |||
466 | index 1090934bfc..69a77f66e2 100644 | 467 | index 1090934bfc..69a77f66e2 100644 |
467 | --- a/src/network/generator/network-generator.c | 468 | --- a/src/network/generator/network-generator.c |
468 | +++ b/src/network/generator/network-generator.c | 469 | +++ b/src/network/generator/network-generator.c |
469 | @@ -13,6 +13,7 @@ | 470 | @@ -14,6 +14,7 @@ |
470 | #include "string-table.h" | 471 | #include "string-table.h" |
471 | #include "string-util.h" | 472 | #include "string-util.h" |
472 | #include "strv.h" | 473 | #include "strv.h" |
@@ -502,7 +503,7 @@ diff --git a/src/portable/portable.c b/src/portable/portable.c | |||
502 | index 7811833fac..c6414da91c 100644 | 503 | index 7811833fac..c6414da91c 100644 |
503 | --- a/src/portable/portable.c | 504 | --- a/src/portable/portable.c |
504 | +++ b/src/portable/portable.c | 505 | +++ b/src/portable/portable.c |
505 | @@ -39,6 +39,7 @@ | 506 | @@ -40,6 +40,7 @@ |
506 | #include "strv.h" | 507 | #include "strv.h" |
507 | #include "tmpfile-util.h" | 508 | #include "tmpfile-util.h" |
508 | #include "user-util.h" | 509 | #include "user-util.h" |
@@ -550,7 +551,7 @@ diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c | |||
550 | index 1e95e36678..640ee031d5 100644 | 551 | index 1e95e36678..640ee031d5 100644 |
551 | --- a/src/shared/bus-unit-util.c | 552 | --- a/src/shared/bus-unit-util.c |
552 | +++ b/src/shared/bus-unit-util.c | 553 | +++ b/src/shared/bus-unit-util.c |
553 | @@ -50,6 +50,7 @@ | 554 | @@ -51,6 +51,7 @@ |
554 | #include "unit-def.h" | 555 | #include "unit-def.h" |
555 | #include "user-util.h" | 556 | #include "user-util.h" |
556 | #include "utf8.h" | 557 | #include "utf8.h" |
@@ -562,7 +563,7 @@ diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c | |||
562 | index d09ec5148d..f38a8f7cc1 100644 | 563 | index d09ec5148d..f38a8f7cc1 100644 |
563 | --- a/src/shared/bus-util.c | 564 | --- a/src/shared/bus-util.c |
564 | +++ b/src/shared/bus-util.c | 565 | +++ b/src/shared/bus-util.c |
565 | @@ -21,6 +21,7 @@ | 566 | @@ -24,6 +24,7 @@ |
566 | #include "path-util.h" | 567 | #include "path-util.h" |
567 | #include "socket-util.h" | 568 | #include "socket-util.h" |
568 | #include "stdio-util.h" | 569 | #include "stdio-util.h" |
@@ -586,9 +587,9 @@ diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c | |||
586 | index d9eabec886..534c6cf7e3 100644 | 587 | index d9eabec886..534c6cf7e3 100644 |
587 | --- a/src/shared/journal-importer.c | 588 | --- a/src/shared/journal-importer.c |
588 | +++ b/src/shared/journal-importer.c | 589 | +++ b/src/shared/journal-importer.c |
589 | @@ -15,6 +15,7 @@ | 590 | @@ -16,6 +16,7 @@ |
590 | #include "parse-util.h" | ||
591 | #include "string-util.h" | 591 | #include "string-util.h" |
592 | #include "strv.h" | ||
592 | #include "unaligned.h" | 593 | #include "unaligned.h" |
593 | +#include "missing_stdlib.h" | 594 | +#include "missing_stdlib.h" |
594 | 595 | ||
@@ -622,7 +623,7 @@ diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c | |||
622 | index 821049e667..08a5bdae3d 100644 | 623 | index 821049e667..08a5bdae3d 100644 |
623 | --- a/src/socket-proxy/socket-proxyd.c | 624 | --- a/src/socket-proxy/socket-proxyd.c |
624 | +++ b/src/socket-proxy/socket-proxyd.c | 625 | +++ b/src/socket-proxy/socket-proxyd.c |
625 | @@ -26,6 +26,7 @@ | 626 | @@ -27,6 +27,7 @@ |
626 | #include "set.h" | 627 | #include "set.h" |
627 | #include "socket-util.h" | 628 | #include "socket-util.h" |
628 | #include "string-util.h" | 629 | #include "string-util.h" |
@@ -646,7 +647,7 @@ diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c | |||
646 | index 8e4d57ee72..6b4555b4d5 100644 | 647 | index 8e4d57ee72..6b4555b4d5 100644 |
647 | --- a/src/udev/udev-builtin-path_id.c | 648 | --- a/src/udev/udev-builtin-path_id.c |
648 | +++ b/src/udev/udev-builtin-path_id.c | 649 | +++ b/src/udev/udev-builtin-path_id.c |
649 | @@ -22,6 +22,7 @@ | 650 | @@ -24,6 +24,7 @@ |
650 | #include "sysexits.h" | 651 | #include "sysexits.h" |
651 | #include "udev-builtin.h" | 652 | #include "udev-builtin.h" |
652 | #include "udev-util.h" | 653 | #include "udev-util.h" |
@@ -670,13 +671,13 @@ diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | |||
670 | index 5bd09a64d1..0ce79f815c 100644 | 671 | index 5bd09a64d1..0ce79f815c 100644 |
671 | --- a/src/udev/udev-rules.c | 672 | --- a/src/udev/udev-rules.c |
672 | +++ b/src/udev/udev-rules.c | 673 | +++ b/src/udev/udev-rules.c |
673 | @@ -34,6 +34,7 @@ | 674 | @@ -35,6 +35,7 @@ |
674 | #include "udev-util.h" | 675 | #include "udev-util.h" |
675 | #include "user-util.h" | 676 | #include "user-util.h" |
676 | #include "virt.h" | 677 | #include "virt.h" |
677 | +#include "missing_stdlib.h" | 678 | +#include "missing_stdlib.h" |
678 | 679 | ||
679 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") | 680 | #define RULES_DIRS ((const char* const*) CONF_PATHS_STRV("udev/rules.d")) |
680 | 681 | ||
681 | -- | 682 | -- |
682 | 2.39.2 | 683 | 2.39.2 |