From 4925638df7511dc291c05590d8f6a361c1c4ba0f071edd4f03d33c9579dab6f6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 13 Feb 2024 14:43:36 +0000 Subject: [PATCH 1/5] - Update the version of libbpf dlopened by systemd (weak dependency) (bsc#1219440) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1489 --- systemd.changes | 5 +++++ systemd.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/systemd.changes b/systemd.changes index 08e85a9b..84de9e01 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 13 14:37:28 UTC 2024 - Franck Bui + +- Update the version of libbpf dlopened by systemd (weak dependency) (bsc#1219440) + ------------------------------------------------------------------- Tue Feb 6 14:48:27 UTC 2024 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 74c76cf8..ff6c56d2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -147,9 +147,10 @@ Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding Requires(post): pam-config >= 0.79-5 -# This Recommends because some symbols of libpcre2 are dlopen()ed by journalctl +# These weak dependencies because some features are optional and enabled at +# runtime with the presence of the relevant libs. Recommends: libpcre2-8-0 -Recommends: libbpf0 +Recommends: libbpf1 %endif Provides: group(systemd-journal) Conflicts: filesystem < 11.5 From d45596786fff777e76b76e21d13cd1c10e002687f8a2ec5fcb97535c7eca7fe7 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 14 Feb 2024 08:07:41 +0000 Subject: [PATCH 2/5] - Import commit fa94ab006d09686cef121aaa3baa10cf5ca95e19 (merge of v254.9) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/67a5ac1043417d900bf417a884372ae14a96ef69...fa94ab006d09686cef121aaa3baa10cf5ca95e19 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1490 --- systemd-v254.8+suse.22.g67a5ac1043.tar.xz | 3 --- systemd-v254.9+suse.23.gfa94ab006d.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 systemd-v254.8+suse.22.g67a5ac1043.tar.xz create mode 100644 systemd-v254.9+suse.23.gfa94ab006d.tar.xz diff --git a/systemd-v254.8+suse.22.g67a5ac1043.tar.xz b/systemd-v254.8+suse.22.g67a5ac1043.tar.xz deleted file mode 100644 index 1e72540b..00000000 --- a/systemd-v254.8+suse.22.g67a5ac1043.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bedcb8262cd6cccbd2d16aff5466c8e98c92ae5108e65f8fb88dcc47a0f8d93 -size 10403896 diff --git a/systemd-v254.9+suse.23.gfa94ab006d.tar.xz b/systemd-v254.9+suse.23.gfa94ab006d.tar.xz new file mode 100644 index 00000000..862054ab --- /dev/null +++ b/systemd-v254.9+suse.23.gfa94ab006d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0da57148d7984a29756972448d169db13b6819f70fc4bf1ce9cfbef5a69ae024 +size 10406528 diff --git a/systemd.changes b/systemd.changes index 84de9e01..52875085 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 14 07:40:08 UTC 2024 - Franck Bui + +- Import commit fa94ab006d09686cef121aaa3baa10cf5ca95e19 (merge of v254.9) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/67a5ac1043417d900bf417a884372ae14a96ef69...fa94ab006d09686cef121aaa3baa10cf5ca95e19 + ------------------------------------------------------------------- Tue Feb 13 14:37:28 UTC 2024 - Franck Bui diff --git a/systemd.spec b/systemd.spec index ff6c56d2..c5cecddf 100644 --- a/systemd.spec +++ b/systemd.spec @@ -18,7 +18,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define archive_version +suse.22.g67a5ac1043 +%define archive_version +suse.23.gfa94ab006d %define _testsuitedir %{_systemd_util_dir}/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -79,7 +79,7 @@ fi \ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 254.8 +Version: 254.9 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later From 648decfc0c945920afb4146688828e28b594ad9f59cd8e08c4e650322157f4ee Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 14 Feb 2024 09:39:26 +0000 Subject: [PATCH 3/5] - Import commit fbf9f32eb774ba6ec54e0d5d53b36baaf3e6b146 fbf9f32eb7 test/test-shutdown.py: optionally display the test I/Os in a dedicated log file cd012774df test-69: send SIGTERM to ask systemd-nspawn to properly stop the container d883b83244 man: Document ranges for distributions config files and local config files OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1491 --- systemd-v254.9+suse.23.gfa94ab006d.tar.xz | 3 --- systemd-v254.9+suse.26.gfbf9f32eb7.tar.xz | 3 +++ systemd.changes | 9 +++++++++ systemd.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 systemd-v254.9+suse.23.gfa94ab006d.tar.xz create mode 100644 systemd-v254.9+suse.26.gfbf9f32eb7.tar.xz diff --git a/systemd-v254.9+suse.23.gfa94ab006d.tar.xz b/systemd-v254.9+suse.23.gfa94ab006d.tar.xz deleted file mode 100644 index 862054ab..00000000 --- a/systemd-v254.9+suse.23.gfa94ab006d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0da57148d7984a29756972448d169db13b6819f70fc4bf1ce9cfbef5a69ae024 -size 10406528 diff --git a/systemd-v254.9+suse.26.gfbf9f32eb7.tar.xz b/systemd-v254.9+suse.26.gfbf9f32eb7.tar.xz new file mode 100644 index 00000000..437bf047 --- /dev/null +++ b/systemd-v254.9+suse.26.gfbf9f32eb7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff1d20fb5e5b20a96dd72e121055e3d55563fb15714a9a0be451f98ac14ff75e +size 10405520 diff --git a/systemd.changes b/systemd.changes index 52875085..d9da4c76 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Feb 14 08:16:32 UTC 2024 - Franck Bui + +- Import commit fbf9f32eb774ba6ec54e0d5d53b36baaf3e6b146 + + fbf9f32eb7 test/test-shutdown.py: optionally display the test I/Os in a dedicated log file + cd012774df test-69: send SIGTERM to ask systemd-nspawn to properly stop the container + d883b83244 man: Document ranges for distributions config files and local config files + ------------------------------------------------------------------- Wed Feb 14 07:40:08 UTC 2024 - Franck Bui diff --git a/systemd.spec b/systemd.spec index c5cecddf..af4b29b6 100644 --- a/systemd.spec +++ b/systemd.spec @@ -18,7 +18,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define archive_version +suse.23.gfa94ab006d +%define archive_version +suse.26.gfbf9f32eb7 %define _testsuitedir %{_systemd_util_dir}/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit From 796f5535eefc03e1edbb18a7bc0dcb9c2c102d3c421cd4f02b934e928ee73bbe Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 19 Feb 2024 08:29:19 +0000 Subject: [PATCH 4/5] - systemd-testsuite: depend on "qemu" instead of "qemu-kvm", the latter is obsolete. (bsc#1218684) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1492 --- systemd.changes | 6 ++++++ systemd.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/systemd.changes b/systemd.changes index d9da4c76..a4a9c724 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 19 08:27:42 UTC 2024 - Franck Bui + +- systemd-testsuite: depend on "qemu" instead of "qemu-kvm", the latter is + obsolete. (bsc#1218684) + ------------------------------------------------------------------- Wed Feb 14 08:16:32 UTC 2024 - Franck Bui diff --git a/systemd.spec b/systemd.spec index af4b29b6..6dc1abfa 100644 --- a/systemd.spec +++ b/systemd.spec @@ -622,7 +622,7 @@ Requires: make Requires: mtools Requires: netcat Requires: python3-pexpect -Requires: qemu-kvm +Requires: qemu Requires: quota Requires: socat Requires: squashfs From 808df0e80db810078d57373bab520a678dab7eda22f7d5fb6f1ec65dd9452ad1 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 19 Feb 2024 09:13:14 +0000 Subject: [PATCH 5/5] - Import commit 53e2aaaf9d69fb1c8f6ae2c9f8a99b02d70d318f 53e2aaaf9d vconsole-setup: don't fail if the only found vc is already used by plymouth (bsc#1218618) 22c4878430 vconsole-setup: port to main-func.h boilerplate OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1493 --- systemd-v254.9+suse.26.gfbf9f32eb7.tar.xz | 3 --- systemd-v254.9+suse.28.g53e2aaaf9d.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 systemd-v254.9+suse.26.gfbf9f32eb7.tar.xz create mode 100644 systemd-v254.9+suse.28.g53e2aaaf9d.tar.xz diff --git a/systemd-v254.9+suse.26.gfbf9f32eb7.tar.xz b/systemd-v254.9+suse.26.gfbf9f32eb7.tar.xz deleted file mode 100644 index 437bf047..00000000 --- a/systemd-v254.9+suse.26.gfbf9f32eb7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff1d20fb5e5b20a96dd72e121055e3d55563fb15714a9a0be451f98ac14ff75e -size 10405520 diff --git a/systemd-v254.9+suse.28.g53e2aaaf9d.tar.xz b/systemd-v254.9+suse.28.g53e2aaaf9d.tar.xz new file mode 100644 index 00000000..48a9e1c4 --- /dev/null +++ b/systemd-v254.9+suse.28.g53e2aaaf9d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0923da810cbcc9246fec9bab9be46d497511a5117e001e3b7c570df9dd5c1cc2 +size 10409356 diff --git a/systemd.changes b/systemd.changes index a4a9c724..28630f23 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 19 08:53:31 UTC 2024 - Franck Bui + +- Import commit 53e2aaaf9d69fb1c8f6ae2c9f8a99b02d70d318f + + 53e2aaaf9d vconsole-setup: don't fail if the only found vc is already used by plymouth (bsc#1218618) + 22c4878430 vconsole-setup: port to main-func.h boilerplate + ------------------------------------------------------------------- Mon Feb 19 08:27:42 UTC 2024 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 6dc1abfa..4d4d15b5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -18,7 +18,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define archive_version +suse.26.gfbf9f32eb7 +%define archive_version +suse.28.g53e2aaaf9d %define _testsuitedir %{_systemd_util_dir}/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit