From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 74A8C15852A for ; Tue, 20 Aug 2024 08:02:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 437AE2BC017; Tue, 20 Aug 2024 08:01:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 137442BC017 for ; Tue, 20 Aug 2024 08:01:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A18E341E1C for ; Tue, 20 Aug 2024 08:01:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 416DB1F0D for ; Tue, 20 Aug 2024 08:01:47 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1724140898.6b924a9198c23f8627fbb8509e1e95a12879c274.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/255-install-format-overflow.patch X-VCS-Directories: sys-apps/systemd/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 6b924a9198c23f8627fbb8509e1e95a12879c274 X-VCS-Branch: master Date: Tue, 20 Aug 2024 08:01:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d27a3468-5b82-454f-a0dd-423f9b67527e X-Archives-Hash: 3ab533b9b464af4542304b7971e4d2ee commit: 6b924a9198c23f8627fbb8509e1e95a12879c274 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Jul 22 16:48:44 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Aug 20 08:01:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b924a91 sys-apps/systemd: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Joonas Niilola gentoo.org> .../files/255-install-format-overflow.patch | 43 ---------------------- 1 file changed, 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 -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. */ - -