diff options
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/systemd/files/255-install-format-overflow.patch | 43 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-255.4.ebuild | 1 |
3 files changed, 46 insertions, 1 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 72f6d2a53c9f..2d3bf8d15ddd 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,4 +1,5 @@ AUX 254-PrivateDevices-userdbd.patch 9905 BLAKE2B ecc0cac69ddb680f57b537ac239c2b561b41635e1a6208dd72b7ae85b437f8ddfc0a026fe3530df7777b6c35f2e79edf73ab26e8ea590dd15865836e55eff3c0 SHA512 ce2b9e10854d87a6f179ed9b3ef85b5caf7b51ecd65584d70a90a3151b113158fd5565dbf9806e177f801a555161bf783e77230f9c6c67904484d04de3aac497 +AUX 255-install-format-overflow.patch 2190 BLAKE2B 8e0660f4b84174b0946f5f069e0d4bcf55d0c4b5964a978648364a84a3d3f04b21a8434794c58c035eac76b4114f32372ed8017de0cd77cbddcf934e60d9202b SHA512 dab24bd709c41723ddbd43cde51f525b8b959fe55ebd343e3f04d4977430d9eca5cc7c06bbc9c4ef3444747e9780621b648247cd946d3baa28820b03011e72ad AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada AUX gentoo-journald-audit-r1.patch 1941 BLAKE2B 93f1a0ba8dd575359e5ab4bd04f99ed3172dbe1ba14d8cade6fc08b0158e66847900d8531898ee9ec3855ac3857cf07a3e10804a3cb67719f0e9378437eba836 SHA512 affbe58aa65ebca7c1c6d790f9f68ffc44bda70a08165f5298ee4a84ab1c16cf534950ac50ffdb61b647e5eb068f51c333a76e39d8336e21e5d1b0199192139c AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da64fdea0531eadfe97ac8bc4e63b44404dcf89940d438de6b7081158b78639945ce0fadbb103c SHA512 f74f05991102b644dee7822a80cb8e6c14cd1eb48bd9342bc662d5947b9f04d32e875d2a5e6476a67bdbface4d2b2159b99c11d72eb4658c5cb4caf595f138be @@ -15,6 +16,6 @@ EBUILD systemd-254.10.ebuild 15480 BLAKE2B 64930d2eb7fbca3db987ae14fbb6cead1a7ad EBUILD systemd-254.8-r1.ebuild 15472 BLAKE2B 22b00b6cefce875f30858d26a8b900096a99551dddda2b2a6a9d4461ad6278bf875254d0b83eab8dbc8b68ef3c647ec1a35cb4bec9cf6d9fec6e723b2539eeaa SHA512 f70748a5b0066598e7d87ee3dc21d3b472c51f327249a0629fc77d24156294b74820442f76597fe5d7ce1d823a6680805e9b2d4aea7a9c1ad0719d494c9de27b EBUILD systemd-254.9-r1.ebuild 15526 BLAKE2B 8dcef82b133f49b1916c107575b64e695f0aa2e37aeb41adb9f8e5f0dfa5417343dae73df750c752b85830541b0d6eac4979a432fe9b196476e6a176e93077c0 SHA512 35585c7eb25279b5d668db7ed714e81158b3df57385440225d0267a8e8b7f9f479503de18d5fdfe90c5a29f6f528dc476eb270c7fcdfafa30a5beccf6c050694 EBUILD systemd-255.3-r1.ebuild 14918 BLAKE2B 9a556ae3888e0ccd49bd08da7971645335a9458a3f0a00aff392da4ea40fcee992797154371e93c24404807c5d3ccc6d8c8afd6c4ad07e41e101232aff89d35c SHA512 ecedaa74e75503942a4604d52d4b232b7f016e1a36d42d49ae9be1f4aa5ec0f3422c10847aba40ffe49a22c33c8575e9f3ebc90a45e660bb9f4c8cf201d2db7b -EBUILD systemd-255.4.ebuild 14922 BLAKE2B d5209e4494884f558b5c90465f3403b055ca220b4af9ca4d439719083c07bed52840574412943c212f108ae9400656bc7f90c2fe579bee145bbc2718341b7675 SHA512 5f153c7d46e1c5b3675f4c4424cb2a3e77d26cba4460a3872917d1900eea4d810ab1c3ba9e14233ff72e32aad14e3c8b0faa13d139215f052f3aae6f8ae11ae1 +EBUILD systemd-255.4.ebuild 14972 BLAKE2B aea429c546c3e8be3d9502b61de0132d0f0a37dba69568e3de6dbd12504737301945ca1849c05b03cd818c72ae3a84e5916597c3ace0c565e89d0d5e2f831e4a SHA512 b6827177f903dfa0df18c9d3177096dbb74664a460d3cf12c1b65af77a4a4a999a58aeb75adc037d72befbf62f03095bc1471661965410f5597701702fb052b7 EBUILD systemd-9999.ebuild 14922 BLAKE2B d5209e4494884f558b5c90465f3403b055ca220b4af9ca4d439719083c07bed52840574412943c212f108ae9400656bc7f90c2fe579bee145bbc2718341b7675 SHA512 5f153c7d46e1c5b3675f4c4424cb2a3e77d26cba4460a3872917d1900eea4d810ab1c3ba9e14233ff72e32aad14e3c8b0faa13d139215f052f3aae6f8ae11ae1 MISC metadata.xml 2609 BLAKE2B 8947f3b696fbba7b90e838a54fbb4fd933c71907c8011652fc2b7d68d4ce5f78a19f350a309e4c0f66ef0159376c9064ba9c15941ecf1748c359c4ae3b072102 SHA512 dfeea24b7a93f5d4af4ac47b87ba08092d069fb1a4749c0c1f36a669be6115eaea8f67e6183b6a4f155ef90d7714f74299109420d569c2b0545d80584ed0e97e diff --git a/sys-apps/systemd/files/255-install-format-overflow.patch b/sys-apps/systemd/files/255-install-format-overflow.patch new file mode 100644 index 000000000000..3dca7d8e8ec7 --- /dev/null +++ b/sys-apps/systemd/files/255-install-format-overflow.patch @@ -0,0 +1,43 @@ +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. */ + + diff --git a/sys-apps/systemd/systemd-255.4.ebuild b/sys-apps/systemd/systemd-255.4.ebuild index 183166373f1d..c1d288b695d5 100644 --- a/sys-apps/systemd/systemd-255.4.ebuild +++ b/sys-apps/systemd/systemd-255.4.ebuild @@ -248,6 +248,7 @@ src_unpack() { src_prepare() { local PATCHES=( + "${FILESDIR}"/255-install-format-overflow.patch ) if ! use vanilla; then |