From 98480c98cd6e75023fda898636abc23c917457bf282c2fc5f1b456266604f768 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 11 Jul 2023 13:51:36 +0000 Subject: [PATCH] - Import commit 6458c066547eaadf0e9709e441ea36ad03faa860 (merge of v253.6) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/07bb12a282b0ea378850934c4a76008b448b8bad...6458c066547eaadf0e9709e441ea36ad03faa860 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1409 --- ...ice-when-resetting-PID-also-reset-kn.patch | 41 ------------------- files.udev | 1 + systemd-v253.5+suse.29.g07bb12a282.tar.xz | 3 -- systemd-v253.6+suse.30.g6458c06654.tar.xz | 3 ++ systemd.changes | 8 ++++ systemd.spec | 5 +-- 6 files changed, 14 insertions(+), 47 deletions(-) delete mode 100644 5002-Revert-core-service-when-resetting-PID-also-reset-kn.patch delete mode 100644 systemd-v253.5+suse.29.g07bb12a282.tar.xz create mode 100644 systemd-v253.6+suse.30.g6458c06654.tar.xz diff --git a/5002-Revert-core-service-when-resetting-PID-also-reset-kn.patch b/5002-Revert-core-service-when-resetting-PID-also-reset-kn.patch deleted file mode 100644 index aedd52d..0000000 --- a/5002-Revert-core-service-when-resetting-PID-also-reset-kn.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 996b00ede87d6a870332e63974a7d4def3c2f1b0 Mon Sep 17 00:00:00 2001 -From: msizanoen -Date: Mon, 12 Jun 2023 10:30:12 +0700 -Subject: [PATCH 5002/5002] Revert "core/service: when resetting PID also reset - known flag" - -This reverts commit ff32060f2ed37b68dc26256b05e2e69013b0ecfe. - -This change is incorrect as we don't want to mark the PID as invalid but -only mark it as dead. - -The change in question also breaks user level socket activation for -`podman.service` as the termination of the main `podman system service` -process is not properly handled, causing any application accessing the -socket to hang. - -This is because the user-level `podman.service` unit also hosts two -non-main processes: `rootlessport` and `rootlessport-child` which causes -the `cgroup_good` check to still succeed. - -The original submitter of this commit is recommended to find another -more correct way to fix the cgroupsv1 issue on CentOS 8. ---- - src/core/service.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/core/service.c b/src/core/service.c -index 171e091dff..cecdd3bf50 100644 ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -3752,7 +3752,6 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { - return; - - s->main_pid = 0; -- s->main_pid_known = false; - exec_status_exit(&s->main_exec_status, &s->exec_context, pid, code, status); - - if (s->main_command) { --- -2.35.3 - diff --git a/files.udev b/files.udev index ad56d05..03e95f4 100644 --- a/files.udev +++ b/files.udev @@ -213,6 +213,7 @@ %{_udevhwdbdir}/70-mouse.hwdb %{_udevhwdbdir}/70-pda.hwdb %{_udevhwdbdir}/70-pointingstick.hwdb +%{_udevhwdbdir}/70-sound-card.hwdb %{_udevhwdbdir}/70-touchpad.hwdb %{_udevhwdbdir}/80-ieee1394-unit-function.hwdb %{_udevrulesdir}/50-udev-default.rules diff --git a/systemd-v253.5+suse.29.g07bb12a282.tar.xz b/systemd-v253.5+suse.29.g07bb12a282.tar.xz deleted file mode 100644 index f3a8929..0000000 --- a/systemd-v253.5+suse.29.g07bb12a282.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c46ef61c3b92f4a83c203bf5961c1d6ca50fddbd8d97c59060feae0f04dc24ee -size 8218940 diff --git a/systemd-v253.6+suse.30.g6458c06654.tar.xz b/systemd-v253.6+suse.30.g6458c06654.tar.xz new file mode 100644 index 0000000..f15e164 --- /dev/null +++ b/systemd-v253.6+suse.30.g6458c06654.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62818a190a6d47eaf50cecbcc1683879933265f6bd3d1b5c6f9e7d36a5660097 +size 8256000 diff --git a/systemd.changes b/systemd.changes index b88a307..2822845 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 11 13:32:04 UTC 2023 - Franck Bui + +- Import commit 6458c066547eaadf0e9709e441ea36ad03faa860 (merge of v253.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/07bb12a282b0ea378850934c4a76008b448b8bad...6458c066547eaadf0e9709e441ea36ad03faa860 + ------------------------------------------------------------------- Tue Jul 11 12:56:59 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index e8f10cd..c821f02 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 +suse.29.g07bb12a282 +%define archive_version +suse.30.g6458c06654 %define _testsuitedir %{_systemd_util_dir}/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -73,7 +73,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 253.5 +Version: 253.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -214,7 +214,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-Revert-core-service-when-resetting-PID-also-reset-kn.patch %description Systemd is a system and service manager, compatible with SysV and LSB