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

[Jan Steffens]

    Date: Tuesday, January 25, 2022 @ 20:05:11
  Author: heftig
Revision: 435134

0.120-4: CVE-2021-4034

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-25 19:42:42 UTC (rev 435133)
+++ PKGBUILD	2022-01-25 20:05:11 UTC (rev 435134)
@@ -3,7 +3,7 @@
 
 pkgname=polkit
 pkgver=0.120
-pkgrel=3
+pkgrel=4
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(x86_64)
 license=(LGPL)
@@ -13,8 +13,10 @@
 checkdepends=(python-dbusmock)
 backup=(etc/pam.d/polkit-1)
 _commit=92b910ce2273daf6a76038f6bd764fa6958d4e8e  # tags/0.120
-source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit"
+        meson-0.61.diff)
+sha256sums=('SKIP'
+            '45d08bbb76e1e22ca8e698df04652b7aceaded34f9b76ce6b68152fb26b0de8d')
 
 pkgver() {
   cd polkit
@@ -21,6 +23,16 @@
   git describe --tags | sed 's/-/+/g'
 }
 
+prepare() {
+  cd polkit
+
+  # CVE-2021-4034
+  git cherry-pick -n a2bf5c9c83b6ae46cbd5c779d3055bff81ded683
+
+  # Fix build with Meson 0.61.0
+  git apply -3 ../meson-0.61.diff
+}
+
 build() {
   arch-meson polkit build \
     -D session_tracking=libsystemd-login \

Added: meson-0.61.diff
===================================================================
--- meson-0.61.diff	                        (rev 0)
+++ meson-0.61.diff	2022-01-25 20:05:11 UTC (rev 435134)
@@ -0,0 +1,24 @@
+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,