From 024ec91297e82be55c2de8062f2c349b901c405551064f5b946d3493d73cb3c3 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 23 Mar 2023 08:13:40 +0000 Subject: [PATCH] - Import commit d914e29c33c0248226a01112a3e03181ef17b06b d914e29c33 Revert "hwdb: fix swapped buttons for Logitech Lift left" (bsc#1209618) 8360811d23 udev-rules: fix nvme symlink creation on namespace changes (bsc#1207410) b77c13a130 systemctl: explicitly cast the constants to uint64_t (bsc#1209305) 51011f280d test: assume run-unit-tests.py and unit tests are installed in the same directory d86e346f6b tests: don't use absolute paths when installing binaries in TEST-58-REPART 97e886c1f4 tests: fix inverted condition in testsuite-58.sh - Drop 5002-systemctl-explicitly-cast-the-constants-to-uint64_t.patch, it's been merged in 'SUSE/v253', see above. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1363 --- ...citly-cast-the-constants-to-uint64_t.patch | 46 ------------------- systemd-v253.1+suse.6.gd914e29c33.tar.xz | 3 ++ systemd-v253.1.tar.xz | 3 -- systemd.changes | 15 ++++++ systemd.spec | 8 ++-- 5 files changed, 22 insertions(+), 53 deletions(-) delete mode 100644 5002-systemctl-explicitly-cast-the-constants-to-uint64_t.patch create mode 100644 systemd-v253.1+suse.6.gd914e29c33.tar.xz delete mode 100644 systemd-v253.1.tar.xz diff --git a/5002-systemctl-explicitly-cast-the-constants-to-uint64_t.patch b/5002-systemctl-explicitly-cast-the-constants-to-uint64_t.patch deleted file mode 100644 index b36b3f96..00000000 --- a/5002-systemctl-explicitly-cast-the-constants-to-uint64_t.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1d88ce4c9ca16b95d6c29d107f26265ffc7d4379 Mon Sep 17 00:00:00 2001 -From: Frantisek Sumsal -Date: Fri, 3 Mar 2023 12:17:27 +0100 -Subject: [PATCH 5002/5002] systemctl: explicitly cast the constants to - uint64_t - -Otherwise under certain conditions `va_arg()` might get garbage instead -of the expected value, i.e.: - -$ sudo build-o0/systemctl disable asdfasfaf -sd_bus_message_appendv: Got uint64_t: 0 -Failed to disable unit: Unit file asdfasfaf.service does not exist. - -$ sudo build-o1/systemctl disable asdfasfaf -sd_bus_message_appendv: Got uint64_t: 7954875719681572864 -Failed to disable unit: Invalid argument - -(reproduced on an armv7hl machine) - -Resolves: #26568 -Follow-up to: bf1bea43f15 -Related issue: https://github.com/systemd/systemd/pull/14470#discussion_r362893735 - -(cherry picked from commit c63bfd0884cf20e48befbee49d41f667660a8802) - -[fbui: fixes bsc#1209305] ---- - src/systemctl/systemctl-enable.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c -index 86d9f602fa..f94a286122 100644 ---- a/src/systemctl/systemctl-enable.c -+++ b/src/systemctl/systemctl-enable.c -@@ -211,7 +211,7 @@ int verb_enable(int argc, char *argv[], void *userdata) { - - if (send_runtime) { - if (streq(method, "DisableUnitFilesWithFlagsAndInstallInfo")) -- r = sd_bus_message_append(m, "t", arg_runtime ? UNIT_FILE_RUNTIME : 0); -+ r = sd_bus_message_append(m, "t", arg_runtime ? (uint64_t) UNIT_FILE_RUNTIME : UINT64_C(0)); - else - r = sd_bus_message_append(m, "b", arg_runtime); - if (r < 0) --- -2.35.3 - diff --git a/systemd-v253.1+suse.6.gd914e29c33.tar.xz b/systemd-v253.1+suse.6.gd914e29c33.tar.xz new file mode 100644 index 00000000..3499edab --- /dev/null +++ b/systemd-v253.1+suse.6.gd914e29c33.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79ae68b276a576457d6036e830dd95d377dcaacc716056c1d66633e65f10709a +size 8202064 diff --git a/systemd-v253.1.tar.xz b/systemd-v253.1.tar.xz deleted file mode 100644 index 18ac8b19..00000000 --- a/systemd-v253.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84aad84973ab74246f5eff59641a5570c3a0bb6fce66402a4644212d71f38d07 -size 8205144 diff --git a/systemd.changes b/systemd.changes index ebaa360b..17bc1df5 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Mar 23 07:07:34 UTC 2023 - Franck Bui + +- Import commit d914e29c33c0248226a01112a3e03181ef17b06b + + d914e29c33 Revert "hwdb: fix swapped buttons for Logitech Lift left" (bsc#1209618) + 8360811d23 udev-rules: fix nvme symlink creation on namespace changes (bsc#1207410) + b77c13a130 systemctl: explicitly cast the constants to uint64_t (bsc#1209305) + 51011f280d test: assume run-unit-tests.py and unit tests are installed in the same directory + d86e346f6b tests: don't use absolute paths when installing binaries in TEST-58-REPART + 97e886c1f4 tests: fix inverted condition in testsuite-58.sh + +- Drop 5002-systemctl-explicitly-cast-the-constants-to-uint64_t.patch, it's been + merged in 'SUSE/v253', see above. + ------------------------------------------------------------------- Tue Mar 21 09:31:46 UTC 2023 - Valentin Lefebvre diff --git a/systemd.spec b/systemd.spec index cb71f32b..b69ba771 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version %nil +%define archive_version +suse.6.gd914e29c33 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -213,7 +213,6 @@ Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch # will be removed as soon as a proper fix will be merged by upstream. Patch5000: 5000-core-manager-run-generators-directly-when-we-are-in-.patch Patch5001: 5001-Revert-core-propagate-stop-too-if-restart-is-issued.patch -Patch5002: 5002-systemctl-explicitly-cast-the-constants-to-uint64_t.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -587,6 +586,7 @@ refer to %{_testsuitedir}/integration-tests/README.testsuite. Summary: Experimental systemd features License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +# Needed by ukify Requires: python3-pefile %systemd_requires # These Recommends because some symbols of these libs are dlopen()ed by home stuff @@ -614,8 +614,8 @@ change without the usual backwards-compatibility promises. Components that turn out to be stable and considered as fully supported will be merged into the main package or moved into a dedicated package. -Currently this package contains: homed, repart, userdbd, oomd, measure and -pcrphase. +Currently this package contains: homed, repart, userdbd, oomd, measure, +pcrphase and ukify. In case you want to create a user with systemd-homed quickly, here are the steps you can follow: