summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2019-02-26 09:20:16 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-03 15:38:13 +0000
commit4eb2b3f1503a41474d0c40ada296a9800840267c (patch)
treea8115d141b07b7d064f434dbaa237676abb517b1 /meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
parentf1c766fc4e51ada80c022a63176aafd9b40ef07c (diff)
downloadpoky-4eb2b3f1503a41474d0c40ada296a9800840267c.tar.gz
systemd: upgrade to 241
PATCH REBASED: ============== 0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch 0004-rules-whitelist-hd-devices.patch 0007-rules-watch-metadata-changes-in-ide-devices.patch 0001-Use-getenv-when-secure-versions-are-not-available.patch 0002-don-t-use-glibc-specific-qsort_r.patch 0004-add-fallback-parse_printf_format-implementation.patch 0006-src-basic-missing.h-check-for-missing-strndupa.patch 0007-Include-netinet-if_ether.h.patch 0008-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch 0009-add-missing-FTW_-macros-for-musl.patch 0012-fix-missing-of-__register_atfork-for-non-glibc-build.patch 0013-Use-uintmax_t-for-handling-rlim_t.patch 0014-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch 0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch PATCH DROPPED: ============== 0005-Make-root-s-home-directory-configurable.patch systemd has its hardcoded assumption about /home and /, and it also respects $HOME environment var, so this patch is somehow useless. This patch was originally added but in fact had no real runtime effect except messing up some hardcoded assumptions, and it was accidently manipulated during systemd upgrade. We have in fact not used the orignal patch for more than two releases and things were working out well. 0006-remove-nobody-user-group-checking.patch The issue has been fixed upstream by the following commit. "check nobody user/group validity only when not cross compiling" 0008-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch 0009-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch The issue has been fixed upstream by the following commit. "meson: allow building resolved and machined without nss modules" 0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch 0001-sd-bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch Backport 0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch Merged 0023-resolvconf-fixes-for-the-compatibility-interface.patch 0001-core-when-deserializing-state-always-use-read_line-L.patch 0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch 0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch 0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch 0001-timesync-changes-type-of-drift_freq-to-int64_t.patch Backport 0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch 0002-core-Fix-use-after-free-case-in-load_from_path.patch Merged 0001-meson-rename-Ddebug-to-Ddebug-extra.patch 0024-journald-do-not-store-the-iovec-entry-for-process-co.patch 0025-journald-set-a-limit-on-the-number-of-fields.patch 0026-journal-fix-out-of-bounds-read-CVE-2018-16866.patch CVE-2019-6454.patch sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch 0005-basic-user-util-properly-protect-use-of-gshadow.patch 0022-Use-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch Backport 0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch No build failure for qemux86/qemuppc + musl PATCH ADDED: ============ 0020-missing_type.h-add-__compar_d_fn_t-definition.patch 0021-avoid-redefinition-of-prctl_mm_map-structure.patch 0022-include-sys-wait.h-to-avoid-compile-failure.patch 0023-socket-util.h-include-string.h.patch 0024-test-json.c-define-M_PIl.patch 0001-do-not-disable-buffer-in-writing-files.patch PATCH OTHERS: ============= 0003-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch 0011-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch are combined into one patch: 0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch Add two more PACKAGECONFIG, nss-mymachines and nss-resolve which are introduced by the following commit. meson: allow building resolved and machined without nss modules (From OE-Core rev: 816e08c18dbcf6e84dedc7a4bd96ddfbf2f86ebc) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch33
1 files changed, 17 insertions, 16 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 7652a2d8cc..bb738e22c1 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 @@
1From 582af7ec13131dfcc620ed81de7b211914c4cb03 Mon Sep 17 00:00:00 2001 1From 7bcf3b166694090497a0acd2c5299e4e04fcc9b6 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Fri, 29 Jun 2018 13:43:49 +0800 3Date: Mon, 25 Feb 2019 14:04:21 +0800
4Subject: [PATCH 04/19] add fallback parse_printf_format implementation 4Subject: [PATCH 04/24] add fallback parse_printf_format implementation
5 5
6Upstream-Status: Inappropriate [musl specific] 6Upstream-Status: Inappropriate [musl specific]
7 7
@@ -20,25 +20,25 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
20 create mode 100644 src/basic/parse-printf-format.h 20 create mode 100644 src/basic/parse-printf-format.h
21 21
22diff --git a/meson.build b/meson.build 22diff --git a/meson.build b/meson.build
23index e045b9224..8c16bc979 100644 23index 3386546..44b24ee 100644
24--- a/meson.build 24--- a/meson.build
25+++ b/meson.build 25+++ b/meson.build
26@@ -598,6 +598,7 @@ foreach header : ['crypt.h', 26@@ -667,6 +667,7 @@ foreach header : ['crypt.h',
27 'linux/btrfs.h',
28 'linux/memfd.h', 27 'linux/memfd.h',
29 'linux/vm_sockets.h', 28 'linux/vm_sockets.h',
29 'linux/can/vxcan.h',
30+ 'printf.h', 30+ 'printf.h',
31 'sys/auxv.h', 31 'sys/auxv.h',
32 'valgrind/memcheck.h', 32 'valgrind/memcheck.h',
33 'valgrind/valgrind.h', 33 'valgrind/valgrind.h',
34diff --git a/src/basic/meson.build b/src/basic/meson.build 34diff --git a/src/basic/meson.build b/src/basic/meson.build
35index 31625b178..0c27528e7 100644 35index e5852f3..2192a0c 100644
36--- a/src/basic/meson.build 36--- a/src/basic/meson.build
37+++ b/src/basic/meson.build 37+++ b/src/basic/meson.build
38@@ -302,6 +302,11 @@ foreach item : [['af', af_list_txt, 'af', ''], 38@@ -284,6 +284,11 @@ foreach item : [['af', af_list_txt, 'af', ''],
39 endforeach 39 endforeach
40 40
41 basic_sources += [missing_h] + generated_gperf_headers 41 basic_sources += generated_gperf_headers
42+ 42+
43+if conf.get('HAVE_PRINTF_H') != 1 43+if conf.get('HAVE_PRINTF_H') != 1
44+ basic_sources += [files('parse-printf-format.c')] 44+ basic_sources += [files('parse-printf-format.c')]
@@ -49,7 +49,7 @@ index 31625b178..0c27528e7 100644
49 'gcrypt-util.h') 49 'gcrypt-util.h')
50diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c 50diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c
51new file mode 100644 51new file mode 100644
52index 000000000..49437e544 52index 0000000..49437e5
53--- /dev/null 53--- /dev/null
54+++ b/src/basic/parse-printf-format.c 54+++ b/src/basic/parse-printf-format.c
55@@ -0,0 +1,273 @@ 55@@ -0,0 +1,273 @@
@@ -328,7 +328,7 @@ index 000000000..49437e544
328+} 328+}
329diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h 329diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h
330new file mode 100644 330new file mode 100644
331index 000000000..47be7522d 331index 0000000..47be752
332--- /dev/null 332--- /dev/null
333+++ b/src/basic/parse-printf-format.h 333+++ b/src/basic/parse-printf-format.h
334@@ -0,0 +1,57 @@ 334@@ -0,0 +1,57 @@
@@ -390,10 +390,10 @@ index 000000000..47be7522d
390+ 390+
391+#endif /* HAVE_PRINTF_H */ 391+#endif /* HAVE_PRINTF_H */
392diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h 392diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
393index 73c03274c..30192cd71 100644 393index dc67b6e..cf8d514 100644
394--- a/src/basic/stdio-util.h 394--- a/src/basic/stdio-util.h
395+++ b/src/basic/stdio-util.h 395+++ b/src/basic/stdio-util.h
396@@ -1,12 +1,12 @@ 396@@ -1,13 +1,13 @@
397 /* SPDX-License-Identifier: LGPL-2.1+ */ 397 /* SPDX-License-Identifier: LGPL-2.1+ */
398 #pragma once 398 #pragma once
399 399
@@ -403,12 +403,13 @@ index 73c03274c..30192cd71 100644
403 #include <sys/types.h> 403 #include <sys/types.h>
404 404
405 #include "macro.h" 405 #include "macro.h"
406 #include "util.h"
406+#include "parse-printf-format.h" 407+#include "parse-printf-format.h"
407 408
408 #define snprintf_ok(buf, len, fmt, ...) \ 409 #define snprintf_ok(buf, len, fmt, ...) \
409 ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) 410 ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len))
410diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c 411diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
411index a0621524a..65bcbcd2e 100644 412index 8618454..3fea912 100644
412--- a/src/journal/journal-send.c 413--- a/src/journal/journal-send.c
413+++ b/src/journal/journal-send.c 414+++ b/src/journal/journal-send.c
414@@ -2,7 +2,6 @@ 415@@ -2,7 +2,6 @@
@@ -420,13 +421,13 @@ index a0621524a..65bcbcd2e 100644
420 #include <sys/socket.h> 421 #include <sys/socket.h>
421 #include <sys/un.h> 422 #include <sys/un.h>
422@@ -21,6 +20,7 @@ 423@@ -21,6 +20,7 @@
423 #include "stdio-util.h"
424 #include "string-util.h" 424 #include "string-util.h"
425 #include "tmpfile-util.h"
425 #include "util.h" 426 #include "util.h"
426+#include "parse-printf-format.h" 427+#include "parse-printf-format.h"
427 428
428 #define SNDBUF_SIZE (8*1024*1024) 429 #define SNDBUF_SIZE (8*1024*1024)
429 430
430-- 431--
4312.11.0 4322.7.4
432 433