[arch-commits] Commit in polkit/repos (3 files)

[Jan Steffens]

    Date: Wednesday, March 9, 2022 @ 19:03:37
  Author: heftig
Revision: 439374

archrelease: copy trunk to testing-x86_64

Added:
  polkit/repos/testing-x86_64/
  polkit/repos/testing-x86_64/PKGBUILD
    (from rev 439373, polkit/trunk/PKGBUILD)
  polkit/repos/testing-x86_64/meson-0.61.diff
    (from rev 439373, polkit/trunk/meson-0.61.diff)

-----------------+
 PKGBUILD        |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 meson-0.61.diff |   24 +++++++++++++++++++
 2 files changed, 91 insertions(+)

Copied: polkit/repos/testing-x86_64/PKGBUILD (from rev 439373, polkit/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2022-03-09 19:03:37 UTC (rev 439374)
@@ -0,0 +1,67 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=polkit
+pkgver=0.120
+pkgrel=5
+pkgdesc="Application development toolkit for controlling system-wide privileges"
+arch=(x86_64)
+license=(LGPL)
+url="https://www.freedesktop.org/wiki/Software/polkit/"
+depends=(glib2 pam expat systemd js78)
+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')
+
+pkgver() {
+  cd polkit
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+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 \
+    -D man=true
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs -t 3
+}
+
+package() {
+  meson install -C build --destdir "$pkgdir"
+
+  install -d -o root -g 102 -m 750 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d
+  mv "$pkgdir"/{etc,usr/share}/polkit-1/rules.d/50-default.rules
+
+  install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" <<END
+u polkitd 102 "PolicyKit daemon"
+m polkitd proc
+END
+}
+
+# vim:set sw=2 et:

Copied: polkit/repos/testing-x86_64/meson-0.61.diff (from rev 439373, polkit/trunk/meson-0.61.diff)
===================================================================
--- testing-x86_64/meson-0.61.diff	                        (rev 0)
+++ testing-x86_64/meson-0.61.diff	2022-03-09 19:03:37 UTC (rev 439374)
@@ -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,