!22 update to 0.120

Merge pull request !22 from panxh_purple/master

backport-CVE-2021-3560.patch

@@ -1,27 +0,0 @@
-From a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81 Mon Sep 17 00:00:00 2001
-From: Jan Rybar <jrybar@redhat.com>
-Date: Wed, 2 Jun 2021 15:43:38 +0200
-Subject: [PATCH] GHSL-2021-074: authentication bypass vulnerability in polkit
-
-initial values returned if error caught
----
- src/polkit/polkitsystembusname.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c
-index 8daa12c..8ed1363 100644
---- a/src/polkit/polkitsystembusname.c
-+++ b/src/polkit/polkitsystembusname.c
-@@ -435,6 +435,9 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName           *system_bus
-   while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error))
-     g_main_context_iteration (tmp_context, TRUE);
- 
-+  if (data.caught_error)
-+    goto out;
-+
-   if (out_uid)
-     *out_uid = data.uid;
-   if (out_pid)
--- 
-GitLab
-

polkit-0.118.tar.gz.sign

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEf/t9a9gxR9dChOMXjOswMP/c4lgFAl9YvjgACgkQjOswMP/c
-4liXtQgAhApWhRrzwcYuwDuop/35fiGIh5zHNN3hK9ZunIMXXemcX4uQ7K+cen29
-5LIGDSlxDYHHRnPOJuMVcYXt62EINhMIQ0kC45m0WJ8RaTDPRDH6YpFacZ/qP1ja
-7UkPihZbD0kJlbBJfSNnUw6sRSe6ovxuN0Bhgcz8rPSmSCjOlCjiZokIOifjpFP5
-KUBm13BTSEqGZdaZVOi7dn62zaonpyc+lKJ30dLSoZu3EMDD3U5F0pan+xWAfYQw
-YjA96mnhABYmvzb0BsEKCPJ7H0brNwXQvc0BbKWNBC6btsxepkvZSNLuZR533SxE
-Y7CCOAi/RNKcs/dqTnCXR1PVNaEE6w==
-=jUp8
------END PGP SIGNATURE-----

polkit-0.120.tar.gz.sign

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEf/t9a9gxR9dChOMXjOswMP/c4lgFAmFbBdIACgkQjOswMP/c
+4ljEgQgAtj7WctCA7ZqOBAgcr+8NHSzxMJHbiNPDMg4bJB3xVipyQYCfyv8dNANd
+33tTjDGjBN5Dn/Mp7FbxBHsTaUCcvnV11IeDq4AnVT1yrL3E1Tc4B08rQAEUSwZY
+eIuO4GJTbIs79Qtj6tjILcKhKNBBezUyMRgRpq/XYZKlwdlPZkhec2tGtP3wVZCW
+VlYliQfMvV4aJV2PRcVcITnFuWYvV28iI5nl466iE60MmaJOiPeJKFbXM73jiVeP
+QGPljAeGWiZ9xa2a2EFbBbyyiKo1B1kvdp0wgYaeGElw/ulcbUAPpzsh4+aTaX6l
+xJpnVpz9f+opD7/YpyAms4RRkQbMLQ==
+=UyNU
+-----END PGP SIGNATURE-----

polkit.spec

@@ -1,6 +1,6 @@
 Name:             polkit
-Version:          0.118
-Release:          2
+Version:          0.120
+Release:          1
 Summary:          Define and Handle authorizations tool
 License:          LGPLv2+
 URL:              http://www.freedesktop.org/wiki/Software/polkit
@@ -8,7 +8,6 @@ Source0:          http://www.freedesktop.org/software/polkit/releases/%{name}-%{
 Source1:          http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz.sign
 
 Patch0:           modify-admin-authorization-from-wheel-group-to-root.patch
-Patch1:           backport-CVE-2021-3560.patch
 
 BuildRequires:    gcc-c++ glib2-devel >= 2.30.0 expat-devel pam-devel gtk-doc intltool
 BuildRequires:    gobject-introspection-devel systemd systemd-devel pkgconfig(mozjs-78)
@@ -89,7 +88,7 @@ exit 0
 %dir %{_sysconfdir}/polkit-1
 %{_sysconfdir}/polkit-1/rules.d/50-default.rules
 %attr(0700,polkitd,root) %dir %{_sysconfdir}/polkit-1/rules.d
-%{_sysconfdir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
 %{_sysconfdir}/pam.d/polkit-1
 %{_unitdir}/polkit.service
 %{_datadir}/dbus-1/system-services/*
@@ -125,6 +124,12 @@ exit 0
 %{_datadir}/man/man8/*
 
 %changelog
+* 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