package/systemd: bump to version 254.13
Drop patch which is now upstream. Among other things, this fixes building with Linux 6.9.a4ce4095ce
Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Signed-off-by: Arnout Vandecappelle <arnout@mind.be> (cherry picked from commitba19e5162e
) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
45c7276a97
commit
02575ff4d6
@ -1,45 +0,0 @@
|
|||||||
From 8040fa55a1cbc34dede3205a902095ecd26c21e3 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.",
|
|
||||||
|
|
||||||
Upstream: https://github.com/systemd/systemd/commit/8040fa55a1cbc34dede3205a902095ecd26c21e3
|
|
||||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
||||||
---
|
|
||||||
src/shared/install.c | 7 +++++--
|
|
||||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/shared/install.c b/src/shared/install.c
|
|
||||||
index fabf5db7ed2e1..c3a94d1912165 100644
|
|
||||||
--- 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. */
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
|||||||
# sha256 locally computed
|
# sha256 locally computed
|
||||||
sha256 3d23003ea886dbffa5bc84ad72c6edcbde62d32dbdec506e308624e1da509cb0 systemd-254.9.tar.gz
|
sha256 26ac73c2108132b1d11ff939e8b1bece42f1c1da03fdf4a242af5a7cf3ac34f1 systemd-254.13.tar.gz
|
||||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2
|
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2
|
||||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1
|
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1
|
||||||
sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt
|
sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
# - Diff sysusers.d with the previous version
|
# - Diff sysusers.d with the previous version
|
||||||
# - Diff factory/etc/nsswitch.conf with the previous version
|
# - Diff factory/etc/nsswitch.conf with the previous version
|
||||||
# (details are often sprinkled around in README and manpages)
|
# (details are often sprinkled around in README and manpages)
|
||||||
SYSTEMD_VERSION = 254.9
|
SYSTEMD_VERSION = 254.13
|
||||||
SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
|
SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
|
||||||
SYSTEMD_LICENSE = \
|
SYSTEMD_LICENSE = \
|
||||||
LGPL-2.1+, \
|
LGPL-2.1+, \
|
||||||
|
Loading…
Reference in New Issue
Block a user