Browse Source

[multilib-testing] -> [multilib] 'lib32-polkit-121-1' move

master
Nathan Owens 1 month ago
parent
commit
0488239854
Signed by: ndowens
GPG Key ID: DC5A6F8092641E2D
  1. 59
      lib32-polkit/x86_64/multilib-testing/0001-remove-systemd-dep.patch
  2. 75
      lib32-polkit/x86_64/multilib-testing/PKGBUILD
  3. 31
      lib32-polkit/x86_64/multilib-testing/multilib.diff
  4. 61
      lib32-polkit/x86_64/multilib/PKGBUILD
  5. 24
      lib32-polkit/x86_64/multilib/meson-0.61.diff
  6. 20
      lib32-polkit/x86_64/multilib/multilib.diff

59
lib32-polkit/x86_64/multilib-testing/0001-remove-systemd-dep.patch

@ -1,59 +0,0 @@
From 4f0c64e0428d3ec4bdb231892b8b30c647868faf Mon Sep 17 00:00:00 2001
From: Nathan <ndowens@artixlinux.org>
Date: Sun, 14 Nov 2021 11:10:28 -0600
Subject: [PATCH] remove systemd dep
---
data/meson.build | 10 ----------
meson.build | 10 ----------
2 files changed, 20 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 073bd98..c6e45f5 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -25,13 +25,3 @@ if enable_pam
install_dir: pk_sysconfdir / 'pam.d',
)
endif
-
-if enable_logind
- configure_file(
- input: 'polkit.service.in',
- output: '@BASENAME@',
- configuration: service_conf,
- install: true,
- install_dir: systemd_systemdsystemunitdir,
- )
-endif
diff --git a/meson.build b/meson.build
index 858078d..701b2d8 100644
--- a/meson.build
+++ b/meson.build
@@ -181,13 +181,6 @@ if enable_logind
func = 'sd_uid_get_display'
config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
- # systemd unit / service files
- systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
- if systemd_systemdsystemunitdir == ''
- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
- # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
- systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
- endif
endif
config_h.set('HAVE_LIBSYSTEMD', enable_logind)
@@ -357,9 +350,6 @@ output += ' introspection: ' + enable_introspection.to_string(
output += ' Distribution/OS: ' + os_type + '\n'
output += ' Authentication framework: ' + auth_fw + '\n'
output += ' Session tracking: ' + session_tracking + '\n'
-if enable_logind
- output += ' systemdsystemunitdir: ' + systemd_systemdsystemunitdir + '\n'
-endif
output += ' polkitd user: ' + polkitd_user + ' \n'
output += ' PAM support: ' + enable_pam.to_string() + '\n\n'
if enable_pam
--
2.33.1

75
lib32-polkit/x86_64/multilib-testing/PKGBUILD

@ -1,75 +0,0 @@
# Maintainer: Nathan Owens <ndowens@artixlinux.org>
# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: jtts <jussaar@mbnet.fi>
# Contributor: GordonGR <gordongr@freemail.gr>
pkgname=lib32-polkit
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)
depends=(
lib32-expat
lib32-glib2
lib32-pam
lib32-elogind
polkit
)
makedepends=(
meson
git
)
provides=(libpolkit-{agent,gobject}-1.so)
options=(debug)
_commit=827b0ddac5b1ef00a47fca4526fcf057bee5f1db # tags/121
source=(
"git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=${_commit}"
multilib.diff
)
b2sums=('SKIP'
'2ee4018b0429e637429abcecb4855436e072a5d562060bde51d47d7db447a200bfe08ac3d247a0b662e5c345b5641169203c00f3bbe63187b5025c9e8337ef44')
pkgver() {
cd polkit
git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
}
prepare() {
cd polkit
# Don't build the backend
git apply -3 ../multilib.diff
}
build() {
local meson_options=(
--libdir=/usr/lib32
-D introspection=false
-D os_type=redhat
-D session_tracking=libelogind
-D systemdsystemunitdir=no
-D tests=true
)
export CC='gcc -m32'
export CXX='g++ -m32'
export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
artix-meson polkit build "${meson_options[@]}"
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,no}}
}
# vim:set sw=2 sts=-1 et:

31
lib32-polkit/x86_64/multilib-testing/multilib.diff

@ -1,31 +0,0 @@
diff --git i/meson_options.txt w/meson_options.txt
index 76aa311..174a45e 100644
--- i/meson_options.txt
+++ w/meson_options.txt
@@ -16,4 +16,4 @@ option('introspection', type: 'boolean', value: true, description: 'Enable intro
option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
option('man', type: 'boolean', value: false, description: 'build manual pages')
-option('js_engine', type: 'combo', choices: ['mozjs', 'duktape'], value: 'duktape', description: 'javascript engine')
+option('js_engine', type: 'combo', choices: ['none'], value: 'none', description: 'javascript engine')
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,@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')

61
lib32-polkit/x86_64/multilib/PKGBUILD

@ -1,15 +1,16 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
# Maintainer: Nathan Owens <ndowens@artixlinux.org>
# Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: jtts <jussaar@mbnet.fi>
# Contributor: GordonGR <gordongr@freemail.gr>
pkgname=lib32-polkit
pkgver=0.120
pkgrel=5
pkgdesc='Application development toolkit for controlling system-wide privileges'
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=(
lib32-expat
lib32-glib2
@ -21,52 +22,43 @@ makedepends=(
meson
git
)
_tag=92b910ce2273daf6a76038f6bd764fa6958d4e8e
provides=(libpolkit-{agent,gobject}-1.so)
options=(debug)
_commit=827b0ddac5b1ef00a47fca4526fcf057bee5f1db # tags/121
source=(
git+https://gitlab.freedesktop.org/polkit/polkit.git#tag=${_tag}
meson-0.61.diff
"git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=${_commit}"
multilib.diff
0001-remove-systemd-dep.patch
)
sha256sums=('SKIP'
'45d08bbb76e1e22ca8e698df04652b7aceaded34f9b76ce6b68152fb26b0de8d'
'7271f97282d22b58b74cf9089fa3a83c799cde184eb6e06a83164692362e50fe'
'c862867ad113dd046c93f5dec4631969ac5bd9c493dbcd27c81339a027a5bd74')
b2sums=('SKIP'
'2ee4018b0429e637429abcecb4855436e072a5d562060bde51d47d7db447a200bfe08ac3d247a0b662e5c345b5641169203c00f3bbe63187b5025c9e8337ef44')
pkgver() {
cd polkit
git describe --tags
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
# Don't build the backend
git apply -3 ../multilib.diff
git apply -3 ../0001-remove-systemd-dep.patch
}
build() {
local meson_options=(
--libdir=/usr/lib32
-D introspection=false
-D os_type=redhat
-D session_tracking=libelogind
-D systemdsystemunitdir=no
-D tests=true
)
export CC='gcc -m32'
export CXX='g++ -m32'
export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
artix-meson polkit build \
--libdir=/usr/lib32 \
-D session_tracking=libelogind \
-D os_type=redhat \
-D tests=true \
-D introspection=false
artix-meson polkit build "${meson_options[@]}"
meson compile -C build
}
@ -75,8 +67,9 @@ check() {
}
package() {
meson install -C build --destdir "${pkgdir}"
rm -r "$pkgdir"/{etc,usr/{bin,include,lib,share}}
meson install -C build --destdir "$pkgdir"
rm -r "$pkgdir"/{etc,usr/{bin,include,lib,share,no}}
}
# vim:set sw=2 et:
# vim:set sw=2 sts=-1 et:

24
lib32-polkit/x86_64/multilib/meson-0.61.diff

@ -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,

20
lib32-polkit/x86_64/multilib/multilib.diff

@ -1,15 +1,13 @@
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.')
diff --git i/meson_options.txt w/meson_options.txt
index 76aa311..174a45e 100644
--- i/meson_options.txt
+++ w/meson_options.txt
@@ -16,4 +16,4 @@ option('introspection', type: 'boolean', value: true, description: 'Enable intro
-mozjs_dep = dependency('mozjs-78')
dbus_dep = dependency('dbus-1', required: false)
dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d'
option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
option('man', type: 'boolean', value: false, description: 'build manual pages')
-option('js_engine', type: 'combo', choices: ['mozjs', 'duktape'], value: 'duktape', description: 'javascript engine')
+option('js_engine', type: 'combo', choices: ['none'], value: 'none', description: 'javascript engine')
diff --git i/src/meson.build w/src/meson.build
index 4073333..c7038f1 100644
--- i/src/meson.build

Loading…
Cancel
Save