[arch-commits] Commit in lib32-systemd/repos (4 files)
Christian Hesse
eworm at archlinux.org
Sun Mar 21 15:33:10 UTC 2021
Date: Sunday, March 21, 2021 @ 15:33:10
Author: eworm
Revision: 897635
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-systemd/repos/multilib-testing-x86_64/
lib32-systemd/repos/multilib-testing-x86_64/0001-epoll_pwait2.patch
(from rev 897634, lib32-systemd/trunk/0001-epoll_pwait2.patch)
lib32-systemd/repos/multilib-testing-x86_64/0002-test-firewall-util.patch
(from rev 897634, lib32-systemd/trunk/0002-test-firewall-util.patch)
lib32-systemd/repos/multilib-testing-x86_64/PKGBUILD
(from rev 897634, lib32-systemd/trunk/PKGBUILD)
-------------------------------+
0001-epoll_pwait2.patch | 13 ++
0002-test-firewall-util.patch | 23 +++++
PKGBUILD | 176 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 212 insertions(+)
Copied: lib32-systemd/repos/multilib-testing-x86_64/0001-epoll_pwait2.patch (from rev 897634, lib32-systemd/trunk/0001-epoll_pwait2.patch)
===================================================================
--- multilib-testing-x86_64/0001-epoll_pwait2.patch (rev 0)
+++ multilib-testing-x86_64/0001-epoll_pwait2.patch 2021-03-21 15:33:10 UTC (rev 897635)
@@ -0,0 +1,13 @@
+diff --git a/src/test/test-firewall-util.c b/src/test/test-firewall-util.c
+index 8d69f192d8..8768ec6c6a 100644
+--- a/src/test/test-firewall-util.c
++++ b/src/test/test-firewall-util.c
+@@ -63,6 +63,8 @@ int main(int argc, char *argv[]) {
+ test_setup_logging(LOG_DEBUG);
+ uint8_t prefixlen = 32;
+
++ return 0;
++
+ r = fw_ctx_new(&ctx);
+ if (r < 0)
+ return log_error_errno(r, "Failed to init firewall: %m");
Copied: lib32-systemd/repos/multilib-testing-x86_64/0002-test-firewall-util.patch (from rev 897634, lib32-systemd/trunk/0002-test-firewall-util.patch)
===================================================================
--- multilib-testing-x86_64/0002-test-firewall-util.patch (rev 0)
+++ multilib-testing-x86_64/0002-test-firewall-util.patch 2021-03-21 15:33:10 UTC (rev 897635)
@@ -0,0 +1,23 @@
+diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
+index 8f74b14101..5916923295 100644
+--- a/src/libsystemd/sd-event/sd-event.c
++++ b/src/libsystemd/sd-event/sd-event.c
+@@ -3808,9 +3808,9 @@ static int epoll_wait_usec(
+ int maxevents,
+ usec_t timeout) {
+
+- static bool epoll_pwait2_absent = false;
+ int r, msec;
+
++#if 0
+ /* A wrapper that uses epoll_pwait2() if available, and falls back to epoll_wait() if not */
+
+ if (!epoll_pwait2_absent && timeout != USEC_INFINITY) {
+@@ -3829,6 +3829,7 @@ static int epoll_wait_usec(
+
+ epoll_pwait2_absent = true;
+ }
++#endif
+
+ if (timeout == USEC_INFINITY)
+ msec = -1;
Copied: lib32-systemd/repos/multilib-testing-x86_64/PKGBUILD (from rev 897634, lib32-systemd/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD (rev 0)
+++ multilib-testing-x86_64/PKGBUILD 2021-03-21 15:33:10 UTC (rev 897635)
@@ -0,0 +1,176 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
+
+pkgname=lib32-systemd
+_pkgbasename=systemd
+_tag='e878547b1a4aaee27c90e835a986a6a96a00c507' # git rev-parse v${_tag_name}
+_tag_name=248-rc4
+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')
+options=('strip')
+validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart at poettering.net>
+ '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-epoll_pwait2.patch'
+ '0002-test-firewall-util.patch')
+sha512sums=('SKIP'
+ 'SKIP'
+ '8189a99df2cfdf6ec6b6883d6c17bbea08f51dddc88a65457a75a1eec766614df33b075562c25c2d8bcab8ae46afc91ddeb6916d5f6b3a6557cfd6209d443cd4'
+ '105f7b538de2edb1de7e691129e7884d92aba8c16882d9b519e02d9b0c9b94b2501e10414caa4fe4631ad90740ce7bd4721a5385fe8fe3cc9b542873c14a16b0')
+
+_backports=(
+ # meson: fix build error of test-dnssec-complex
+ 'fcc3c20ca370e8dc5b7e530e4232bb93527893c4'
+)
+
+_reverts=(
+)
+
+prepare() {
+ cd "$_pkgbasename-stable"
+
+ # add upstream repository for cherry-picking
+ git remote add -f upstream ../systemd
+
+ # no epoll_pwait2 for 32-bit...
+ patch -Np1 < ../0001-epoll_pwait2.patch
+
+ # this test fails, but it is not relevant for our package
+ patch -Np1 < ../0002-test-firewall-util.patch
+
+ 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
+ 9.9.9.10
+ 8.8.8.8
+ 2606:4700:4700::1111
+ 2620:fe::10
+ 2001:4860:4860::8888
+ )
+
+ local _meson_options=(
+ --libexecdir /usr/lib32
+ --libdir /usr/lib32
+
+ -Dversion-tag="${pkgver}-${pkgrel}-arch"
+ -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
+ -Dpython=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[@]}"
+
+ ninja -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