commit: d988a952564a89892fd14e8e25046825bb93216f Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon May 23 18:34:48 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon May 23 18:34:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d988a952
sys-apps/systemd: backport format string fix Closes: https://bugs.gentoo.org/847010 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/files/251-format-string.patch | 25 +++++++++++++++++++++++++ sys-apps/systemd/systemd-251.ebuild | 1 + 2 files changed, 26 insertions(+) diff --git a/sys-apps/systemd/files/251-format-string.patch b/sys-apps/systemd/files/251-format-string.patch new file mode 100644 index 000000000000..f36cc5d657f3 --- /dev/null +++ b/sys-apps/systemd/files/251-format-string.patch @@ -0,0 +1,25 @@ +From 08e86b15fc22a8e9f1ee0a791dfd35b2fc25e4c4 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer <[email protected]> +Date: Sun, 22 May 2022 14:36:07 +0200 +Subject: [PATCH] coredump: Fix format string type mismatch + +Fixes #23471 +--- + src/coredump/coredump.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c +index c9747416ad3c..994d968d871b 100644 +--- a/src/coredump/coredump.c ++++ b/src/coredump/coredump.c +@@ -512,8 +512,8 @@ static int save_external_coredump( + + if (truncated) + log_struct(LOG_INFO, +- LOG_MESSAGE("Core file was truncated to %zu bytes.", max_size), +- "SIZE_LIMIT=%zu", max_size, ++ LOG_MESSAGE("Core file was truncated to %"PRIu64" bytes.", max_size), ++ "SIZE_LIMIT=%"PRIu64, max_size, + "MESSAGE_ID=" SD_MESSAGE_TRUNCATED_CORE_STR); + + r = fix_permissions(fd, tmp, fn, context, uid); diff --git a/sys-apps/systemd/systemd-251.ebuild b/sys-apps/systemd/systemd-251.ebuild index 8d12de0b47a7..697214806c4b 100644 --- a/sys-apps/systemd/systemd-251.ebuild +++ b/sys-apps/systemd/systemd-251.ebuild @@ -235,6 +235,7 @@ src_prepare() { # Add local patches here PATCHES+=( + "${FILESDIR}/251-format-string.patch" ) if ! use vanilla; then
