osc copypac from project:Base:System package:polkit revision:162

OBS-URL: https://build.opensuse.org/package/show/Base:System/polkit?expand=0&rev=165

CVE-2021-3560.patch

@@ -0,0 +1,13 @@
+--- 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)
+

polkit-0.118.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d54e984e7072339f0d3147179e16e34e5fe0705158f259a765d772dcf78956b
+size 1556765

polkit-0.118.tar.gz.sign

@@ -0,0 +1,11 @@
+-----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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee7a599a853117bf273548725719fa92fabd2f136915c7a4906cee98567aee03
-size 1626659

polkit-0.120.tar.gz.sign

@@ -1,11 +0,0 @@
------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.changes

@@ -1,18 +1,3 @@
--------------------------------------------------------------------
-Mon Dec  6 10:27:20 UTC 2021 - Dirk Müller <dmueller@suse.com>
-
-- update to 0.120:
-  * transition from Intltool to gettext
-  * several tarball, meson and pipeline fixups
-  * Portuguese translation
-  * Romanian translation
-  * meson build system added
-  * CVE-2021-3560 mitigation
-  * properties in text listener
-  * typos fixups
-  * Update Hungarian translation
-- drop CVE-2021-3560.patch  (upstream)
-
 -------------------------------------------------------------------
 Wed Oct 20 15:12:07 UTC 2021 - Marcus Meissner <meissner@suse.com>
 

polkit.spec

@@ -17,7 +17,7 @@
 
 
 Name:           polkit
-Version:        0.120
+Version:        0.118
 Release:        0
 Summary:        PolicyKit Authorization Framework
 License:        LGPL-2.1-or-later
@@ -28,6 +28,7 @@ Source1:        https://www.freedesktop.org/software/polkit/releases/%{name}-%{v
 Source2:        %{name}.keyring
 Source3:        system-user-polkitd.conf
 Source99:       baselibs.conf
+
 # PATCH-FIX-OPENSUSE polkit-no-wheel-group.patch vuntz@opensuse.org -- In openSUSE, there's no special meaning for the wheel group, so we shouldn't allow it to be admin
 Patch0:         polkit-no-wheel-group.patch
 # PATCH-FIX-OPENSUSE polkit-gettext.patch lnussel@suse.de -- allow fallback to gettext for polkit action translations
@@ -38,6 +39,9 @@ Patch2:         pkexec.patch
 Patch3:         polkit-keyinit.patch
 # adjust path to polkit-agent-helper-1 (bsc#1180474)
 Patch4:         polkit-adjust-libexec-path.patch
+
+Patch5:         CVE-2021-3560.patch
+
 BuildRequires:  gcc-c++
 BuildRequires:  gtk-doc
 BuildRequires:  intltool
@@ -45,7 +49,6 @@ BuildRequires:  libexpat-devel
 # needed for patch1 and 2
 BuildRequires:  libtool
 BuildRequires:  pam-devel
-BuildRequires:  pkgconfig
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  sysuser-tools
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.32.0
@@ -59,9 +62,10 @@ BuildRequires:  pkgconfig(systemd)
 Requires:       dbus-1
 Requires:       libpolkit-agent-1-0 = %{version}-%{release}
 Requires:       libpolkit-gobject-1-0 = %{version}-%{release}
-Requires(post): permissions
 %sysusers_requires
+Requires(post): permissions
 %systemd_ordering
+
 # Upstream First - Policy:
 # Never add any patches to this package without the upstream commit id
 # in the patch. Any patches added here without a very good reason to make
@@ -98,7 +102,7 @@ Development documentation for PolicyKit Authorization Framework.
 Summary:        PolicyKit Authorization Framework -- Agent Library
 Group:          System/Libraries
 Requires:       %{name} >= %{version}
-Obsoletes:      libpolkit0 < %{version}-%{release}
+Obsoletes:      libpolkit0 < %version-%release
 
 %description -n libpolkit-agent-1-0
 PolicyKit is a toolkit for defining and handling authorizations.
@@ -111,7 +115,7 @@ This package contains the agent library only.
 Summary:        PolicyKit Authorization Framework -- GObject Library
 Group:          System/Libraries
 Requires:       %{name} >= %{version}
-Obsoletes:      libpolkit0 < %{version}-%{release}
+Obsoletes:      libpolkit0 < %version-%release
 
 %description -n libpolkit-gobject-1-0
 PolicyKit is a toolkit for defining and handling authorizations.
@@ -161,6 +165,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 # create $HOME for polkit user
 install -d %{buildroot}%{_localstatedir}/lib/polkit
 %find_lang polkit-1
+mkdir -p %{buildroot}%{_datadir}/dbus-1/system.d
+mv %{buildroot}%{_sysconfdir}/dbus-1/system.d/* %{buildroot}%{_datadir}/dbus-1/system.d/
 mkdir -p %{buildroot}%{_distconfdir}/pam.d
 mv %{buildroot}%{_sysconfdir}/pam.d/* %{buildroot}%{_distconfdir}/pam.d/
 mv %{buildroot}%{_sysconfdir}/polkit-1/rules.d/50-default.rules %{buildroot}%{_datadir}/polkit-1/rules.d/50-default.rules