[arch-commits] Commit in lib32-systemd/repos (3 files)
Christian Hesse
eworm at gemini.archlinux.org
Thu Jun 2 18:55:34 UTC 2022
Date: Thursday, June 2, 2022 @ 18:55:34
Author: eworm
Revision: 1218931
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-systemd/repos/multilib-testing-x86_64/
lib32-systemd/repos/multilib-testing-x86_64/0001-shared-utmp-wtmp-fix-build-without-utmp.patch
(from rev 1218930, lib32-systemd/trunk/0001-shared-utmp-wtmp-fix-build-without-utmp.patch)
lib32-systemd/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1218930, lib32-systemd/trunk/PKGBUILD)
----------------------------------------------------+
0001-shared-utmp-wtmp-fix-build-without-utmp.patch | 28 +++
PKGBUILD | 174 +++++++++++++++++++
2 files changed, 202 insertions(+)
Copied: lib32-systemd/repos/multilib-testing-x86_64/0001-shared-utmp-wtmp-fix-build-without-utmp.patch (from rev 1218930, lib32-systemd/trunk/0001-shared-utmp-wtmp-fix-build-without-utmp.patch)
===================================================================
--- multilib-testing-x86_64/0001-shared-utmp-wtmp-fix-build-without-utmp.patch (rev 0)
+++ multilib-testing-x86_64/0001-shared-utmp-wtmp-fix-build-without-utmp.patch 2022-06-02 18:55:34 UTC (rev 1218931)
@@ -0,0 +1,28 @@
+From 30a0e11edc3ac73d5c00debde98cb82ada54a33b Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Thu, 2 Jun 2022 20:49:46 +0200
+Subject: [PATCH 1/1] shared/utmp-wtmp: fix build without utmp
+
+Commit 16618332388442f2f1c3e52b0a9fde00121564a3 changed a function to
+add an extra argument. The data types used when building without utmp
+missed the change.
+---
+ src/shared/utmp-wtmp.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/utmp-wtmp.h b/src/shared/utmp-wtmp.h
+index 36e4203b4f..188d011fdd 100644
+--- a/src/shared/utmp-wtmp.h
++++ b/src/shared/utmp-wtmp.h
+@@ -59,7 +59,7 @@ static inline int utmp_wall(
+ const char *message,
+ const char *username,
+ const char *origin_tty,
+- bool (*match_tty)(const char *tty, void *userdata),
++ bool (*match_tty)(const char *tty, bool is_local, void *userdata),
+ void *userdata) {
+ return 0;
+ }
+--
+2.36.1
+
Copied: lib32-systemd/repos/multilib-testing-x86_64/PKGBUILD (from rev 1218930, lib32-systemd/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD (rev 0)
+++ multilib-testing-x86_64/PKGBUILD 2022-06-02 18:55:34 UTC (rev 1218931)
@@ -0,0 +1,174 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+
+pkgname=lib32-systemd
+_pkgbasename=systemd
+_tag='615e67a0eeb479009f185d2526acf7cc1ed36e62' # git rev-parse v${_tag_name}
+_tag_name=251.2
+pkgver="${_tag_name/-/}"
+pkgrel=1
+pkgdesc='system and service manager (32-bit)'
+arch=('x86_64')
+url='https://www.github.com/systemd/systemd'
+license=('GPL2' 'LGPL2.1')
+depends=('lib32-gcc-libs' 'lib32-libcap' 'lib32-libgcrypt' 'lib32-libxcrypt'
+ 'lib32-xz' 'lib32-zstd' 'systemd')
+makedepends=('git' 'gperf' 'intltool' 'lib32-acl' 'lib32-bzip2'
+ 'lib32-curl' 'lib32-dbus' 'lib32-gcc-libs' 'lib32-glib2'
+ 'lib32-gnutls' 'lib32-libelf' 'lib32-libidn2' 'lib32-pcre2'
+ 'libxslt' 'meson' 'python-jinja')
+options=('strip')
+validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart at poettering.net>
+ 'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi at gmail.com>
+ '9A774DB5DB996C154EBBFBFDA0099A18E29326E1' # Yu Watanabe <watanabe.yu+github at gmail.com>
+ '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
+source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
+ "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"
+ '0001-shared-utmp-wtmp-fix-build-without-utmp.patch')
+sha512sums=('SKIP'
+ 'SKIP'
+ '36020ebe1437910c936fedfdef33dec67f8d3679e1b95c86b71ac2a0d91ae0e85c5f436187173e656752f3eb7069a72f21163778403f88011b4c8ae9432cbca8')
+
+_backports=(
+)
+
+_reverts=(
+)
+
+prepare() {
+ cd "$_pkgbasename-stable"
+
+ patch -Np1 < ../0001-shared-utmp-wtmp-fix-build-without-utmp.patch
+
+ # add upstream repository for cherry-picking
+ git remote add -f upstream ../systemd
+
+ # this test fails due to missing libtss2-esys.so.0
+ # disable for now
+ sed -i '/test-dlopen-so/d' src/test/meson.build
+
+ local _c
+ for _c in "${_backports[@]}"; do
+ git cherry-pick -n "${_c}"
+ done
+ for _c in "${_reverts[@]}"; do
+ git revert -n "${_c}"
+ done
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ local _timeservers=({0..3}.arch.pool.ntp.org)
+ local _nameservers=(
+ # We use these public name services, ordered by their
+ # privacy policy (hopefully):
+ # * Cloudflare (https://1.1.1.1/)
+ # * Quad9 without filtering (https://www.quad9.net/)
+ # * Google (https://developers.google.com/speed/public-dns/)
+ 1.1.1.1#cloudflare-dns.com
+ 9.9.9.10#dns.quad9.net
+ 8.8.8.8#dns.google
+ 2606:4700:4700::1111#cloudflare-dns.com
+ 2620:fe::10#dns.quad9.net
+ 2001:4860:4860::8888#dns.google
+ )
+
+ local _meson_options=(
+ --libexecdir /usr/lib32
+ --libdir /usr/lib32
+
+ # internal version comparison is incompatible with pacman:
+ # 249~rc1 < 249 < 249.1 < 249rc
+ -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-arch"
+ -Dshared-lib-tag="${pkgver}-${pkgrel}"
+ -Dmode=release
+
+ # features
+ -Daudit=false
+ -Dblkid=false
+ -Dgnu-efi=false
+ -Dima=false
+ -Dkmod=false
+ -Dlibcryptsetup=false
+ -Dlibidn2=true
+ -Dlibiptc=false
+ -Dlz4=false
+ -Dmicrohttpd=false
+ -Dpam=false
+ -Dseccomp=false
+
+ # components
+ -Dutmp=false
+ -Dhibernate=false
+ -Dldconfig=false
+ -Dresolve=true
+ -Defi=false
+ -Dtpm=false
+ -Denvironment-d=false
+ -Dbinfmt=false
+ -Drepart=false
+ -Dcoredump=false
+ -Dpstore=false
+ -Doomd=false
+ -Dlogind=false
+ -Dhostnamed=false
+ -Dlocaled=false
+ -Dmachined=true
+ -Dportabled=false
+ -Dsysext=false
+ -Duserdb=false
+ -Dhomed=false
+ -Dnetworkd=false
+ -Dtimedated=false
+ -Dtimesyncd=false
+ -Dremote=false
+ -Dcreate-log-dirs=false
+ -Dnss-myhostname=true
+ -Dnss-mymachines=true
+ -Dnss-resolve=true
+ -Dnss-systemd=true
+ -Dfirstboot=false
+ -Drandomseed=false
+ -Dbacklight=false
+ -Dvconsole=false
+ -Dquotacheck=false
+ -Dsysusers=false
+ -Dtmpfiles=false
+ -Dimportd=false
+ -Dhwdb=false
+ -Drfkill=false
+ -Dxdg-autostart=false
+ -Dman=false
+ -Dhtml=false
+ -Dtranslations=false
+
+ -Ddbuspolicydir=/usr/share/dbus-1/system.d
+ -Ddefault-hierarchy=unified
+ -Ddefault-kill-user-processes=false
+ -Ddefault-locale=C
+ -Dfallback-hostname='archlinux'
+ -Dnologin-path=/usr/bin/nologin
+ -Dntp-servers="${_timeservers[*]}"
+ -Ddns-servers="${_nameservers[*]}"
+ -Drpmmacrosdir=no
+ -Dsysvinit-path=
+ -Dsysvrcnd-path=
+ )
+
+ arch-meson "$_pkgbasename-stable" build "${_meson_options[@]}"
+
+ meson compile -C build
+}
+
+check() {
+ meson test -C build
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja -C build install
+
+ rm -rf "${pkgdir}"/{etc,var}
+ rm -rf "${pkgdir}"/usr/{bin,include,lib,share}
+}
More information about the arch-commits
mailing list