From 033b0d85a9dd877b046b217fdd9d4eb65e109040 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 9 Apr 2025 15:34:22 +0200 Subject: [PATCH] systemd-252-52 Resolves: RHEL-15051,RHEL-78170,RHEL-79977 --- ...rer-that-tmpfiles-user-group-mode-ar.patch | 48 +++++++++++++++++++ 1112-unit-always-return-1-in-log_kill.patch | 30 ++++++++++++ ...mkosi-workflow-for-z-stream-branches.patch | 32 +++++++++++++ ...si-bump-fedora-version-from-39-to-41.patch | 29 +++++++++++ systemd.spec | 12 ++++- 5 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 1111-man-be-even-clearer-that-tmpfiles-user-group-mode-ar.patch create mode 100644 1112-unit-always-return-1-in-log_kill.patch create mode 100644 1113-ci-enable-mkosi-workflow-for-z-stream-branches.patch create mode 100644 1114-ci-mkosi-bump-fedora-version-from-39-to-41.patch diff --git a/1111-man-be-even-clearer-that-tmpfiles-user-group-mode-ar.patch b/1111-man-be-even-clearer-that-tmpfiles-user-group-mode-ar.patch new file mode 100644 index 0000000..82a087c --- /dev/null +++ b/1111-man-be-even-clearer-that-tmpfiles-user-group-mode-ar.patch @@ -0,0 +1,48 @@ +From 5219fc583393eec83ae2f7a1043bc45c16a8f15f Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 8 Nov 2023 10:56:07 +0100 +Subject: [PATCH] man: be even clearer that tmpfiles user/group/mode are + applied on existing inodes + +I think it was clear already, but let's be even clearer. + +Fixes: #29774 +(cherry picked from commit 3cb938bd12b3603984b982e9b73e4cabd4a608e3) + +Resolves: RHEL-15051 +--- + man/tmpfiles.d.xml | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml +index 379ac9c34f..595b9f6934 100644 +--- a/man/tmpfiles.d.xml ++++ b/man/tmpfiles.d.xml +@@ -546,9 +546,10 @@ w- /proc/sys/vm/swappiness - - - - 10 + removed unless applied to a directory. This functionality is particularly useful in conjunction with + Z. + +- Optionally, if prefixed with :, the configured access mode is only used when +- creating new inodes. If the inode the line refers to already exists, its access mode is left in place +- unmodified. ++ By default the access mode of listed inodes is set to the specified mode regardless if it is ++ created anew, or already existed. Optionally, if prefixed with :, the configured ++ access mode is only applied when creating new inodes, and if the inode the line refers to ++ already exists, its access mode is left in place unmodified. + + + +@@ -569,9 +570,10 @@ w- /proc/sys/vm/swappiness - - - - 10 + Resolvability of User and Group Names for more information on requirements on system user/group + definitions. + +- Optionally, if prefixed with :, the configured user/group information is only +- used when creating new inodes. If the inode the line refers to already exists, its user/group is left +- in place unmodified. ++ By default the ownership of listed inodes is set to the specified user/group regardless if it is ++ created anew, or already existed. Optionally, if prefixed with :, the configured ++ user/group information is only applied when creating new inodes, and if the inode the line refers to ++ already exists, its user/group is left in place unmodified. + + + diff --git a/1112-unit-always-return-1-in-log_kill.patch b/1112-unit-always-return-1-in-log_kill.patch new file mode 100644 index 0000000..6a6f3a3 --- /dev/null +++ b/1112-unit-always-return-1-in-log_kill.patch @@ -0,0 +1,30 @@ +From 99333a18d1f385ec04f48db63494158adf7a1df8 Mon Sep 17 00:00:00 2001 +From: msizanoen1 +Date: Tue, 7 Feb 2023 20:17:21 +0700 +Subject: [PATCH] unit: always return 1 in log_kill + +This ensures that cg_kill_items returns the correct value to let the +manager know that a process was killed. + +(cherry picked from commit 500cd2e83b8246fbf20d99db898039cfba746223) + +Resolves: RHEL-78170 +--- + src/core/unit.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/core/unit.c b/src/core/unit.c +index 03eb3aaecf..d98ecf4367 100644 +--- a/src/core/unit.c ++++ b/src/core/unit.c +@@ -4542,7 +4542,9 @@ static int log_kill(pid_t pid, int sig, void *userdata) { + /* Don't log about processes marked with brackets, under the assumption that these are temporary processes + only, like for example systemd's own PAM stub process. */ + if (comm && comm[0] == '(') +- return 0; ++ /* Although we didn't log anything, as this callback is used in unit_kill_context we must return 1 ++ * here to let the manager know that a process was killed. */ ++ return 1; + + log_unit_notice(userdata, + "Killing process " PID_FMT " (%s) with signal SIG%s.", diff --git a/1113-ci-enable-mkosi-workflow-for-z-stream-branches.patch b/1113-ci-enable-mkosi-workflow-for-z-stream-branches.patch new file mode 100644 index 0000000..03c66fe --- /dev/null +++ b/1113-ci-enable-mkosi-workflow-for-z-stream-branches.patch @@ -0,0 +1,32 @@ +From 42bbdbf52f4aab3a9d34b3a3ce9fa5b12f43d993 Mon Sep 17 00:00:00 2001 +From: msizanoen1 +Date: Tue, 7 Feb 2023 20:17:21 +0700 +Subject: [PATCH] ci: enable mkosi workflow for z-stream branches + +rhel-only: ci + +Related: RHEL-79977 +--- + .github/workflows/mkosi.yml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml +index f9b6d9ba58..aac559401d 100644 +--- a/.github/workflows/mkosi.yml ++++ b/.github/workflows/mkosi.yml +@@ -9,6 +9,7 @@ on: + branches: + - main + - v[0-9]+-stable ++ - rhel-9.*.0 + paths: + - '**' + - '!README*' +@@ -27,6 +28,7 @@ on: + branches: + - main + - v[0-9]+-stable ++ - rhel-9.*.0 + paths: + - '**' + - '!README*' diff --git a/1114-ci-mkosi-bump-fedora-version-from-39-to-41.patch b/1114-ci-mkosi-bump-fedora-version-from-39-to-41.patch new file mode 100644 index 0000000..4ed2669 --- /dev/null +++ b/1114-ci-mkosi-bump-fedora-version-from-39-to-41.patch @@ -0,0 +1,29 @@ +From e43eea1289a3a9a2ff38f6555d367d8d857b89c2 Mon Sep 17 00:00:00 2001 +From: msizanoen1 +Date: Tue, 7 Feb 2023 20:17:21 +0700 +Subject: [PATCH] ci(mkosi): bump fedora version from 39 to 41 + +warning: /var/cache/dnf/fedora-ffabc111530caf27/packages/filesystem-3.18-6.fc39.x86_64.rpm: Header V4 RSA/SHA256 Signature, key ID 18b8e74c: NOKEY + +Error: GPG check FAILED +``` + +rhel-only: ci + +Related: RHEL-79977 +--- + .github/workflows/mkosi.yml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml +index aac559401d..808ae0148e 100644 +--- a/.github/workflows/mkosi.yml ++++ b/.github/workflows/mkosi.yml +@@ -83,6 +83,7 @@ jobs: + [Host] + ToolsTree=default + ToolsTreeDistribution=fedora ++ ToolsTreeRelease=41 + # Sometimes we run on a host with /dev/kvm, but it is broken, so explicitly disable it + QemuKvm=no + EOF diff --git a/systemd.spec b/systemd.spec index 0dfcb30..faef629 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://systemd.io Version: 252 -Release: 51%{?dist} +Release: 52%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -1193,6 +1193,10 @@ Patch1107: 1107-core-Handle-cgroup-pruning-in-on_cgroup_empty_event.patch Patch1108: 1108-Fix-failing-test.patch Patch1109: 1109-unit-don-t-gc-unit-in-oom-queue.patch Patch1110: 1110-core-do-not-GC-units-jobs-that-are-in-the-D-Bus-queu.patch +Patch1111: 1111-man-be-even-clearer-that-tmpfiles-user-group-mode-ar.patch +Patch1112: 1112-unit-always-return-1-in-log_kill.patch +Patch1113: 1113-ci-enable-mkosi-workflow-for-z-stream-branches.patch +Patch1114: 1114-ci-mkosi-bump-fedora-version-from-39-to-41.patch # Downstream-only patches (9000–9999) @@ -2070,6 +2074,12 @@ systemd-hwdb update &>/dev/null || : %{_prefix}/lib/dracut/modules.d/70rhel-net-naming-sysattrs/* %changelog +* Wed Apr 09 2025 systemd maintenance team - 252-52 +- man: be even clearer that tmpfiles user/group/mode are applied on existing inodes (RHEL-15051) +- unit: always return 1 in log_kill (RHEL-78170) +- ci: enable mkosi workflow for z-stream branches (RHEL-79977) +- ci(mkosi): bump fedora version from 39 to 41 (RHEL-79977) + * Tue Jan 28 2025 systemd maintenance team - 252-51 - ci: use ubuntu 22:04 for deploy of man pages (RHEL-70884) - man/tmpfiles: fix off-by-one in example (RHEL-74015)