From 2aaa4f2251a1ec74d08e9706b788273f8103c9b2 Mon Sep 17 00:00:00 2001
From: Pete Walter <pwalter@fedoraproject.org>
Date: Wed, 6 Oct 2021 22:10:44 +0100
Subject: [PATCH] Update to 0.120

---
 .gitignore          |  2 ++
 CVE-2021-3560.patch | 13 -------------
 polkit.spec         | 13 ++++++-------
 sources             |  4 ++--
 4 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 CVE-2021-3560.patch

diff --git a/.gitignore b/.gitignore
index c1e3eb2..bb95ba5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@ polkit-0.98.tar.gz
 /polkit-0.117.tar.gz.sign
 /polkit-0.118.tar.gz
 /polkit-0.118.tar.gz.sign
+/polkit-0.120.tar.gz
+/polkit-0.120.tar.gz.sign
diff --git a/CVE-2021-3560.patch b/CVE-2021-3560.patch
deleted file mode 100644
index e5b2b85..0000000
--- a/CVE-2021-3560.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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)
-
diff --git a/polkit.spec b/polkit.spec
index 7c328a7..db27d5d 100644
--- a/polkit.spec
+++ b/polkit.spec
@@ -5,17 +5,13 @@
 
 Summary: An authorization framework
 Name: polkit
-Version: 0.118
-Release: 3%{?dist}
+Version: 0.120
+Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/polkit
 Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz
 Source1: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz.sign
 
-
-Patch1: CVE-2021-3560.patch
-
-
 BuildRequires: gcc-c++
 BuildRequires: glib2-devel >= 2.30.0
 BuildRequires: expat-devel
@@ -139,6 +135,7 @@ exit 0
 %doc COPYING NEWS README
 %{_datadir}/man/man1/*
 %{_datadir}/man/man8/*
+%{_datadir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
 %{_datadir}/dbus-1/system-services/*
 %{_unitdir}/polkit.service
 %dir %{_datadir}/polkit-1/
@@ -148,7 +145,6 @@ 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
 %{_sysconfdir}/pam.d/polkit-1
 %{_bindir}/pkaction
 %{_bindir}/pkcheck
@@ -178,6 +174,9 @@ exit 0
 %{_libdir}/girepository-1.0/*.typelib
 
 %changelog
+* Wed Oct 06 2021 Pete Walter <pwalter@fedoraproject.org> - 0.120-1
+- Update to 0.120
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.118-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 30698fb..c847786 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (polkit-0.118.tar.gz) = b231290f1c5a4c4dd1dd13317ec901d5effb1a46882e9af69f469e9857d40d2e9bb9e2279a16ee7ac51b758860df09a9570e8aaedac6bcb32dfbeca26741e3da
-SHA512 (polkit-0.118.tar.gz.sign) = 294c375ccb2505b475cf31de1f42be8dac8361df6c0a472750e045724984e16725bb9c8e2479ea31c715c0e25451c6d2eb0c3a97836b01cded276b2af3eb3f94
+SHA512 (polkit-0.120.tar.gz) = db072769439d5e17d0eed681e7b94251b77828c1474b40fe40b94293903a64333e7fa17515a3270648691f04a1374d8b404405ead6abf292a8eb8483164adc46
+SHA512 (polkit-0.120.tar.gz.sign) = 7783d8ce847f69a83d811f8b6b5f502c48ecbd9299e17a17cf70af236c26cc806a8b2448f15db23bc9c77ff3715b4d15983c17e793d01c11617699816e70956e