diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch | 52 |
1 files changed, 25 insertions, 27 deletions
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 0dea933270..e65c543614 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 | |||
@@ -22,11 +22,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
22 | create mode 100644 src/basic/parse-printf-format.c | 22 | create mode 100644 src/basic/parse-printf-format.c |
23 | create mode 100644 src/basic/parse-printf-format.h | 23 | create mode 100644 src/basic/parse-printf-format.h |
24 | 24 | ||
25 | diff --git a/meson.build b/meson.build | 25 | Index: systemd-stable/meson.build |
26 | index fc216d22da24..a25996803d64 100644 | 26 | =================================================================== |
27 | --- a/meson.build | 27 | --- systemd-stable.orig/meson.build |
28 | +++ b/meson.build | 28 | +++ systemd-stable/meson.build |
29 | @@ -640,6 +640,7 @@ endif | 29 | @@ -638,6 +638,7 @@ endif |
30 | foreach header : ['crypt.h', | 30 | foreach header : ['crypt.h', |
31 | 'linux/memfd.h', | 31 | 'linux/memfd.h', |
32 | 'linux/vm_sockets.h', | 32 | 'linux/vm_sockets.h', |
@@ -34,11 +34,11 @@ index fc216d22da24..a25996803d64 100644 | |||
34 | 'sys/auxv.h', | 34 | 'sys/auxv.h', |
35 | 'valgrind/memcheck.h', | 35 | 'valgrind/memcheck.h', |
36 | 'valgrind/valgrind.h', | 36 | 'valgrind/valgrind.h', |
37 | diff --git a/src/basic/meson.build b/src/basic/meson.build | 37 | Index: systemd-stable/src/basic/meson.build |
38 | index ccb22e159505..25c77ea6bc0e 100644 | 38 | =================================================================== |
39 | --- a/src/basic/meson.build | 39 | --- systemd-stable.orig/src/basic/meson.build |
40 | +++ b/src/basic/meson.build | 40 | +++ systemd-stable/src/basic/meson.build |
41 | @@ -313,6 +313,11 @@ foreach item : [['af', af_list_txt, 'af', ''], | 41 | @@ -317,6 +317,11 @@ foreach item : [['af', af_list_txt, |
42 | endforeach | 42 | endforeach |
43 | 43 | ||
44 | basic_sources += generated_gperf_headers | 44 | basic_sources += generated_gperf_headers |
@@ -50,11 +50,10 @@ index ccb22e159505..25c77ea6bc0e 100644 | |||
50 | basic_gcrypt_sources = files( | 50 | basic_gcrypt_sources = files( |
51 | 'gcrypt-util.c', | 51 | 'gcrypt-util.c', |
52 | 'gcrypt-util.h') | 52 | 'gcrypt-util.h') |
53 | diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c | 53 | Index: systemd-stable/src/basic/parse-printf-format.c |
54 | new file mode 100644 | 54 | =================================================================== |
55 | index 000000000000..49437e544540 | ||
56 | --- /dev/null | 55 | --- /dev/null |
57 | +++ b/src/basic/parse-printf-format.c | 56 | +++ systemd-stable/src/basic/parse-printf-format.c |
58 | @@ -0,0 +1,273 @@ | 57 | @@ -0,0 +1,273 @@ |
59 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ | 58 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ |
60 | + | 59 | + |
@@ -329,11 +328,10 @@ index 000000000000..49437e544540 | |||
329 | + | 328 | + |
330 | + return last; | 329 | + return last; |
331 | +} | 330 | +} |
332 | diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h | 331 | Index: systemd-stable/src/basic/parse-printf-format.h |
333 | new file mode 100644 | 332 | =================================================================== |
334 | index 000000000000..47be7522d7fa | ||
335 | --- /dev/null | 333 | --- /dev/null |
336 | +++ b/src/basic/parse-printf-format.h | 334 | +++ systemd-stable/src/basic/parse-printf-format.h |
337 | @@ -0,0 +1,57 @@ | 335 | @@ -0,0 +1,57 @@ |
338 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ | 336 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ |
339 | + | 337 | + |
@@ -392,10 +390,10 @@ index 000000000000..47be7522d7fa | |||
392 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); | 390 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); |
393 | + | 391 | + |
394 | +#endif /* HAVE_PRINTF_H */ | 392 | +#endif /* HAVE_PRINTF_H */ |
395 | diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h | 393 | Index: systemd-stable/src/basic/stdio-util.h |
396 | index c3b9448d4f4f..2937aa13b178 100644 | 394 | =================================================================== |
397 | --- a/src/basic/stdio-util.h | 395 | --- systemd-stable.orig/src/basic/stdio-util.h |
398 | +++ b/src/basic/stdio-util.h | 396 | +++ systemd-stable/src/basic/stdio-util.h |
399 | @@ -1,13 +1,13 @@ | 397 | @@ -1,13 +1,13 @@ |
400 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 398 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
401 | #pragma once | 399 | #pragma once |
@@ -411,10 +409,10 @@ index c3b9448d4f4f..2937aa13b178 100644 | |||
411 | 409 | ||
412 | #define snprintf_ok(buf, len, fmt, ...) \ | 410 | #define snprintf_ok(buf, len, fmt, ...) \ |
413 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) | 411 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) |
414 | diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c | 412 | Index: systemd-stable/src/journal/journal-send.c |
415 | index 912ecef73cce..43ed756bda53 100644 | 413 | =================================================================== |
416 | --- a/src/journal/journal-send.c | 414 | --- systemd-stable.orig/src/journal/journal-send.c |
417 | +++ b/src/journal/journal-send.c | 415 | +++ systemd-stable/src/journal/journal-send.c |
418 | @@ -2,7 +2,6 @@ | 416 | @@ -2,7 +2,6 @@ |
419 | 417 | ||
420 | #include <errno.h> | 418 | #include <errno.h> |
@@ -423,7 +421,7 @@ index 912ecef73cce..43ed756bda53 100644 | |||
423 | #include <stddef.h> | 421 | #include <stddef.h> |
424 | #include <sys/un.h> | 422 | #include <sys/un.h> |
425 | #include <unistd.h> | 423 | #include <unistd.h> |
426 | @@ -20,6 +19,7 @@ | 424 | @@ -21,6 +20,7 @@ |
427 | #include "stdio-util.h" | 425 | #include "stdio-util.h" |
428 | #include "string-util.h" | 426 | #include "string-util.h" |
429 | #include "tmpfile-util.h" | 427 | #include "tmpfile-util.h" |