sync with lib32-systemd content and systemd-git functionsHEADmaster

2 files changed, 83 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3de08d1..f8dc97a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = lib32-systemd-git
 	pkgdesc = system and service manager (32-bit git version)
-	pkgver = 253.r64333.d685a5f6a4
+	pkgver = 258.devel.r78225.3cbf00a30c0
 	pkgrel = 1
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
-	license = GPL2
-	license = LGPL2.1
-	checkdepends = systemd-git=253.r64333.d685a5f6a4
+	license = LGPL-2.1-or-later
+	checkdepends = systemd-git
 	makedepends = git
 	makedepends = gperf
 	makedepends = intltool
@@ -23,16 +22,16 @@ pkgbase = lib32-systemd-git
 	makedepends = libxslt
 	makedepends = meson
 	makedepends = python-jinja
+	depends = systemd-libs-git
 	depends = lib32-gcc-libs
 	depends = lib32-libcap
 	depends = lib32-libgcrypt
 	depends = lib32-libxcrypt
 	depends = lib32-xz
 	depends = lib32-zstd
-	depends = systemd-libs-git=253.r64333.d685a5f6a4
 	provides = libsystemd.so
 	provides = libudev.so
-	provides = lib32-systemd=253.r64333.d685a5f6a4
+	provides = lib32-systemd=258.devel.r78225.3cbf00a30c0
 	conflicts = lib32-systemd
 	options = strip
 	source = systemd-stable::git+https://github.com/systemd/systemd
diff --git a/PKGBUILD b/PKGBUILD
index 858236e..9a05410 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,39 @@
-# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
+# Maintainer: Thorsten Toepper <atsutane-aur at freethoughts dot de>
+# Contributor: Yurii Kolesnykov <root@yurikoles.com>
 # Based on multilib/lib32-systemd by Christian Hesse <mail@eworm.de>
 
 pkgname=lib32-systemd-git
 _pkgbasename=systemd
-pkgver=253.r64333.d685a5f6a4
+pkgver=258.devel.r78225.3cbf00a30c0
 pkgrel=1
 pkgdesc='system and service manager (32-bit git version)'
 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-libs-git=$pkgver")
+license=('LGPL-2.1-or-later')
+depends=('systemd-libs-git' 'lib32-gcc-libs' 'lib32-libcap' 'lib32-libgcrypt'
+         'lib32-libxcrypt' 'lib32-xz' 'lib32-zstd')
 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')
-checkdepends=("systemd-git=$pkgver")
+checkdepends=('systemd-git')
 provides=('libsystemd.so' 'libudev.so')
-provides+=("lib32-systemd=$pkgver")
+provides+=("lib32-systemd=${pkgver}")
 conflicts=('lib32-systemd')
 options=('strip')
-source=("$_pkgbasename-stable::git+https://github.com/systemd/systemd")
+source=("${_pkgbasename}-stable::git+https://github.com/systemd/systemd")
 sha512sums=('SKIP')
 
 pkgver() {
-  cd "$_pkgbasename-stable"
-  local _major=`grep -m1 version meson.build | cut -d\' -f2`
+  cd "${_pkgbasename}-stable"
+  # Upstream versioning is incompatible with pacman's version comparisons, one
+  # way or another. So we replace dashes and tildes to make sure pacman's
+  # version comparing does the right thing for rc versions:
+  local _major=`sed 's/~/./g' meson.version`
   printf "%s.r%s.%s" "${_major}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
@@ -36,8 +41,7 @@ build() {
 
   local _timeservers=({0..3}.arch.pool.ntp.org)
   local _nameservers=(
-    # We use these public name services, ordered by their
-    # privacy policy (hopefully):
+    # We use these public name services, ordered by their privacy policy (hopefully):
     #  * Cloudflare (https://1.1.1.1/)
     #  * Quad9 (https://www.quad9.net/)
     #  * Google (https://developers.google.com/speed/public-dns/)
@@ -50,77 +54,84 @@ build() {
   )
  
   local _meson_options=(
-    --libexecdir  /usr/lib32
-    --libdir    /usr/lib32
+    --libexecdir	/usr/lib32
+    --libdir		/usr/lib32
 
-    # internal version comparison is incompatible with pacman:
-    #   249~rc1 < 249 < 249.1 < 249rc
     -Dversion-tag="${pkgver}-${pkgrel}-arch"
     -Dshared-lib-tag="${pkgver}-${pkgrel}"
     -Dmode=release
 
-    # features
-    -Daudit=false
-    -Dblkid=false
-    -Dbootloader=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
-    -Dtpm2=false
-    -Denvironment-d=false
+    # components & features
+    -Dapparmor=disabled
+    -Daudit=disabled
+    -Dbacklight=false
     -Dbinfmt=false
-    -Drepart=false
+    -Dblkid=disabled
+    -Dbootloader=disabled
+    -Dbpf-framework=disabled
     -Dcoredump=false
-    -Dpstore=false
-    -Doomd=false
-    -Dlogind=false
+    -Dcreate-log-dirs=false
+    -Defi=false
+    -Denvironment-d=false
+    -Dfirstboot=false
+    -Dhibernate=false
+    -Dhomed=disabled
     -Dhostnamed=false
+    -Dhtml=disabled
+    -Dhwdb=false
+    -Dima=false
+    -Dimportd=disabled
+    -Dkmod=disabled
+    -Dldconfig=false
+    -Dlibarchive=disabled
+    -Dlibcryptsetup=disabled
+    -Dlibcryptsetup-plugins=disabled
+    -Dlibfido2=disabled
+    -Dlibidn2=enabled
+    -Dlibiptc=disabled
     -Dlocaled=false
+    -Dlogind=false
+    -Dlz4=disabled
     -Dmachined=true
-    -Dportabled=false
-    -Dsysext=false
-    -Duserdb=false
-    -Dhomed=false
+    -Dman=disabled
+    -Dmicrohttpd=disabled
     -Dnetworkd=false
-    -Dtimedated=false
-    -Dtimesyncd=false
-    -Dremote=false
-    -Dcreate-log-dirs=false
     -Dnss-myhostname=true
-    -Dnss-mymachines=true
-    -Dnss-resolve=true
+    -Dnss-mymachines=enabled
+    -Dnss-resolve=enabled
     -Dnss-systemd=true
-    -Dfirstboot=false
-    -Drandomseed=false
-    -Dbacklight=false
-    -Dvconsole=false
+    -Doomd=false
+    -Dpam=disabled
+    -Dpasswdqc=disabled
+    -Dportabled=false
+    -Dpstore=false
+    -Dpwquality=disabled
+    -Dqrencode=disabled
     -Dquotacheck=false
+    -Drandomseed=false
+    -Dremote=disabled
+    -Drepart=disabled
+    -Dresolve=true
+    -Drfkill=false
+    -Dseccomp=disabled
+    -Dselinux=disabled
+    -Dsysext=false
     -Dsysusers=false
+    -Dtimedated=false
+    -Dtimesyncd=false
     -Dtmpfiles=false
-    -Dimportd=false
-    -Dhwdb=false
-    -Drfkill=false
-    -Dxdg-autostart=false
-    -Dman=false
-    -Dhtml=false
+    -Dtpm2=disabled
+    -Dtpm=false
     -Dtranslations=false
+    -Dukify=disabled
+    -Duserdb=false
+    -Dutmp=false
+    -Dvconsole=false
+    -Dxdg-autostart=false
+    -Dxenctrl=disabled
+    -Dxkbcommon=disabled
 
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
-    -Ddefault-hierarchy=unified
     -Ddefault-kill-user-processes=false
     -Ddefault-locale='C.UTF-8'
     -Dfallback-hostname='archlinux'
@@ -132,17 +143,17 @@ build() {
     -Dsysvrcnd-path=
   )
 
-  arch-meson "$_pkgbasename-stable" build "${_meson_options[@]}"
+  arch-meson "${_pkgbasename}-stable" build "${_meson_options[@]}"
 
   meson compile -C build
 }
 
 check() {
-  meson test -C build
+  meson test -C build --print-errorlogs
 }
 
 package() {
-  meson install -C build --destdir "$pkgdir"
+  meson install -C build --no-rebuild --destdir "$pkgdir"
 
   rm -rf "${pkgdir}"/{etc,var}
   rm -rf "${pkgdir}"/usr/{bin,include,lib,lib32/systemd,share}