From 6d62f473e7dcca5729d33615a679b9d85e214d16 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Thu, 21 Jul 2022 15:38:03 +0300
Subject: [PATCH] polkit-0.121 ver. bump

---
 system/base/polkit/actions.py | 40 +++++++++++++++--------------------
 system/base/polkit/pspec.xml  | 20 ++++++++++++------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/system/base/polkit/actions.py b/system/base/polkit/actions.py
index 400615f2..76ac6bd5 100644
--- a/system/base/polkit/actions.py
+++ b/system/base/polkit/actions.py
@@ -7,37 +7,28 @@
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import mesontools
 from pisi.actionsapi import get
 
 def setup():
-    #pisitools.dosed("configure.ac", "pardus-release", "pisilinux-release")
+    pisitools.dosed("meson.build", "pardus", "pisilinux")
+    pisitools.dosed("meson_options.txt", "pardus", "pisilinux")
     #pisitools.dosed("configure", "pardus-release", "pisilinux-release")
-    autotools.autoreconf("-f")
-    autotools.configure("--prefix=/usr \
-                         --sysconfdir=/etc \
-                         --localstatedir=/var \
-                         --with-pam-module-dir=/lib/security/ \
-                         --with-duktape \
-                         --with-dbus \
-                         --enable-examples \
-                         --enable-introspection \
-                         --with-systemdsystemunitdir=no \
-                         --enable-libsystemd-login=no \
-                         --enable-libelogind=yes \
-                         --disable-man-pages \
-                         --enable-gtk-doc=no \
-                         --enable-gtk-doc-html=no \
-                         --enable-gtk-doc-pdf=no \
-                         --disable-static")
-
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+    #autotools.autoreconf("-fiv")
+    mesontools.configure("-Dos_type='pisilinux' \
+                          -Dsystemdsystemunitdir=/tmp \
+                          -Dpam_module_dir=/lib/security \
+                          -Dexamples=true \
+                          -Dauthfw='pam' \
+                          -Djs_engine='duktape' \
+                          -Dsession_tracking=libelogind")
 
 def build():
     shelltools.export('HOME', get.workDIR())
-    autotools.make()
+    mesontools.build()
 
 def install():
-    autotools.rawInstall("DESTDIR=%s/" % get.installDIR())
+    mesontools.install()
 
     pisitools.dodir("/var/lib/polkit-1")
     shelltools.chmod("%s/var/lib/polkit-1" % get.installDIR(), mode=00700)
@@ -45,4 +36,7 @@ def install():
     shelltools.chown("%s/etc/polkit-1/rules.d" % get.installDIR(),"polkitd","root") #yada? "polkitd","root"
     shelltools.chown("%s/var/lib/polkit-1" % get.installDIR(),"polkitd","polkitd")
     shelltools.chown("%s/usr/share/polkit-1" % get.installDIR(),"polkitd","root") #yada? "polkitd","root"
-    pisitools.dodoc("AUTHORS", "NEWS", "README", "HACKING", "COPYING")
+
+    pisitools.removeDir("/tmp")
+
+    pisitools.dodoc("AUTHORS", "NEWS*", "README*", "HACKING*", "COPYING*")
diff --git a/system/base/polkit/pspec.xml b/system/base/polkit/pspec.xml
index cb085bf1..f796f5ec 100644
--- a/system/base/polkit/pspec.xml
+++ b/system/base/polkit/pspec.xml
@@ -14,8 +14,9 @@
         <IsA>app:console</IsA>
         <Summary>PolicyKit Authorization Framework</Summary>
         <Description>polkit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to speak to privileged processes.</Description>
-        <Archive sha1sum="75d5885251eef36b28851e095120bc1f60714160" type="targz">http://www.freedesktop.org/software/polkit/releases/polkit-0.120.tar.gz</Archive>
+        <Archive sha1sum="8961b976a5b6da141481593cb524da5b049fce2e" type="tarbz2">https://gitlab.freedesktop.org/polkit/polkit/-/archive/121/polkit-121.tar.bz2</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
             <Dependency>python3</Dependency>
             <Dependency>dbus-devel</Dependency>
             <Dependency versionFrom="1.5.1">pam-devel</Dependency>
@@ -29,12 +30,12 @@
             <Dependency>intltool</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">0001-Updated-build-args-for-Pisi-Linux.patch</Patch>
-            <Patch level="1">polkit-0.118-duktape.patch</Patch>
-            <Patch level="1">polkit-0.118-elogind.patch</Patch>
+<!--             <Patch level="1">0001-Updated-build-args-for-Pisi-Linux.patch</Patch> -->
+<!--             <Patch level="1">polkit-0.118-duktape.patch</Patch> -->
+<!--             <Patch level="1">polkit-0.118-elogind.patch</Patch> -->
             <Patch level="1">use-system-locale-in-gobject-api.diff</Patch>
-            <Patch level="1">CVE-2021-4034.patch</Patch>
-            <Patch level="1">CVE-2021-4115.patch</Patch>
+<!--             <Patch level="1">CVE-2021-4034.patch</Patch> -->
+<!--             <Patch level="1">CVE-2021-4115.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -94,6 +95,13 @@
     </Package>
 
     <History>
+        <Update release="17">
+            <Date>2022-07-21</Date>
+            <Version>0.121</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="16">
             <Date>2022-07-18</Date>
             <Version>0.120</Version>