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 | 60 |
1 files changed, 32 insertions, 28 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 e65c543614..bdd64a0252 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 @@ | |||
1 | From 8af168cefca01f8f2da336f1c82620c284dc74f2 Mon Sep 17 00:00:00 2001 | 1 | From f3dbe29f7620a063af4d8eb3ea7c48ecd410200d Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 14:04:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:04:21 +0800 |
4 | Subject: [PATCH] add fallback parse_printf_format implementation | 4 | Subject: [PATCH 04/26] add fallback parse_printf_format implementation |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | 7 | ||
@@ -10,7 +10,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
11 | [rebased for systemd 243] | 11 | [rebased for systemd 243] |
12 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 12 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
13 | |||
14 | --- | 13 | --- |
15 | meson.build | 1 + | 14 | meson.build | 1 + |
16 | src/basic/meson.build | 5 + | 15 | src/basic/meson.build | 5 + |
@@ -22,11 +21,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
22 | create mode 100644 src/basic/parse-printf-format.c | 21 | create mode 100644 src/basic/parse-printf-format.c |
23 | create mode 100644 src/basic/parse-printf-format.h | 22 | create mode 100644 src/basic/parse-printf-format.h |
24 | 23 | ||
25 | Index: systemd-stable/meson.build | 24 | diff --git a/meson.build b/meson.build |
26 | =================================================================== | 25 | index f406d595e6..6aa47fc755 100644 |
27 | --- systemd-stable.orig/meson.build | 26 | --- a/meson.build |
28 | +++ systemd-stable/meson.build | 27 | +++ b/meson.build |
29 | @@ -638,6 +638,7 @@ endif | 28 | @@ -646,6 +646,7 @@ endif |
30 | foreach header : ['crypt.h', | 29 | foreach header : ['crypt.h', |
31 | 'linux/memfd.h', | 30 | 'linux/memfd.h', |
32 | 'linux/vm_sockets.h', | 31 | 'linux/vm_sockets.h', |
@@ -34,11 +33,11 @@ Index: systemd-stable/meson.build | |||
34 | 'sys/auxv.h', | 33 | 'sys/auxv.h', |
35 | 'valgrind/memcheck.h', | 34 | 'valgrind/memcheck.h', |
36 | 'valgrind/valgrind.h', | 35 | 'valgrind/valgrind.h', |
37 | Index: systemd-stable/src/basic/meson.build | 36 | diff --git a/src/basic/meson.build b/src/basic/meson.build |
38 | =================================================================== | 37 | index 1183ea83ad..aa5c958850 100644 |
39 | --- systemd-stable.orig/src/basic/meson.build | 38 | --- a/src/basic/meson.build |
40 | +++ systemd-stable/src/basic/meson.build | 39 | +++ b/src/basic/meson.build |
41 | @@ -317,6 +317,11 @@ foreach item : [['af', af_list_txt, | 40 | @@ -322,6 +322,11 @@ foreach item : [['af', af_list_txt, 'af', ''], |
42 | endforeach | 41 | endforeach |
43 | 42 | ||
44 | basic_sources += generated_gperf_headers | 43 | basic_sources += generated_gperf_headers |
@@ -50,10 +49,11 @@ Index: systemd-stable/src/basic/meson.build | |||
50 | basic_gcrypt_sources = files( | 49 | basic_gcrypt_sources = files( |
51 | 'gcrypt-util.c', | 50 | 'gcrypt-util.c', |
52 | 'gcrypt-util.h') | 51 | 'gcrypt-util.h') |
53 | Index: systemd-stable/src/basic/parse-printf-format.c | 52 | diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c |
54 | =================================================================== | 53 | new file mode 100644 |
54 | index 0000000000..49437e5445 | ||
55 | --- /dev/null | 55 | --- /dev/null |
56 | +++ systemd-stable/src/basic/parse-printf-format.c | 56 | +++ b/src/basic/parse-printf-format.c |
57 | @@ -0,0 +1,273 @@ | 57 | @@ -0,0 +1,273 @@ |
58 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ | 58 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ |
59 | + | 59 | + |
@@ -328,10 +328,11 @@ Index: systemd-stable/src/basic/parse-printf-format.c | |||
328 | + | 328 | + |
329 | + return last; | 329 | + return last; |
330 | +} | 330 | +} |
331 | Index: systemd-stable/src/basic/parse-printf-format.h | 331 | diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h |
332 | =================================================================== | 332 | new file mode 100644 |
333 | index 0000000000..47be7522d7 | ||
333 | --- /dev/null | 334 | --- /dev/null |
334 | +++ systemd-stable/src/basic/parse-printf-format.h | 335 | +++ b/src/basic/parse-printf-format.h |
335 | @@ -0,0 +1,57 @@ | 336 | @@ -0,0 +1,57 @@ |
336 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ | 337 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ |
337 | + | 338 | + |
@@ -390,12 +391,12 @@ Index: systemd-stable/src/basic/parse-printf-format.h | |||
390 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); | 391 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); |
391 | + | 392 | + |
392 | +#endif /* HAVE_PRINTF_H */ | 393 | +#endif /* HAVE_PRINTF_H */ |
393 | Index: systemd-stable/src/basic/stdio-util.h | 394 | diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h |
394 | =================================================================== | 395 | index 6dc1e72312..cea76b36cf 100644 |
395 | --- systemd-stable.orig/src/basic/stdio-util.h | 396 | --- a/src/basic/stdio-util.h |
396 | +++ systemd-stable/src/basic/stdio-util.h | 397 | +++ b/src/basic/stdio-util.h |
397 | @@ -1,13 +1,13 @@ | 398 | @@ -1,13 +1,13 @@ |
398 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 399 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
399 | #pragma once | 400 | #pragma once |
400 | 401 | ||
401 | -#include <printf.h> | 402 | -#include <printf.h> |
@@ -409,10 +410,10 @@ Index: systemd-stable/src/basic/stdio-util.h | |||
409 | 410 | ||
410 | #define snprintf_ok(buf, len, fmt, ...) \ | 411 | #define snprintf_ok(buf, len, fmt, ...) \ |
411 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) | 412 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) |
412 | Index: systemd-stable/src/journal/journal-send.c | 413 | diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c |
413 | =================================================================== | 414 | index fd3fd7ef9c..e8e6ad555b 100644 |
414 | --- systemd-stable.orig/src/journal/journal-send.c | 415 | --- a/src/journal/journal-send.c |
415 | +++ systemd-stable/src/journal/journal-send.c | 416 | +++ b/src/journal/journal-send.c |
416 | @@ -2,7 +2,6 @@ | 417 | @@ -2,7 +2,6 @@ |
417 | 418 | ||
418 | #include <errno.h> | 419 | #include <errno.h> |
@@ -429,3 +430,6 @@ Index: systemd-stable/src/journal/journal-send.c | |||
429 | 430 | ||
430 | #define SNDBUF_SIZE (8*1024*1024) | 431 | #define SNDBUF_SIZE (8*1024*1024) |
431 | 432 | ||
433 | -- | ||
434 | 2.27.0 | ||
435 | |||