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

[Jan Steffens]

    Date: Thursday, March 10, 2022 @ 11:23:15
  Author: heftig
Revision: 1145930

archrelease: copy trunk to multilib-testing-x86_64

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

-----------------+
 PKGBUILD        |   81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 meson-0.61.diff |   24 ++++++++++++++++
 multilib.diff   |   33 ++++++++++++++++++++++
 3 files changed, 138 insertions(+)

Copied: lib32-polkit/repos/multilib-testing-x86_64/PKGBUILD (from rev 1145929, lib32-polkit/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD	                        (rev 0)
+++ multilib-testing-x86_64/PKGBUILD	2022-03-10 11:23:15 UTC (rev 1145930)
@@ -0,0 +1,81 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: jtts <jussaar at mbnet.fi>
+# Contributor: GordonGR <gordongr at freemail.gr>
+
+pkgname=lib32-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=(
+  lib32-expat
+  lib32-glib2
+  lib32-pam
+  lib32-systemd
+  polkit
+)
+makedepends=(
+  meson
+  git
+)
+_tag=92b910ce2273daf6a76038f6bd764fa6958d4e8e
+source=(
+  git+https://gitlab.freedesktop.org/polkit/polkit.git#tag=${_tag}
+  meson-0.61.diff
+  multilib.diff
+)
+sha256sums=(
+  SKIP
+  45d08bbb76e1e22ca8e698df04652b7aceaded34f9b76ce6b68152fb26b0de8d
+  7271f97282d22b58b74cf9089fa3a83c799cde184eb6e06a83164692362e50fe
+)
+
+pkgver() {
+  cd polkit
+
+  git describe --tags
+}
+
+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
+
+  # Don't build the backend
+  git apply -3 ../multilib.diff
+}
+
+build() {
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
+
+  arch-meson polkit build \
+    --libdir=/usr/lib32 \
+    -D session_tracking=libsystemd-login \
+    -D os_type=redhat \
+    -D tests=true \
+    -D introspection=false
+  meson compile -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs -t 3
+}
+
+package() {
+  meson install -C build --destdir "${pkgdir}"
+  rm -r "$pkgdir"/{etc,usr/{bin,include,lib,share}}
+}
+
+# vim:set sw=2 et:

Copied: lib32-polkit/repos/multilib-testing-x86_64/meson-0.61.diff (from rev 1145929, lib32-polkit/trunk/meson-0.61.diff)
===================================================================
--- multilib-testing-x86_64/meson-0.61.diff	                        (rev 0)
+++ multilib-testing-x86_64/meson-0.61.diff	2022-03-10 11:23:15 UTC (rev 1145930)
@@ -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,

Copied: lib32-polkit/repos/multilib-testing-x86_64/multilib.diff (from rev 1145929, lib32-polkit/trunk/multilib.diff)
===================================================================
--- multilib-testing-x86_64/multilib.diff	                        (rev 0)
+++ multilib-testing-x86_64/multilib.diff	2022-03-10 11:23:15 UTC (rev 1145930)
@@ -0,0 +1,33 @@
+diff --git i/meson.build w/meson.build
+index 858078d..50ae1ac 100644
+--- i/meson.build
++++ w/meson.build
+@@ -133,7 +133,6 @@ expat_dep = dependency('expat')
+ assert(cc.has_header('expat.h', dependencies: expat_dep), 'Can\'t find expat.h. Please install expat.')
+ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t find expat library. Please install expat.')
+ 
+-mozjs_dep = dependency('mozjs-78')
+ 
+ dbus_dep = dependency('dbus-1', required: false)
+ dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d'
+diff --git i/src/meson.build w/src/meson.build
+index 4073333..c7038f1 100644
+--- i/src/meson.build
++++ w/src/meson.build
+@@ -4,7 +4,6 @@ symbol_map = meson.current_source_dir() / 'symbol.map'
+ ldflags = cc.get_supported_link_arguments('-Wl,--version-script, at 0@'.format(symbol_map))
+ 
+ subdir('polkit')
+-subdir('polkitbackend')
+ subdir('polkitagent')
+ subdir('programs')
+ 
+diff --git i/test/meson.build w/test/meson.build
+index 3f02d35..4fbb0ec 100644
+--- i/test/meson.build
++++ w/test/meson.build
+@@ -23,4 +23,3 @@ test_env.set('MOCK_NETGROUP', test_etc_dir / 'netgroup')
+ test_env.set('POLKIT_TEST_DATA', test_data_dir)
+ 
+ subdir('polkit')
+-subdir('polkitbackend')