From d6e5ebe89dd6f318abadb8a66ca1164a3f477b9d Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Mon, 18 Jul 2022 10:48:21 +0200
Subject: [PATCH] new upstream release

---
 .gitignore  |  4 ++++
 polkit.spec | 62 +++++++++++++++++++++--------------------------------
 sources     |  4 ++--
 3 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb95ba5..0964542 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,7 @@ polkit-0.98.tar.gz
 /polkit-0.118.tar.gz.sign
 /polkit-0.120.tar.gz
 /polkit-0.120.tar.gz.sign
+/polkit-121.tar.gz
+/polkit-121.tar.gz.sign
+/polkit-121.tar.xz
+/polkit-121.tar.xz.sign
diff --git a/polkit.spec b/polkit.spec
index 2c1786d..ec4802f 100644
--- a/polkit.spec
+++ b/polkit.spec
@@ -1,39 +1,28 @@
 # Only enable if using patches that touches configure.ac,
 # Makefile.am or other build system related files
 #
-%define enable_autoreconf 1
-
 Summary: An authorization framework
 Name: polkit
-Version: 0.120
-Release: 5%{?dist}
+Version: 121
+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: a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.patch
-Patch2: CVE-2021-4115.patch
-# https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/92
-Patch3: 92.patch
+Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.xz
+Source1: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.xz.sign
 
 BuildRequires: gcc-c++
 BuildRequires: glib2-devel >= 2.30.0
 BuildRequires: expat-devel
 BuildRequires: pam-devel
 BuildRequires: gtk-doc
-BuildRequires: intltool
+BuildRequires: gettext-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: systemd, systemd-devel
-BuildRequires: pkgconfig(mozjs-91)
+BuildRequires: dbus-devel
+BuildRequires: pkgconfig(duktape)
+BuildRequires: meson
 BuildRequires: git
 
-%if 0%{?enable_autoreconf}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-%endif
-
 Requires: dbus, polkit-pkla-compat
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -52,7 +41,7 @@ Conflicts: polkit-gnome < 0.97
 Obsoletes: polkit-desktop-policy < 0.103
 Provides: polkit-desktop-policy = 0.103
 
-Obsoletes: polkit-js-engine < 0.110-4
+Obsoletes: polkit-js-engine < 0.120-5
 Provides: polkit-js-engine = %{version}-%{release}
 
 # when -libs was split out, handle multilib upgrade path -- rex
@@ -95,25 +84,18 @@ Libraries files for polkit.
 %autosetup -S git
 
 %build
-%if 0%{?enable_autoreconf}
-autoreconf -i
-%endif
-# we can't use _hardened_build here, see
-# https://bugzilla.redhat.com/show_bug.cgi?id=962005
-export CFLAGS='-fPIC %optflags'
-export LDFLAGS='-pie -Wl,-z,now -Wl,-z,relro'
-%configure --enable-gtk-doc \
-        --disable-static \
-        --enable-introspection \
-        --disable-examples \
-        --enable-libsystemd-login=yes
-make V=1
+%meson -D authfw=pam \
+       -D examples=false \
+       -D gtk_doc=true \
+       -D introspection=true \
+       -D man=true \
+       -D session_tracking=libsystemd-login \
+       -D tests=false
+
+%meson_build
 
 %install
-%make_install \
-    typelibsdir=%{_libdir}/girepository-1.0 \
-    girdir=%{_datadir}/gir-1.0
-
+%meson_install
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -137,7 +119,7 @@ exit 0
 %systemd_postun_with_restart polkit.service
 
 %files -f polkit-1.lang
-%doc COPYING NEWS README
+%doc COPYING NEWS.md README.md
 %{_datadir}/man/man1/*
 %{_datadir}/man/man8/*
 %{_datadir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
@@ -147,6 +129,7 @@ exit 0
 %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
 %dir %{_sysconfdir}/polkit-1
 %{_sysconfdir}/polkit-1/rules.d/50-default.rules
 %attr(0700,polkitd,root) %dir %{_sysconfdir}/polkit-1/rules.d
@@ -179,6 +162,9 @@ exit 0
 %{_libdir}/girepository-1.0/*.typelib
 
 %changelog
+* Tue Jul 12 2022 Jan Rybar <jrybar@redhat.com> - 121-1
+- Rebase to v.121
+
 * Sun Feb 20 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.120-5
 - switch to mozjs91
 
diff --git a/sources b/sources
index c847786..7160e20 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (polkit-0.120.tar.gz) = db072769439d5e17d0eed681e7b94251b77828c1474b40fe40b94293903a64333e7fa17515a3270648691f04a1374d8b404405ead6abf292a8eb8483164adc46
-SHA512 (polkit-0.120.tar.gz.sign) = 7783d8ce847f69a83d811f8b6b5f502c48ecbd9299e17a17cf70af236c26cc806a8b2448f15db23bc9c77ff3715b4d15983c17e793d01c11617699816e70956e
+SHA512 (polkit-121.tar.xz) = 757736998297b048ec00e0122024bc661680d8c2e678468c14c1c449604944d6f2e0e1fd2511aa6d01fd81aa2362072f8fa057d792b82d8e9861cef6515d6369
+SHA512 (polkit-121.tar.xz.sign) = da3d0bdb2129e4ccb8a65462629d9b9e59448828b2ae08e9e1e73d7e385a8ac34f035bc59aaa97906709fd63504b89506be71bbc6471bffec05a7fdaa25a8203