[arch-commits] Commit in polkit/trunk (PKGBUILD meson-0.61.diff)

[Jan Steffens]

    Date: Tuesday, July 12, 2022 @ 16:13:40
  Author: heftig
Revision: 450948

121-1

Modified:
  polkit/trunk/PKGBUILD
Deleted:
  polkit/trunk/meson-0.61.diff

-----------------+
 PKGBUILD        |   43 ++++++++++++++++++-------------------------
 meson-0.61.diff |   24 ------------------------
 2 files changed, 18 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-12 16:12:31 UTC (rev 450947)
+++ PKGBUILD	2022-07-12 16:13:40 UTC (rev 450948)
@@ -2,22 +2,21 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=polkit
-pkgver=0.120
-pkgrel=5
+pkgver=121
+pkgrel=1
 pkgdesc="Application development toolkit for controlling system-wide privileges"
+url="https://gitlab.freedesktop.org/polkit/polkit"
 arch=(x86_64)
 license=(LGPL)
-url="https://www.freedesktop.org/wiki/Software/polkit/"
-depends=(glib2 pam expat systemd js78)
+depends=(glib2 pam expat systemd duktape)
 makedepends=(meson gtk-doc gobject-introspection git)
 checkdepends=(python-dbusmock)
 provides=(libpolkit-{agent,gobject}-1.so)
 backup=(etc/pam.d/polkit-1)
-_commit=92b910ce2273daf6a76038f6bd764fa6958d4e8e  # tags/0.120
-source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit"
-        meson-0.61.diff)
-sha256sums=('SKIP'
-            '45d08bbb76e1e22ca8e698df04652b7aceaded34f9b76ce6b68152fb26b0de8d')
+options=(debug)
+_commit=827b0ddac5b1ef00a47fca4526fcf057bee5f1db  # tags/121
+source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit")
+b2sums=('SKIP')
 
 pkgver() {
   cd polkit
@@ -26,25 +25,19 @@
 
 prepare() {
   cd polkit
-
-  # CVE-2021-4034
-  git cherry-pick -n a2bf5c9c83b6ae46cbd5c779d3055bff81ded683
-
-  # CVE-2021-4115
-  git cherry-pick -n 41cb093f554da8772362654a128a84dd8a5542a7
-
-  # Fix build with Meson 0.61.0
-  git apply -3 ../meson-0.61.diff
 }
 
 build() {
-  arch-meson polkit build \
-    -D session_tracking=libsystemd-login \
-    -D os_type=redhat \
-    -D examples=true \
-    -D tests=true \
-    -D gtk_doc=true \
+  local meson_options=(
+    -D examples=true
+    -D gtk_doc=true
     -D man=true
+    -D os_type=redhat
+    -D session_tracking=libsystemd-login
+    -D tests=true
+  )
+
+  arch-meson polkit build "${meson_options[@]}"
   meson compile -C build
 }
 
@@ -64,4 +57,4 @@
 END
 }
 
-# vim:set sw=2 et:
+# vim:set sw=2 sts=-1 et:

Deleted: meson-0.61.diff
===================================================================
--- meson-0.61.diff	2022-07-12 16:12:31 UTC (rev 450947)
+++ meson-0.61.diff	2022-07-12 16:13:40 UTC (rev 450948)
@@ -1,24 +0,0 @@
-diff --git i/actions/meson.build w/actions/meson.build
-index 2abaaf3..1e3f370 100644
---- i/actions/meson.build
-+++ w/actions/meson.build
-@@ -1,7 +1,6 @@
- policy = 'org.freedesktop.policykit.policy'
- 
- i18n.merge_file(
--  policy,
-   input: policy + '.in',
-   output: '@BASENAME@',
-   po_dir: po_dir,
-diff --git i/src/examples/meson.build w/src/examples/meson.build
-index c6305ab..8c18de5 100644
---- i/src/examples/meson.build
-+++ w/src/examples/meson.build
-@@ -1,7 +1,6 @@
- policy = 'org.freedesktop.policykit.examples.pkexec.policy'
- 
- i18n.merge_file(
--  policy,
-   input: policy + '.in',
-   output: '@BASENAME@',
-   po_dir: po_dir,