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

[Jan Steffens]

    Date: Tuesday, January 25, 2022 @ 20:05:12
  Author: heftig
Revision: 1115559

0.120-4: CVE-2021-4034

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-25 19:57:23 UTC (rev 1115558)
+++ PKGBUILD	2022-01-25 20:05:12 UTC (rev 1115559)
@@ -5,7 +5,7 @@
 
 pkgname=lib32-polkit
 pkgver=0.120
-pkgrel=3
+pkgrel=4
 pkgdesc='Application development toolkit for controlling system-wide privileges'
 arch=(x86_64)
 license=(LGPL)
@@ -24,10 +24,14 @@
 _tag=92b910ce2273daf6a76038f6bd764fa6958d4e8e
 source=(
   git+https://gitlab.freedesktop.org/polkit/polkit.git#tag=${_tag}
+  meson-0.61.diff
   multilib.diff
 )
-sha256sums=('SKIP'
-            '7271f97282d22b58b74cf9089fa3a83c799cde184eb6e06a83164692362e50fe')
+sha256sums=(
+  SKIP
+  45d08bbb76e1e22ca8e698df04652b7aceaded34f9b76ce6b68152fb26b0de8d
+  7271f97282d22b58b74cf9089fa3a83c799cde184eb6e06a83164692362e50fe
+)
 
 pkgver() {
   cd polkit
@@ -38,6 +42,12 @@
 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
+
   # Don't build the backend
   git apply -3 ../multilib.diff
 }

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