已关闭
fix spawn zombie processes #69
xuraoqing创建于 2025年6月21日关闭于 26 天前
fix spawn zombie processes #69
已关闭
从refs/pull/69/head合入到openEuler-24.03-LTS
共 2 个文件变更+32-1
| @@ -0,0 +1,27 @@ | |||
| 1 | +From 5cb1baaec56ef0510b32a3ba314406d109803809 Mon Sep 17 00:00:00 2001 | ||
| 2 | +From: lin <lin..@..ud.com> | ||
| 3 | +Date: Wed, 26 Jun 2024 15:48:56 +0800 | ||
| 4 | +Subject: [PATCH] fix spawn zombie processess | ||
| 5 | + | ||
| 6 | +Reference:https://github.com/polkit-org/polkit/issues/12 | ||
| 7 | +Conflict:NA | ||
| 8 | +--- | ||
| 9 | + src/polkitbackend/polkitbackendcommon.c | 3 ++- | ||
| 10 | + 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 11 | + | ||
| 12 | +diff --git a/src/polkitbackend/polkitbackendcommon.c b/src/polkitbackend/polkitbackendcommon.c | ||
| 13 | +index 6783dff..1201dd3 100644 | ||
| 14 | +--- a/src/polkitbackend/polkitbackendcommon.c | ||
| 15 | ++++ b/src/polkitbackend/polkitbackendcommon.c | ||
| 16 | +@@ -63,7 +63,8 @@ utils_spawn_data_free (UtilsSpawnData *data) | ||
| 17 | + (GSourceFunc) utils_child_watch_from_release_cb, | ||
| 18 | + source, | ||
| 19 | + (GDestroyNotify) g_source_destroy); | ||
| 20 | +- g_source_attach (source, data->main_context); | ||
| 21 | ++ /* attach source to the global default main context */ | ||
| 22 | ++ g_source_attach (source, NULL); | ||
| 23 | + g_source_unref (source); | ||
| 24 | + data->child_pid = 0; | ||
| 25 | + } | ||
| 26 | +-- | ||
| 27 | +2.33.0 | ||
  一直没有看到回应，因此没有审批合入，现在已经冲突了   | |||
| @@ -1,12 +1,13 @@ | |||
| 1 | Name: polkit | 1 | Name: polkit |
| 2 | Version: 123 | 2 | Version: 123 |
| 3 | -Release: 1 | 3 | +Release: 2 |
| 4 | Summary: Define and Handle authorizations tool | 4 | Summary: Define and Handle authorizations tool |
| 5 | License: LGPLv2+ | 5 | License: LGPLv2+ |
| 6 | URL: http://www.freedesktop.org/wiki/Software/polkit | 6 | URL: http://www.freedesktop.org/wiki/Software/polkit |
| 7 | Source0: https://gitlab.freedesktop.org/polkit/polkit/-/archive/%{version}/%{name}-%{version}.tar.gz | 7 | Source0: https://gitlab.freedesktop.org/polkit/polkit/-/archive/%{version}/%{name}-%{version}.tar.gz |
| 8 | 8 | ||
| 9 | Patch0: modify-admin-authorization-from-wheel-group-to-root.patch | 9 | Patch0: modify-admin-authorization-from-wheel-group-to-root.patch |
| 10 | +Patch1: backport-fix-spawn-zombie-processess.patch | ||
| 10 | 11 | ||
| 11 | BuildRequires: gcc-c++ glib2-devel >= 2.30.0 expat-devel pam-devel gtk-doc gettext-devel | 12 | BuildRequires: gcc-c++ glib2-devel >= 2.30.0 expat-devel pam-devel gtk-doc gettext-devel |
| 12 | BuildRequires: gobject-introspection-devel systemd systemd-devel dbus-devel | 13 | BuildRequires: gobject-introspection-devel systemd systemd-devel dbus-devel |
| @@ -122,6 +123,9 @@ exit 0 | |||
| 122 | %{_datadir}/man/man8/* | 123 | %{_datadir}/man/man8/* |
| 123 | 124 | ||
| 124 | %changelog | 125 | %changelog |
| 126 | +* Sat Jun 21 2025 xuraoqing <xuraoqing@huawei.com> - 122-2 | ||
122 应该是 123。请更新后 retest | |||
| 127 | +- fix spawn zombie processes | ||
| 128 | + | ||
| 125 | * Tue Jan 30 2024 wangyu <wangqingsan@huawei.com> - 123-1 | 129 | * Tue Jan 30 2024 wangyu <wangqingsan@huawei.com> - 123-1 |
| 126 | - update to 123 | 130 | - update to 123 |
| 127 | - duktape:prevent wrongful termination of runway thread | 131 | - duktape:prevent wrongful termination of runway thread |
你这个补丁好像跟上游的补丁不一样啊
https://github.com/polkit-org/polkit/commit/5cce296a8d60a3395c1a372377bdf8f01ed93872 https://github.com/polkit-org/polkit/commit/b709b693346712bf8e8d8e8c77f71b7918fa367d