summaryrefslogtreecommitdiff
path: root/sys-apps/systemd/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-08-20 12:25:59 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-08-20 12:25:59 +0100
commitc431a44e3cfa102e5ef2c9d6bbac48e28c9b15cb (patch)
tree763b8a8b758bcb259d7f7325aac3170f62061933 /sys-apps/systemd/files
parent1f3e27f8fde0df9246ce9151ced7d2dd4e96cb07 (diff)
gentoo auto-resync : 20:08:2024 - 12:25:59
Diffstat (limited to 'sys-apps/systemd/files')
-rw-r--r--sys-apps/systemd/files/255-install-format-overflow.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/sys-apps/systemd/files/255-install-format-overflow.patch b/sys-apps/systemd/files/255-install-format-overflow.patch
deleted file mode 100644
index 3dca7d8e8ec7..000000000000
--- a/sys-apps/systemd/files/255-install-format-overflow.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/systemd/systemd-stable/commit/f85d2c6d1023b1fe558142440b1d63c4fc5f7c98
-https://github.com/systemd/systemd/issues/30448
-https://bugs.gentoo.org/916518
-
-From f85d2c6d1023b1fe558142440b1d63c4fc5f7c98 Mon Sep 17 00:00:00 2001
-From: Luca Boccassi <bluca@debian.org>
-Date: Sat, 24 Feb 2024 12:05:44 +0000
-Subject: [PATCH] install: fix compiler warning about empty directive argument
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On ppc64el with gcc 13.2 on Ubuntu 24.04:
-
-3s In file included from ../src/basic/macro.h:386,
-483s from ../src/basic/alloc-util.h:10,
-483s from ../src/shared/install.c:12:
-483s ../src/shared/install.c: In function ‘install_changes_dump’:
-483s ../src/shared/install.c:432:64: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
-483s 432 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.",
-483s | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-483s ../src/shared/install.c:432:75: note: format string is defined here
-483s 432 | err = log_error_errno(changes[i].type, "Failed to %s unit, unit %s does not exist.",
-
-(cherry picked from commit 8040fa55a1cbc34dede3205a902095ecd26c21e3)
---- a/src/shared/install.c
-+++ b/src/shared/install.c
-@@ -340,9 +340,12 @@ void install_changes_dump(int r, const char *verb, const InstallChange *changes,
- assert(verb || r >= 0);
-
- for (size_t i = 0; i < n_changes; i++) {
-- if (changes[i].type < 0)
-- assert(verb);
- assert(changes[i].path);
-+ /* This tries to tell the compiler that it's safe to use 'verb' in a string format if there
-+ * was an error, but the compiler doesn't care and fails anyway, so strna(verb) is used
-+ * too. */
-+ assert(verb || changes[i].type >= 0);
-+ verb = strna(verb);
-
- /* When making changes here, make sure to also change install_error() in dbus-manager.c. */
-
-