systemd-252-17

Resolves: #2210237,#2225667

0285-Revert-core-service-when-resetting-PID-also-reset-kn.patch

@@ -0,0 +1,43 @@
+From 85631eff66cb440ba253d36ca5b5bd6d131b0f18 Mon Sep 17 00:00:00 2001
+From: msizanoen <msizanoen@qtmlabs.xyz>
+Date: Mon, 12 Jun 2023 10:30:12 +0700
+Subject: [PATCH] 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.
+
+(cherry picked from commit 996b00ede87d6a870332e63974a7d4def3c2f1b0)
+
+Resolves: #2225667
+Reverts: #2210237
+---
+ src/core/service.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/core/service.c b/src/core/service.c
+index e5127a4ccf..1e14cdc6ca 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -3507,7 +3507,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) {

0286-ci-explicitly-install-python3-lldb-COMPILER_VERSION.patch

@@ -0,0 +1,42 @@
+From 3f2e5cdddd0a11947b493143fbf2ac3c18c9a082 Mon Sep 17 00:00:00 2001
+From: Frantisek Sumsal <frantisek@sumsal.cz>
+Date: Thu, 27 Jul 2023 13:20:17 +0200
+Subject: [PATCH] ci: explicitly install python3-lldb-$COMPILER_VERSION
+
+To avoid apt complaining:
+
+ + apt-get -y install clang-15 lldb-15 lld-15 clangd-15
+Reading package lists...
+Building dependency tree...
+Reading state information...
+Some packages could not be installed. This may mean that you have
+requested an impossible situation or if you are using the unstable
+distribution that some required packages have not yet been created
+or been moved out of Incoming.
+The following information may help to resolve the situation:
+
+The following packages have unmet dependencies:
+ python3-lldb-14 : Conflicts: python3-lldb-x.y
+ python3-lldb-15 : Conflicts: python3-lldb-x.y
+E: Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages.
+
+(cherry picked from commit c5afbac31bb33e7b1f4d59b253425af991a630a4)
+
+Related: #2225667
+---
+ .github/workflows/build_test.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh
+index b60db29efc..745d2e5cbd 100755
+--- a/.github/workflows/build_test.sh
++++ b/.github/workflows/build_test.sh
+@@ -86,7 +86,7 @@ if [[ "$COMPILER" == clang ]]; then
+                "$RELEASE" "$RELEASE" "$COMPILER_VERSION" >/etc/apt/sources.list.d/llvm-toolchain.list
+     fi
+ 
+-    PACKAGES+=("clang-$COMPILER_VERSION" "lldb-$COMPILER_VERSION" "lld-$COMPILER_VERSION" "clangd-$COMPILER_VERSION")
++    PACKAGES+=("clang-$COMPILER_VERSION" "lldb-$COMPILER_VERSION" "python3-lldb-$COMPILER_VERSION" "lld-$COMPILER_VERSION" "clangd-$COMPILER_VERSION")
+ elif [[ "$COMPILER" == gcc ]]; then
+     CC="gcc-$COMPILER_VERSION"
+     CXX="g++-$COMPILER_VERSION"

systemd.spec

@@ -21,7 +21,7 @@
 Name:           systemd
 Url:            https://systemd.io
 Version:        252
-Release:        16%{?dist}
+Release:        17%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        System and Service Manager
@@ -362,6 +362,8 @@ Patch0281: 0281-rules-drop-doubled-space.patch
 Patch0282: 0282-manager-don-t-taint-the-host-if-cgroups-v1-is-used.patch
 Patch0283: 0283-core-service-when-resetting-PID-also-reset-known-fla.patch
 Patch0284: 0284-ci-drop-systemd-stable-from-advanced-commit-linter-c.patch
+Patch0285: 0285-Revert-core-service-when-resetting-PID-also-reset-kn.patch
+Patch0286: 0286-ci-explicitly-install-python3-lldb-COMPILER_VERSION.patch
 
 # Downstream-only patches (9000–9999)
 
@@ -1183,6 +1185,11 @@ getent passwd systemd-oom &>/dev/null || useradd -r -l -g systemd-oom -d / -s /s
 %files standalone-sysusers -f .file-list-standalone-sysusers
 
 %changelog
+* Fri Aug 04 2023 systemd maintenance team <systemd-maint@redhat.com> - 252-17
+- Revert "core/service: when resetting PID also reset known flag" (#2225667
+#2210237)
+- ci: explicitly install python3-lldb-$COMPILER_VERSION (#2225667)
+
 * Mon Jul 17 2023 systemd maintenance team <systemd-maint@redhat.com> - 252-16
 - ci: update permissions for source-git automation workflows (#2170883)
 - pstore: fixes for dmesg.txt reconstruction (#2170883)