Fix version string generation & sync with core/systemd

9 files changed, 180 insertions, 347 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa91aab..bb53e01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = systemd-git
 	pkgdesc = systemd (git version)
-	pkgver = 254.r67937.abcf59970d
+	pkgver = 257.devel.r75997.144e53b333
 	pkgrel = 1
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
-	checkdepends = python-pefile
+	license = LGPL-2.1-or-later
 	makedepends = acl
 	makedepends = cryptsetup
 	makedepends = docbook-xsl
@@ -16,6 +16,7 @@ pkgbase = systemd-git
 	makedepends = intltool
 	makedepends = iptables
 	makedepends = kmod
+	makedepends = libarchive
 	makedepends = libcap
 	makedepends = libidn2
 	makedepends = libgcrypt
@@ -48,13 +49,14 @@ pkgbase = systemd-git
 	makedepends = curl
 	makedepends = gnutls
 	makedepends = python-pyelftools
+	makedepends = libpwquality
+	makedepends = qrencode
 	makedepends = lib32-gcc-libs
+	makedepends = python-pefile
+	conflicts = mkinitcpio<38-1
 	options = strip
 	source = systemd-git-stable::git+https://github.com/systemd/systemd
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
-	source = initcpio-hook-udev
-	source = initcpio-install-systemd
-	source = initcpio-install-udev
 	source = arch.conf
 	source = loader.conf
 	source = splash-arch.bmp::https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/raw/main/splash-arch.bmp
@@ -63,7 +65,8 @@ pkgbase = systemd-git
 	source = 20-systemd-sysusers.hook
 	source = 30-systemd-binfmt.hook
 	source = 30-systemd-catalog.hook
-	source = 30-systemd-daemon-reload.hook
+	source = 30-systemd-daemon-reload-system.hook
+	source = 30-systemd-daemon-reload-user.hook
 	source = 30-systemd-hwdb.hook
 	source = 30-systemd-sysctl.hook
 	source = 30-systemd-tmpfiles.hook
@@ -71,18 +74,16 @@ pkgbase = systemd-git
 	source = 30-systemd-update.hook
 	sha512sums = SKIP
 	sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e
-	sha512sums = 4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e
-	sha512sums = 94a3bf4720d428c2ec4e6c493f78debeb3d3b865ba2bef266f388bffccda8592af81a1fa2cd98f3d60720935e796572fa07256ffafb8d73342214f0ca8ba7acc
-	sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6
 	sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
 	sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
 	sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
 	sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19
-	sha512sums = 5c4119bf1d84b22986dc8d0c4c2de26500b824c21dfac69f22e36809e2673f0652447cc8c9f77190ad098896f4a5e1d03fa33676fe962de631bbfa44513a8860
+	sha512sums = 3cb8f88c1bffc753d0c540be5d25a0fdb9224478cca64743b5663340f2f26b197775286e6e680228db54c614dcd11da1135e625674a622127681662bec4fa886
 	sha512sums = 299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5
 	sha512sums = 0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7
 	sha512sums = 2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc
-	sha512sums = 63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254
+	sha512sums = a436d3f5126c6c0d6b58c6865e7bd38dbfbfb7babe017eeecb5e9d162c21902cbf4e0a68cf3ac2f99815106f9fa003b075bd2b4eb5d16333fa913df6e2f3e32a
+	sha512sums = 190112e38d5a5c0ca91b89cd58f95595262a551530a16546e1d84700fc9644aa2ca677953ffff655261e8a7bff6e6af4e431424df5f13c00bc90b77c421bc32d
 	sha512sums = a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154
 	sha512sums = 9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de
 	sha512sums = da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc
@@ -92,25 +93,26 @@ pkgbase = systemd-git
 pkgname = systemd-git
 	pkgdesc = system and service manager (git version)
 	install = systemd.install
-	license = GPL2
-	license = LGPL2.1
+	license = LGPL-2.1-or-later
+	license = CC0-1.0
+	license = GPL-2.0-or-later
+	license = MIT-0
+	depends = systemd-libs-git=257.devel.r75997.144e53b333
 	depends = acl
 	depends = libacl.so
 	depends = bash
 	depends = cryptsetup
 	depends = libcryptsetup.so
 	depends = dbus
-	depends = iptables
+	depends = dbus-units
 	depends = kbd
 	depends = kmod
-	depends = libkmod.so
 	depends = hwdata
 	depends = libcap
 	depends = libcap.so
 	depends = libgcrypt
 	depends = libxcrypt
 	depends = libcrypt.so
-	depends = systemd-libs-git=254.r67937.abcf59970d
 	depends = libidn2
 	depends = lz4
 	depends = pam
@@ -130,23 +132,30 @@ pkgname = systemd-git
 	optdepends = libmicrohttpd: systemd-journal-gatewayd and systemd-journal-remote
 	optdepends = quota-tools: kernel-level quota management
 	optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries
-	optdepends = systemd-ukify-git=254.r67937.abcf59970d: combine kernel and initrd into a signed Unified Kernel Image
+	optdepends = systemd-ukify-git=257.devel.r75997.144e53b333: combine kernel and initrd into a signed Unified Kernel Image
 	optdepends = polkit: allow administration as unprivileged user
 	optdepends = python: Unified Kernel Image with ukify
 	optdepends = curl: systemd-journal-upload, machinectl pull-tar and pull-raw
 	optdepends = gnutls: systemd-journal-gatewayd and systemd-journal-remote
+	optdepends = qrencode: show QR codes
+	optdepends = iptables: firewall features
+	optdepends = libarchive: convert DDIs to tarballs
 	optdepends = libbpf: support BPF programs
+	optdepends = libpwquality: check password quality
 	optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token
 	optdepends = libp11-kit: support PKCS#11
 	optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
 	provides = nss-myhostname
-	provides = systemd-tools=254.r67937.abcf59970d
-	provides = udev=254.r67937.abcf59970d
-	provides = systemd=254.r67937.abcf59970d
+	provides = systemd-tools=257.devel.r75997.144e53b333
+	provides = udev=257.devel.r75997.144e53b333
+	provides = systemd=257.devel.r75997.144e53b333
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
 	conflicts = systemd
+	replaces = nss-myhostname
+	replaces = systemd-tools
+	replaces = udev
 	backup = etc/pam.d/systemd-user
 	backup = etc/systemd/coredump.conf
 	backup = etc/systemd/homed.conf
@@ -167,7 +176,9 @@ pkgname = systemd-git
 
 pkgname = systemd-libs-git
 	pkgdesc = systemd client libraries (git version)
-	license = LGPL2.1
+	license = LGPL-2.1-or-later
+	license = CC0-1.0
+	license = GPL-2.0-or-later WITH Linux-syscall-note
 	depends = glibc
 	depends = gcc-libs
 	depends = libcap
@@ -178,37 +189,39 @@ pkgname = systemd-libs-git
 	provides = libsystemd
 	provides = libsystemd.so
 	provides = libudev.so
-	provides = systemd-libs=254.r67937.abcf59970d
 	conflicts = libsystemd
-	conflicts = systemd-libs
+	replaces = libsystemd
 
 pkgname = systemd-resolvconf-git
 	pkgdesc = systemd resolvconf replacement (for use with systemd-resolved) (git version)
-	license = LGPL2.1
-	depends = systemd-git=254.r67937.abcf59970d
+	depends = systemd-git=257.devel.r75997.144e53b333
 	provides = openresolv
 	provides = resolvconf
-	provides = systemd-resolvconf=254.r67937.abcf59970d
-	conflicts = openresolv
+	provides = systemd-resolvconf=257.devel.r75997.144e53b333
+	conflicts = resolvconf
 	conflicts = systemd-resolvconf
 
 pkgname = systemd-sysvcompat-git
 	pkgdesc = sysvinit compat for systemd (git version)
-	license = GPL2
-	depends = systemd-git=254.r67937.abcf59970d
-	provides = systemd-sysvcompat=254.r67937.abcf59970d
+	depends = systemd-git=257.devel.r75997.144e53b333
+	provides = systemd-sysvcompat=257.devel.r75997.144e53b333
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 
+pkgname = systemd-tests-git
+	pkgdesc = systemd tests (git version)
+	depends = systemd=257.devel.r75997.144e53b333
+	provides = systemd-tests=257.devel.r75997.144e53b333
+	conflicts = systemd-tests
+
 pkgname = systemd-ukify-git
 	pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image (git version)
-	license = GPL2
+	depends = systemd-git=257.devel.r75997.144e53b333
 	depends = binutils
 	depends = python-cryptography
 	depends = python-pefile
-	depends = systemd-git=254.r67937.abcf59970d
 	optdepends = python-pillow: Show the size of splash image
 	optdepends = sbsigntools: Sign the embedded kernel
 	provides = ukify
-	provides = systemd-ukify=254.r67937.abcf59970d
+	provides = systemd-ukify=257.devel.r75997.144e53b333
 	conflicts = systemd-ukify
diff --git a/30-systemd-daemon-reload.hook b/30-systemd-daemon-reload-system.hook
index dff95e4..a305d73 100644
--- a/30-systemd-daemon-reload.hook
+++ b/30-systemd-daemon-reload-system.hook
@@ -8,4 +8,4 @@ Target = usr/lib/systemd/system/*
 [Action]
 Description = Reloading system manager configuration...
 When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload
+Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload-system
diff --git a/30-systemd-daemon-reload-user.hook b/30-systemd-daemon-reload-user.hook
new file mode 100644
index 0000000..3eddf8f
--- /dev/null
+++ b/30-systemd-daemon-reload-user.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/systemd/user/*
+
+[Action]
+Description = Reloading user manager configuration...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload-user
diff --git a/PKGBUILD b/PKGBUILD
index 5cbf15e..229e21e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,32 @@
-# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
-# Based on testing/systemd by Christian Hesse <mail@eworm.de>
-#
-# PRs are welcome here: https://github.com/yurikoles-aur/systemd-git
-#
+# Maintainer: Thorsten Toepper <atsutane-aur at freethoughts dot de>
+# Contributor: Yurii Kolesnykov <root@yurikoles.com>
+# Based on core/systemd by Christian Hesse <mail@eworm.de>
 
 pkgbase=systemd-git
 pkgname=('systemd-git'
          'systemd-libs-git'
          'systemd-resolvconf-git'
          'systemd-sysvcompat-git'
+         'systemd-tests-git'
          'systemd-ukify-git')
 pkgdesc='systemd (git version)'
-pkgver=254.r67973.cde8cc946b
+pkgver=257.devel.r75997.144e53b333
 pkgrel=1
 arch=('x86_64')
+license=('LGPL-2.1-or-later')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
-             'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
+             'intltool' 'iptables' 'kmod' 'libarchive' 'libcap' 'libidn2' 'libgcrypt'
              'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'git'
              'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
              'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync'
              'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools'
-             'lib32-gcc-libs')
-checkdepends=('python-pefile')
+             'libpwquality' 'qrencode' 'lib32-gcc-libs' 'python-pefile')
+conflicts=("mkinitcpio<38-1")
 options=('strip')
 source=("$pkgbase-stable::git+https://github.com/systemd/systemd"
         '0001-Use-Arch-Linux-device-access-groups.patch'
-        # mkinitcpio files
-        'initcpio-hook-udev'
-        'initcpio-install-systemd'
-        'initcpio-install-udev'
         # bootloader files
         'arch.conf'
         'loader.conf'
@@ -42,7 +38,8 @@ source=("$pkgbase-stable::git+https://github.com/systemd/systemd"
         '20-systemd-sysusers.hook'
         '30-systemd-binfmt.hook'
         '30-systemd-catalog.hook'
-        '30-systemd-daemon-reload.hook'
+        '30-systemd-daemon-reload-system.hook'
+        '30-systemd-daemon-reload-user.hook'
         '30-systemd-hwdb.hook'
         '30-systemd-sysctl.hook'
         '30-systemd-tmpfiles.hook'
@@ -50,18 +47,16 @@ source=("$pkgbase-stable::git+https://github.com/systemd/systemd"
         '30-systemd-update.hook')
 sha512sums=('SKIP'
             '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
-            '4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e'
-            '94a3bf4720d428c2ec4e6c493f78debeb3d3b865ba2bef266f388bffccda8592af81a1fa2cd98f3d60720935e796572fa07256ffafb8d73342214f0ca8ba7acc'
-            'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
             '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            '5c4119bf1d84b22986dc8d0c4c2de26500b824c21dfac69f22e36809e2673f0652447cc8c9f77190ad098896f4a5e1d03fa33676fe962de631bbfa44513a8860'
+            '3cb8f88c1bffc753d0c540be5d25a0fdb9224478cca64743b5663340f2f26b197775286e6e680228db54c614dcd11da1135e625674a622127681662bec4fa886'
             '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
             '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
             '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'
-            '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254'
+            'a436d3f5126c6c0d6b58c6865e7bd38dbfbfb7babe017eeecb5e9d162c21902cbf4e0a68cf3ac2f99815106f9fa003b075bd2b4eb5d16333fa913df6e2f3e32a'
+            '190112e38d5a5c0ca91b89cd58f95595262a551530a16546e1d84700fc9644aa2ca677953ffff655261e8a7bff6e6af4e431424df5f13c00bc90b77c421bc32d'
             'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154'
             '9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de'
             'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'
@@ -70,12 +65,15 @@ sha512sums=('SKIP'
 
 pkgver() {
   cd "$pkgbase-stable"
-  local _major=`grep -m1 version meson.build | cut -d\' -f2`
+  # 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)"
 }
 
 prepare() {
-  cd "$pkgbase-stable"
+  cd "${pkgbase}-stable"
 
   # Replace cdrom/dialout/tape groups with optical/uucp/storage
   patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
@@ -97,29 +95,26 @@ build() {
   )
 
   local _meson_options=(
-    # internal version comparison is incompatible with pacman:
-    #   249~rc1 < 249 < 249.1 < 249rc
     -Dversion-tag="${pkgver}-${pkgrel}-arch"
+    -Dvcs-tag=true
     -Dshared-lib-tag="${pkgver}-${pkgrel}"
-    -Dmode=release
+    -Dmode=developer
 
-    -Dapparmor=false
-    -Dbootloader=true
-    -Dbpf-framework=true
+    -Dapparmor=disabled
+    -Dbootloader=enabled
+    -Dxenctrl=disabled
+    -Dbpf-framework=enabled
     -Dima=false
-    -Dlibidn2=true
-    -Dlz4=true
-    -Dman=true
+    -Dinstall-tests=true
+    -Dlibidn2=enabled
+    -Dlz4=enabled
+    -Dman=enabled
     -Dnscd=false
-    -Dpasswdqc=false
-    -Dpwquality=false
-    -Dqrencode=false
-    -Dselinux=false
-    -Dxenctrl=false
+    -Dselinux=disabled
 
     # We disable DNSSEC by default, it still causes trouble:
     # https://github.com/systemd/systemd/issues/10579
-    
+
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
     -Ddefault-dnssec=no
     -Ddefault-hierarchy=unified
@@ -142,38 +137,49 @@ build() {
     -Dsbat-distro-url="https://aur.archlinux.org/pkgbase/${pkgname}"
   )
 
-  arch-meson "$pkgbase-stable" build "${_meson_options[@]}"
+  arch-meson "${pkgbase}-stable" build "${_meson_options[@]}"
 
+  #meson compile -C build --verbose
   meson compile -C build
 }
 
 check() {
-  meson test -C build
+  meson test -C build --print-errorlogs
 }
 
 package_systemd-git() {
   pkgdesc='system and service manager'
   pkgdesc+=' (git version)'
-  license=('GPL2' 'LGPL2.1')
-  depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'
-           'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwdata' 'libcap' 'libcap.so'
-           'libgcrypt' 'libxcrypt' 'libcrypt.so' "systemd-libs-git=$pkgver" 'libidn2' 'lz4' 'pam'
+  license+=(
+    'CC0-1.0' # siphash
+    'GPL-2.0-or-later' # udev
+    'MIT-0' # documentation and config files
+  )
+  depends=("systemd-libs-git=${pkgver}"
+           'acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'
+           'dbus-units' 'kbd' 'kmod' 'hwdata' 'libcap' 'libcap.so'
+           'libgcrypt' 'libxcrypt' 'libcrypt.so' 'libidn2' 'lz4' 'pam'
            'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so'
            'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so'
            'openssl' 'libcrypto.so' 'libssl.so')
-  provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
-  provides+=("systemd=$pkgver")
+  provides=('nss-myhostname' "systemd-tools=${pkgver}" "udev=${pkgver}")
+  provides+=("systemd=${pkgver}")
+  replaces=('nss-myhostname' 'systemd-tools' 'udev')
   conflicts=('nss-myhostname' 'systemd-tools' 'udev')
   conflicts+=('systemd')
   optdepends=('libmicrohttpd: systemd-journal-gatewayd and systemd-journal-remote'
               'quota-tools: kernel-level quota management'
               'systemd-sysvcompat: symlink package to provide sysvinit binaries'
-              "systemd-ukify-git=$pkgver: combine kernel and initrd into a signed Unified Kernel Image"
+              "systemd-ukify-git=${pkgver}: combine kernel and initrd into a signed Unified Kernel Image"
               'polkit: allow administration as unprivileged user'
               'python: Unified Kernel Image with ukify'
               'curl: systemd-journal-upload, machinectl pull-tar and pull-raw'
               'gnutls: systemd-journal-gatewayd and systemd-journal-remote'
+              'qrencode: show QR codes'
+              'iptables: firewall features'
+              'libarchive: convert DDIs to tarballs'
               'libbpf: support BPF programs'
+              'libpwquality: check password quality'
               'libfido2: unlocking LUKS2 volumes with FIDO2 token'
               'libp11-kit: support PKCS#11'
               'tpm2-tss: unlocking LUKS2 volumes with TPM2')
@@ -196,7 +202,7 @@ package_systemd-git() {
           etc/udev/udev.conf)
   install=systemd.install
 
-  meson install -C build --destdir "$pkgdir"
+  meson install -C build --destdir "${pkgdir}"
 
   # we'll create this on installation
   rmdir "$pkgdir"/var/log/journal/remote
@@ -209,9 +215,13 @@ package_systemd-git() {
   mv "$pkgdir"/usr/share/man/man3 systemd-libs/man3
 
   # ukify shipped in separate package
-  install -d -m0755 systemd-ukify/{systemd,man1}
+  install -d -m0755 systemd-ukify/{bin,systemd,man1,install.d}
+  mv "$pkgdir"/usr/bin/ukify systemd-ukify/bin/
   mv "$pkgdir"/usr/lib/systemd/ukify systemd-ukify/systemd/
   mv "$pkgdir"/usr/share/man/man1/ukify.1 systemd-ukify/man1/
+  # we move the ukify hook itself, but keep 90-uki-copy.install in place,
+  # because there are other ways to generate UKIs w/o ukify, e.g. w/ mkinitcpio
+  mv "$pkgdir"/usr/lib/kernel/install.d/60-ukify.install systemd-ukify/install.d
 
   # manpages shipped with systemd-sysvcompat
   rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8
@@ -222,6 +232,10 @@ package_systemd-git() {
   # files shipped with systemd-resolvconf
   rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
 
+  # tests shipped with systemd-tests (for upstream)
+  install -d -m0755 systemd-tests/
+  mv "$pkgdir"/usr/lib/systemd/tests systemd-tests/
+
   # avoid a potential conflict with [core]/filesystem
   rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf}
   sed -i -e '/^C \/etc\/nsswitch\.conf/d' \
@@ -230,17 +244,12 @@ package_systemd-git() {
   # ship default policy to leave services disabled
   echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
 
-  # add mkinitcpio hooks
-  install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd
-  install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev
-  install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev
-
   # The group 'systemd-journal' is allocated dynamically and may have varying
   # gid on different systems. Let's install with gid 0 (root), systemd-tmpfiles
   # will fix the permissions for us. (see /usr/lib/tmpfiles.d/systemd.conf)
   install -d -o root -g root -m 2755 "$pkgdir"/var/log/journal
 
-  # match directory owner/group and mode from [extra]/polkit
+  # match directory owner/group and mode from polkit
   install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d
 
   # add example bootctl configuration
@@ -254,17 +263,26 @@ package_systemd-git() {
 
   # overwrite the systemd-user PAM configuration with our own
   install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user
+
+  # create a directory for cryptsetup keys
+  install -d -m0700 "$pkgdir"/etc/cryptsetup-keys.d
+
+  # handle uncommon license
+  install -d -m0755 "$pkgdir/usr/share/licenses/$pkgbase"
+  ln -s -t "$_" /usr/share/doc/systemd/LICENSES/MIT-0.txt
 }
 
 package_systemd-libs-git() {
   pkgdesc='systemd client libraries'
   pkgdesc+=' (git version)'
   depends=('glibc' 'gcc-libs' 'libcap' 'libgcrypt' 'lz4' 'xz' 'zstd')
-  license=('LGPL2.1')
+  license+=(
+    'CC0-1.0' # siphash
+    'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/*
+  )
   provides=('libsystemd' 'libsystemd.so' 'libudev.so')
-  provides+=("systemd-libs=$pkgver")
   conflicts=('libsystemd')
-  conflicts+=('systemd-libs')
+  replaces=('libsystemd')
 
   install -d -m0755 "$pkgdir"/usr/share/man
   mv systemd-libs/lib "$pkgdir"/usr/lib
@@ -275,11 +293,10 @@ package_systemd-libs-git() {
 package_systemd-resolvconf-git() {
   pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)'
   pkgdesc+=' (git version)'
-  license=('LGPL2.1')
-  depends=("systemd-git=$pkgver")
+  depends=("systemd-git=${pkgver}")
   provides=('openresolv' 'resolvconf')
-  provides+=("systemd-resolvconf=$pkgver")
-  conflicts=('openresolv')
+  provides+=("systemd-resolvconf=${pkgver}")
+  conflicts=('resolvconf')
   conflicts+=('systemd-resolvconf')
 
   install -d -m0755 "$pkgdir"/usr/bin
@@ -292,11 +309,10 @@ package_systemd-resolvconf-git() {
 package_systemd-sysvcompat-git() {
   pkgdesc='sysvinit compat for systemd'
   pkgdesc+=' (git version)'
-  license=('GPL2')
   conflicts=('sysvinit')
   conflicts+=('systemd-sysvcompat')
-  depends=("systemd-git=$pkgver")
-  provides=("systemd-sysvcompat=$pkgver")
+  depends=("systemd-git=${pkgver}")
+  provides=("systemd-sysvcompat=${pkgver}")
 
   install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \
     build/man/{halt,poweroff,reboot,shutdown}.8
@@ -308,18 +324,32 @@ package_systemd-sysvcompat-git() {
   done
 }
 
+package_systemd-tests-git() {
+  pkgdesc='systemd tests'
+  pkgdesc+=' (git version)'
+  conflicts=('systemd-tests')
+  provides=("systemd-tests=${pkgver}")
+  depends=("systemd=${pkgver}")
+
+  install -d -m0755 "$pkgdir"/usr/lib/systemd
+  mv systemd-tests/tests "$pkgdir"/usr/lib/systemd/tests
+}
+
 package_systemd-ukify-git() {
   pkgdesc='Combine kernel and initrd into a signed Unified Kernel Image'
   pkgdesc+=' (git version)'
-  license=('GPL2')
   conflicts=('systemd-ukify')
   provides=('ukify')
   provides+=("systemd-ukify=$pkgver")
-  depends=('binutils' 'python-cryptography' 'python-pefile' "systemd-git=$pkgver")
+  depends=("systemd-git=$pkgver" 'binutils' 'python-cryptography' 'python-pefile')
   optdepends=('python-pillow: Show the size of splash image'
               'sbsigntools: Sign the embedded kernel')
 
-  install -d -m0755 "$pkgdir"/usr/{lib,share/man}
+  install -d -m0755 "$pkgdir"/usr/{lib/kernel,share/man}
+  mv systemd-ukify/bin "$pkgdir"/usr/bin
   mv systemd-ukify/systemd "$pkgdir"/usr/lib/systemd
   mv systemd-ukify/man1 "$pkgdir"/usr/share/man/man1
+  mv systemd-ukify/install.d "$pkgdir"/usr/lib/kernel/install.d
 }
+
+# vim:ft=sh syn=sh et sw=2:
diff --git a/initcpio-hook-udev b/initcpio-hook-udev
deleted file mode 100644
index dfa8750..0000000
--- a/initcpio-hook-udev
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
-    kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
-    systemd-tmpfiles --prefix=/dev --create --boot
-    if [ "${quiet}" = "y" ]; then
-        /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never >/dev/null 2>&1
-    else
-        /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
-    fi
-    udevd_running=1
-}
-
-run_hook() {
-    msg ":: Triggering uevents..."
-    udevadm trigger --action=add --type=subsystems
-    udevadm trigger --action=add --type=devices
-    udevadm settle
-}
-
-run_cleanuphook() {
-    udevadm control --exit
-    udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/initcpio-install-systemd b/initcpio-install-systemd
deleted file mode 100644
index d59900c..0000000
--- a/initcpio-install-systemd
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-
-add_systemd_unit() {
-    # Add a systemd unit file to the initcpio image. Hard dependencies on binaries
-    # and other unit files will be discovered and added.
-    #   $1: path to rules file (or name of rules file)
-
-    local unit= rule= entry= key= value= binary= dep=
-
-    unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
-    if [[ -z $unit ]]; then
-        # complain about not found unit file
-        return 1
-    fi
-
-    add_file "$unit"
-
-    while IFS='=' read -r key values; do
-        read -ra values <<< "$values"
-
-        case $key in
-            Requires|OnFailure)
-                # only add hard dependencies (not Wants)
-                map add_systemd_unit "${values[@]}"
-                ;;
-            Exec*)
-                # do not add binaries unless they are required,
-                # strip special executable prefixes
-                case ${values[0]} in
-                    -*)  ;;
-                    !!*) add_binary "${values[0]#!!}" ;;
-                    *)   add_binary "${values[0]#[@!:+]}" ;;
-                esac
-                ;;
-        esac
-
-    done <"$unit"
-
-    # preserve reverse soft dependency
-    for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
-        if [[ -L $dep ]]; then
-            add_symlink "$dep"
-        fi
-    done
-
-    # add hard dependencies
-    if [[ -d $unit.requires ]]; then
-        for dep in "$unit".requires/*; do
-            add_systemd_unit ${dep##*/}
-        done
-    fi
-}
-
-add_systemd_drop_in() {
-    local unit=$1 dropin_name=$2
-
-    mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
-    cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
-}
-
-build() {
-    local rules unit
-
-    add_binary /usr/bin/kmod /usr/bin/modprobe
-    add_binary /usr/bin/mount
-    add_binary /usr/bin/sulogin
-    add_binary /usr/bin/umount
-    add_binary /usr/lib/systemd/systemd /init
-
-    map add_binary \
-        /usr/bin/journalctl \
-        /usr/bin/systemd-tmpfiles \
-        /usr/lib/systemd/systemd-hibernate-resume \
-        /usr/lib/systemd/systemd-shutdown \
-        /usr/lib/systemd/systemd-sulogin-shell \
-        /usr/lib/systemd/system-generators/systemd-fstab-generator \
-        /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
-        /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
-
-    # udev rules
-    map add_udev_rule "$rules" \
-        50-udev-default.rules \
-        60-persistent-storage.rules \
-        64-btrfs.rules \
-        80-drivers.rules \
-        99-systemd.rules
-
-    # systemd units
-    map add_systemd_unit \
-        initrd-cleanup.service \
-        initrd-fs.target \
-        initrd-parse-etc.service \
-        initrd-root-fs.target \
-        initrd-root-device.target \
-        initrd-switch-root.service \
-        initrd-switch-root.target \
-        initrd-udevadm-cleanup-db.service \
-        initrd.target \
-        kmod-static-nodes.service \
-        local-fs.target \
-        local-fs-pre.target \
-        paths.target \
-        reboot.target \
-        slices.target \
-        sockets.target \
-        swap.target \
-        systemd-battery-check.service \
-        systemd-fsck@.service \
-        systemd-journald-audit.socket \
-        systemd-journald-dev-log.socket \
-        systemd-journald.service \
-        systemd-modules-load.service \
-        systemd-pcrphase-initrd.service \
-        systemd-tmpfiles-setup-dev.service \
-        systemd-udevd-control.socket \
-        systemd-udevd-kernel.socket \
-        systemd-udevd.service \
-        systemd-udev-trigger.service \
-        systemd-vconsole-setup.service \
-        timers.target \
-        rescue.target \
-        emergency.target
-
-    # add libraries dlopen()ed by tpm2-util
-    for LIB in tss2-{esys,rc,mu,tcti-'*'}; do
-        for FILE in $(find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*"); do
-            if [[ -L "${FILE}" ]]; then
-                add_symlink "${FILE}"
-            else
-                add_binary "${FILE}"
-            fi
-        done
-    done
-
-    add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
-    add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
-
-    printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \
-        'passwd: files' \
-        'group: files' \
-        'shadow: files'
-
-    echo "root:x:0:0:root:/root:/bin/sh" >"$BUILDROOT/etc/passwd"
-    echo 'root:*:::::::' >"$BUILDROOT/etc/shadow"
-    getent group root audio disk input kmem kvm lp optical render sgx storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"
-
-    add_dir "/etc/modules-load.d"
-    (
-      . "$_f_config"
-      set -f
-      printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
-    )
-}
-
-help() {
-    cat <<HELPEOF
-This will install a basic systemd setup in your initramfs, and is meant to
-replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime
-components will need to be ported, and will not work as intended. You also may
-wish to still include the 'base' hook (before this hook) to ensure that a
-rescue shell exists on your initramfs.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/initcpio-install-udev b/initcpio-install-udev
deleted file mode 100644
index fef6f9b..0000000
--- a/initcpio-install-udev
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-build() {
-    local rules tool
-
-    map add_binary \
-        '/usr/lib/systemd/systemd-udevd' \
-        '/usr/bin/udevadm' \
-        '/usr/bin/systemd-tmpfiles'
-
-    map add_udev_rule \
-        '50-udev-default.rules' \
-        '60-persistent-storage.rules' \
-        '64-btrfs.rules' \
-        '80-drivers.rules'
-    
-    map add_file \
-        '/usr/lib/udev/ata_id' \
-        '/usr/lib/udev/scsi_id'
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook adds the udev daemon to the initramfs, allowing for dynamic loading
-of modules and reliable detection of the root device via tags (e.g. UUID or
-LABEL). Do not remove this hook unless you are using the systemd hook, or you
-know what you're doing.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/systemd-hook b/systemd-hook
index 63f27e0..d64341f 100644
--- a/systemd-hook
+++ b/systemd-hook
@@ -26,14 +26,27 @@ udevd_live() {
 op="$1"; shift
 
 case "$op" in
+  binfmt)
+    systemd_live
+    /usr/lib/systemd/systemd-binfmt
+    ;;
   catalog)
     /usr/bin/journalctl --update-catalog
     ;;
+  daemon-reload-system)
+    systemd_live
+    /usr/bin/systemctl --system daemon-reload
+    ;;
+  daemon-reload-user)
+    systemd_live
+    /usr/bin/systemctl kill --kill-whom='main' --signal='SIGHUP' 'user@*.service'
+    ;;
   hwdb)
     /usr/bin/systemd-hwdb --usr update
     ;;
-  update)
-    touch -c /usr
+  sysctl)
+    systemd_live
+    /usr/lib/systemd/systemd-sysctl
     ;;
   sysusers)
     /usr/bin/systemd-sysusers
@@ -41,10 +54,8 @@ case "$op" in
   tmpfiles)
     /usr/bin/systemd-tmpfiles --create
     ;;
-
-  daemon-reload)
-    systemd_live
-    /usr/bin/systemctl daemon-reload
+  update)
+    touch -c /usr
     ;;
   udev-reload)
     udevd_live
@@ -54,14 +65,6 @@ case "$op" in
       /usr/bin/udevadm settle
     fi
     ;;
-  binfmt)
-    systemd_live
-    /usr/lib/systemd/systemd-binfmt
-    ;;
-  sysctl)
-    systemd_live
-    /usr/lib/systemd/systemd-sysctl
-    ;;
 
   # For use by other packages
   reload)
diff --git a/systemd.install b/systemd.install
index 536e54d..9f01f18 100644
--- a/systemd.install
+++ b/systemd.install
@@ -13,14 +13,9 @@ add_journal_acls() {
 post_common() {
   systemd-sysusers
   journalctl --update-catalog
-}
 
-_242_0_2_changes() {
-  if [[ -L var/lib/systemd/timesync ]]; then
-    rm var/lib/systemd/timesync
-    if [[ -d var/lib/private/systemd/timesync ]]; then
-      mv var/lib/{private/,}systemd/timesync
-    fi
+  if ! grep -qe '^/usr/bin/systemd-home-fallback-shell$' etc/shells; then
+    echo '/usr/bin/systemd-home-fallback-shell' >> etc/shells
   fi
 }
 
@@ -34,7 +29,8 @@ post_install() {
   # enable some services by default, but don't track them
   systemctl enable \
     getty@tty1.service \
-    remote-fs.target
+    remote-fs.target \
+    systemd-userdbd.socket
 
   # group 'systemd-journal-remote' is created by systemd-sysusers
   mkdir -m2755 var/log/journal/remote
@@ -46,10 +42,10 @@ post_upgrade() {
 
   if sd_booted; then
     systemctl --system daemon-reexec
+    systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
   fi
 
   local v upgrades=(
-    242.0-2
   )
 
   for v in "${upgrades[@]}"; do
@@ -59,4 +55,8 @@ post_upgrade() {
   done
 }
 
+post_remove() {
+  sed -i -r '/^\/usr\/bin\/systemd-home-fallback-shell$/d' etc/shells
+}
+
 # vim:set ts=2 sw=2 et: