diff options
author | CoprDistGit <infra@openeuler.org> | 2025-10-07 16:18:00 +0000 |
---|---|---|
committer | CoprDistGit <infra@openeuler.org> | 2025-10-07 16:18:00 +0000 |
commit | adf82f3f43427e1fb8052d2583946343651407b4 (patch) | |
tree | 0768c0aff12a5d98d1b9ac93f9761037fd03c9be | |
parent | 5f3f6518f2f73ac2a5e9136f5f0e212ab173a291 (diff) |
automatic import of polkit
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | backport-CVE-2025-7519.patch | 27 | ||||
-rw-r--r-- | backport-Leaking-zombie-child-processes.patch | 33 | ||||
-rw-r--r-- | modify-admin-authorization-from-wheel-group-to-root.patch | 11 | ||||
-rw-r--r-- | polkit.spec | 221 | ||||
-rw-r--r-- | polkit.sysusers | 2 | ||||
-rw-r--r-- | sources | 1 |
7 files changed, 296 insertions, 0 deletions
@@ -0,0 +1 @@ +/126.tar.gz diff --git a/backport-CVE-2025-7519.patch b/backport-CVE-2025-7519.patch new file mode 100644 index 0000000..afd77da --- /dev/null +++ b/backport-CVE-2025-7519.patch @@ -0,0 +1,27 @@ +From 107d3801361b9f9084f78710178e683391f1d245 Mon Sep 17 00:00:00 2001 +From: Jan Rybar <jrybar@redhat.com> +Date: Fri, 6 Jun 2025 13:25:55 +0200 +Subject: [PATCH] Nested .policy files cause xml parsing overflow leading to + crash + +--- + src/polkitbackend/polkitbackendactionpool.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/polkitbackend/polkitbackendactionpool.c b/src/polkitbackend/polkitbackendactionpool.c +index 43f89cb9..f4acca9d 100644 +--- a/src/polkitbackend/polkitbackendactionpool.c ++++ b/src/polkitbackend/polkitbackendactionpool.c +@@ -739,6 +739,12 @@ _start (void *data, const char *el, const char **attr) + guint num_attr; + ParserData *pd = data; + ++ if (pd->stack_depth < 0 || pd->stack_depth >= PARSER_MAX_DEPTH) ++ { ++ g_warning ("XML parsing reached max depth?"); ++ goto error; ++ } ++ + for (num_attr = 0; attr[num_attr] != NULL; num_attr++) + ; + diff --git a/backport-Leaking-zombie-child-processes.patch b/backport-Leaking-zombie-child-processes.patch new file mode 100644 index 0000000..8d05a22 --- /dev/null +++ b/backport-Leaking-zombie-child-processes.patch @@ -0,0 +1,33 @@ +From 8638ec5cd534dcc616b68e5b0744c493c0c71dc9 Mon Sep 17 00:00:00 2001 +From: Jan Rybar <jrybar@redhat.com> +Date: Wed, 15 Aug 2018 16:11:22 +0200 +Subject: [PATCH] Leaking zombie child processes Resolves: bz#106021 + +Subject: [PATCH] polkitd: fix zombie not reaped when js spawned process timed + out + +The child watch source attached to thread context didn't work due +to the release of it's main loop and context outside. So we attach +the source to the global default main context to make it work and +avoid zombies. +--- + src/polkitbackend/polkitbackendcommon.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/polkitbackend/polkitbackendcommon.c b/src/polkitbackend/polkitbackendcommon.c +index 517f3c6..7602714 100644 +--- a/src/polkitbackend/polkitbackendcommon.c ++++ b/src/polkitbackend/polkitbackendcommon.c +@@ -1595,7 +1595,8 @@ utils_spawn_data_free (UtilsSpawnData *data) + (GSourceFunc) utils_child_watch_from_release_cb, + source, + (GDestroyNotify) g_source_destroy); +- g_source_attach (source, data->main_context); ++ /* attach source to the global default main context */ ++ g_source_attach (source, NULL); + g_source_unref (source); + data->child_pid = 0; + } +-- +2.33.0 + diff --git a/modify-admin-authorization-from-wheel-group-to-root.patch b/modify-admin-authorization-from-wheel-group-to-root.patch new file mode 100644 index 0000000..800e84b --- /dev/null +++ b/modify-admin-authorization-from-wheel-group-to-root.patch @@ -0,0 +1,11 @@ +diff --git a/src/polkitbackend/50-default.rules.in b/src/polkitbackend/50-default.rules.in +index 9a91cec..96d497a 100644 +--- a/src/polkitbackend/50-default.rules.in ++++ b/src/polkitbackend/50-default.rules.in +@@ -8,5 +8,5 @@ + // about configuring polkit. + + polkit.addAdminRule(function(action, subject) { +- return ["unix-group:@PRIVILEGED_GROUP@"]; ++ return ["unix-user:0"]; + }); diff --git a/polkit.spec b/polkit.spec new file mode 100644 index 0000000..83bc628 --- /dev/null +++ b/polkit.spec @@ -0,0 +1,221 @@ +Name: polkit +Version: 126 +Release: 1 +Summary: Define and Handle authorizations tool +License: LGPL-2.0-or-later +URL: https://polkit.pages.freedesktop.org/polkit/ +Source0: https://github.com/polkit-org/polkit/archive/refs/tags/%{version}.tar.gz +Source1: polkit.sysusers + +Patch0: modify-admin-authorization-from-wheel-group-to-root.patch +Patch1: backport-CVE-2025-7519.patch +Patch2: backport-Leaking-zombie-child-processes.patch + +BuildRequires: meson >= 0.63.0 +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(duktape) >= 2.2.0 +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(gio-2.0) >= 2.30.0 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.30.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.30.0 +BuildRequires: pkgconfig(gobject-2.0) >= 2.30.0 +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.6.2 +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(systemd) +BuildRequires: pam-devel +BuildRequires: gettext +BuildRequires: gtk-doc + +Requires: dbus polkit-pkla-compat +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +%{?sysusers_requires_compat} +%{?systemd_requires} + +Obsoletes: PolicyKit <= 0.10 polkit-desktop-policy < 0.103 polkit-js-engine < 0.120-5 polkit < 0.113-3 +Provides: PolicyKit = 0.11 polkit-desktop-policy = 0.103 polkit-js-engine = %{version}-%{release} +Conflicts: polkit-gnome < 0.97 + +%description +polkit is a toolkit for defining and handling authorizations. It is +used for allowing unprivileged processes to speak to privileged processes. + +%package libs +Summary: Libraries for polkit + +%description libs +Libraries files for polkit. + +%package devel +Summary: Development files for %{name} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-help = %{version}-%{release} +Obsoletes: PolicyKit-devel <= 0.10 PolicyKit-docs <= 0.10 +Provides: PolicyKit-devel = 0.11 PolicyKit-docs = 0.11 polkit-docs + +%description devel +Development files for polkit. + +%package_help + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +%meson -D gtk_doc=true \ + -D introspection=true \ + -D man=true \ + -D session_tracking=logind \ + -D os_type='redhat' \ + -D examples=false \ + -D tests=false \ + -D js_engine=duktape + +%meson_build + +%install +%meson_install +install -Dpm 0644 %{S:1} %{buildroot}%{_sysusersdir}/polkit.conf + +%find_lang polkit-1 + +%pre +%sysusers_create_compat %{S:1} + +%post +%systemd_post polkit.service + +%preun +%systemd_preun polkit.service + +%postun +%systemd_postun_with_restart polkit.service + +%files -f polkit-1.lang +%license COPYING +%doc NEWS.md README.md +%{_datadir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf +%{_datadir}/dbus-1/system-services/* +%{_unitdir}/polkit.service +%dir %{_datadir}/polkit-1/ +%dir %{_datadir}/polkit-1/actions +%attr(0700,polkitd,root) %dir %{_datadir}/polkit-1/rules.d +%{_datadir}/polkit-1/actions/org.freedesktop.policykit.policy +%{_datadir}/polkit-1/policyconfig-1.dtd +%{_datadir}/polkit-1/rules.d/50-default.rules +%attr(0700,polkitd,root) %dir %{_sysconfdir}/polkit-1/rules.d +%{_bindir}/pkaction +%{_bindir}/pkcheck +%{_bindir}/pkttyagent +%dir %{_prefix}/lib/polkit-1 +%{_prefix}/lib/polkit-1/polkitd +%dir %{_prefix}/lib/pam.d +%{_prefix}/lib/pam.d/polkit-1 +%dir %{_prefix}/lib/sysusers.d +%{_prefix}/lib/sysusers.d/polkit.conf +%{_tmpfilesdir}/polkit-tmpfiles.conf +%{_sysusersdir}/polkit.conf +%attr(4755,root,root) %{_bindir}/pkexec +%attr(4755,root,root) %{_prefix}/lib/polkit-1/polkit-agent-helper-1 + +%files libs +%{_libdir}/lib*.so.* +%{_libdir}/girepository-1.0/*.typelib + +%files devel +%{_includedir}/* +%{_libdir}/pkgconfig/*.pc +%{_libdir}/lib*.so +%{_datadir}/gir-1.0/*.gir +%{_datadir}/gettext/its/polkit.its +%{_datadir}/gettext/its/polkit.loc +%{_datadir}/gtk-doc/* + +%files help +%{_mandir}/man?/* + +%changelog +* Tue Oct 07 2025 Funda Wang <fundawang@yeah.net> - 126-1 +- update to 126 +- convert user creation to systemd style + +* Tue Aug 5 2025 fuanan <fuanan3@h-partners.com> - 125-3 +- fix Leaking zombie child processes + +* Mon Jul 28 2025 yanglongkang <yanglongkang@h-partners.com> - 125-2 +- fix CVE-2025-7519 + +* Wed Aug 21 2024 Funda Wang <fundawang@yeah.net> - 125-1 +- update to 125 + +* Thu Aug 15 2024 dillon chen <dillon.chen@gmail.com> - 124-1 +- update to 124 + - duktape:prevent wrongful termination of runway thread + +* Tue Jan 30 2024 wangyu <wangqingsan@huawei.com> - 123-1 +- update to 123 + - duktape:prevent wrongful termination of runway thread + - harden the security features of the systemd service + - add packit build tool + - systemd:set User/Group and don't change uid/gid if already set + - stop installing /usr/share/polkit-1/rules.d as 700/polkitd + - moving the 50-default.rules file location + +* Fri Feb 17 2023 wangyu <wangyu283@huawei.com> - 122-2 +- revert: delete the expired polkit-pkla-compat + +* Wed Feb 01 2023 wangyu <wangyu283@huawei.com> - 122-1 +- Upgrade to 122 + +* Thu Dec 15 2022 shenxiangwei <shenxiangwei1@huawei.com> - 0.120-8 +- fix core dump problem + +* Fri Nov 11 2022 wangyu <wangyu283@huawei.com> - 0.120-7 +- remake even configure scripts and configuration headers that are newer than their input files + +* Mon Aug 22 2022 gengqihu <qihu@nfschina.com> - 0.120-6 +- delete the expired polkit-pkla-compat + +* Thu May 5 2022 Hugel <gengqihu1@h-partners.com> - 0.120-5 +- change jsauthority to duktape + +* Fri Apr 1 2022 Hugel <gengqihu1@h-partners.com> - 0.120-4 +- change jsauthority to mozjs91 + +* Sat Mar 5 2022 panxiaohe <panxh.life@foxmail.com> - 0.120-3 +- Fix CVE-2021-4115 + +* Wed Jan 26 2022 panxiaohe <panxiaohe@huawei.com> - 0.120-2 +- Fix CVE-2021-4034 + +* Mon Dec 6 2021 panxiaohe <panxiaohe@huawei.com> - 0.120-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:update to 0.120 + +* Tue Jun 15 2021 panxiaohe <panxiaohe@huawei.com> - 0.118-2 +- Fix CVE-2021-3560 + +* Thu Jan 21 2021 yixiangzhike <zhangxingliang3@huawei.com> - 0.118-1 +- update to 0.118 + +* Wed Jan 6 2021 Liquor <lirui130@huawei.com> - 0.116-6 +- remove 10-shutdown.rules + +* Fri Nov 13 2020 Hugel <gengqihu1@huawei.com> - 0.116-5 +- Port polkit to mozjs78 + +* Sun Sep 29 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.116-4 +- Add libs + +* Sat Sep 28 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.116-3 +- Fix requires + +* Tue Sep 24 2019 chengquan <chengquan3@huawei.com> - 0.116-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:revise requires of polkit + +* Wed Sep 18 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.116-1 +- Package init diff --git a/polkit.sysusers b/polkit.sysusers new file mode 100644 index 0000000..a5e1db7 --- /dev/null +++ b/polkit.sysusers @@ -0,0 +1,2 @@ +#Type Name ID GECOS Home directory Shell +u polkitd 114 "User for polkitd" / /sbin/nologin @@ -0,0 +1 @@ +db4ce0a42d5bf8002061f8e34ee9bdd0 126.tar.gz |