systemd: update to 246.6

17 files changed, 356 insertions, 189 deletions

diff --git a/abs/extra/libaio/PKGBUILD b/abs/core/libaio/PKGBUILD
index 08d74db..08d74db 100644
--- a/abs/extra/libaio/PKGBUILD
+++ b/abs/core/libaio/PKGBUILD
diff --git a/abs/core/systemd/0001-Use-Arch-Linux-device-access-groups.patch b/abs/core/systemd/0001-Use-Arch-Linux-device-access-groups.patch
new file mode 100644
index 0000000..ccc9ad2
--- /dev/null
+++ b/abs/core/systemd/0001-Use-Arch-Linux-device-access-groups.patch
@@ -0,0 +1,67 @@
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 6 Mar 2018 23:39:47 +0100
+Subject: [PATCH] Use Arch Linux' device access groups
+
+  cdrom   → optical
+  dialout → uucp
+  tape    → storage
+---
+ rules.d/50-udev-default.rules.in | 14 +++++++-------
+ sysusers.d/basic.conf.in       |  6 +++---
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
+index 191f56f42..f81c4d0fc 100644
+--- a/rules.d/50-udev-default.rules.in
++++ b/rules.d/50-udev-default.rules.in
+@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
+-KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
++KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
+ 
+ SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
+ 
+@@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
+ 
+ SUBSYSTEM=="block", GROUP="disk"
+-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"
+-SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
+-KERNEL=="sch[0-9]*", GROUP="cdrom"
+-KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
+-KERNEL=="pktcdvd", GROUP="cdrom"
++SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical"
++SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical"
++KERNEL=="sch[0-9]*", GROUP="optical"
++KERNEL=="pktcdvd[0-9]*", GROUP="optical"
++KERNEL=="pktcdvd", GROUP="optical"
+ 
+-SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
++SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage"
+ SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
+ KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
+ KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"
+diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
+index 8e358c02d..33e513a36 100644
+--- a/sysusers.d/basic.conf.in
++++ b/sysusers.d/basic.conf.in
+@@ -24,14 +24,14 @@ g utmp    -     -            -
+ 
+ # Hardware access groups
+ g audio   -     -            -
+-g cdrom   -     -            -
+-g dialout -     -            -
+ g disk    -     -            -
+ g input   -     -            -
+ g kvm     -     -            -
+ g lp      -     -            -
++g optical -     -            -
+ g render  -     -            -
+-g tape    -     -            -
++g storage -     -            -
++g uucp    -     -            -
+ g video   -     -            -
+ 
+ # Default group for normal users
diff --git a/abs/core/systemd/20-systemd-sysusers.hook b/abs/core/systemd/20-systemd-sysusers.hook
new file mode 100644
index 0000000..edc7195
--- /dev/null
+++ b/abs/core/systemd/20-systemd-sysusers.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysusers.d/*.conf
+
+[Action]
+Description = Creating system user accounts...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook sysusers
diff --git a/abs/core/systemd/30-systemd-binfmt.hook b/abs/core/systemd/30-systemd-binfmt.hook
new file mode 100644
index 0000000..19f3bcc
--- /dev/null
+++ b/abs/core/systemd/30-systemd-binfmt.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/binfmt.d/*.conf
+
+[Action]
+Description = Registering binary formats...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook binfmt
diff --git a/abs/core/systemd/30-systemd-catalog.hook b/abs/core/systemd/30-systemd-catalog.hook
new file mode 100644
index 0000000..6e717b9
--- /dev/null
+++ b/abs/core/systemd/30-systemd-catalog.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/systemd/catalog/*
+
+[Action]
+Description = Updating journal message catalog...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook catalog
diff --git a/abs/core/systemd/30-systemd-daemon-reload.hook b/abs/core/systemd/30-systemd-daemon-reload.hook
new file mode 100644
index 0000000..dff95e4
--- /dev/null
+++ b/abs/core/systemd/30-systemd-daemon-reload.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/systemd/system/*
+
+[Action]
+Description = Reloading system manager configuration...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload
diff --git a/abs/core/systemd/systemd-hwdb.hook b/abs/core/systemd/30-systemd-hwdb.hook
index d7c9877..1d85e29 100644
--- a/abs/core/systemd/systemd-hwdb.hook
+++ b/abs/core/systemd/30-systemd-hwdb.hook
@@ -1,5 +1,5 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Install
 Operation = Upgrade
 Operation = Remove
@@ -8,4 +8,4 @@ Target = usr/lib/udev/hwdb.d/*
 [Action]
 Description = Updating udev hardware database...
 When = PostTransaction
-Exec = /usr/bin/systemd-hwdb --usr update
+Exec = /usr/share/libalpm/scripts/systemd-hook hwdb
diff --git a/abs/core/systemd/30-systemd-sysctl.hook b/abs/core/systemd/30-systemd-sysctl.hook
new file mode 100644
index 0000000..e2354c0
--- /dev/null
+++ b/abs/core/systemd/30-systemd-sysctl.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysctl.d/*.conf
+
+[Action]
+Description = Applying kernel sysctl settings...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook sysctl
diff --git a/abs/core/systemd/systemd-tmpfiles.hook b/abs/core/systemd/30-systemd-tmpfiles.hook
index 18cdd91..b07db6a 100644
--- a/abs/core/systemd/systemd-tmpfiles.hook
+++ b/abs/core/systemd/30-systemd-tmpfiles.hook
@@ -1,5 +1,5 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Install
 Operation = Upgrade
 Target = usr/lib/tmpfiles.d/*.conf
@@ -7,5 +7,4 @@ Target = usr/lib/tmpfiles.d/*.conf
 [Action]
 Description = Creating temporary files...
 When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create "$(basename "$f")"; done'
-NeedsTargets
+Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles
diff --git a/abs/core/systemd/30-systemd-udev-reload.hook b/abs/core/systemd/30-systemd-udev-reload.hook
new file mode 100644
index 0000000..7676cca
--- /dev/null
+++ b/abs/core/systemd/30-systemd-udev-reload.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/udev/rules.d/*
+
+[Action]
+Description = Reloading device manager configuration...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook udev-reload
diff --git a/abs/core/systemd/systemd-update.hook b/abs/core/systemd/30-systemd-update.hook
index 3697fbd..f95d9dc 100644
--- a/abs/core/systemd/systemd-update.hook
+++ b/abs/core/systemd/30-systemd-update.hook
@@ -1,5 +1,5 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Install
 Operation = Upgrade
 Operation = Remove
@@ -8,4 +8,4 @@ Target = usr/
 [Action]
 Description = Arming ConditionNeedsUpdate...
 When = PostTransaction
-Exec = /usr/bin/touch -c /usr
+Exec = /usr/share/libalpm/scripts/systemd-hook update
diff --git a/abs/core/systemd/PKGBUILD b/abs/core/systemd/PKGBUILD
index 93f942b..5f551df 100644
--- a/abs/core/systemd/PKGBUILD
+++ b/abs/core/systemd/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id$
 # Maintainer: Christian Hesse <mail@eworm.de>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Tom Gundersen <teg@jklm.no>
 
 pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-# latest commit on stable branch
-_commit='738ab7502afb7663d9aacdd73e79025aa7cd0a9b'
-# Bump this to latest major release for signed tag verification,
-# the commit count is handled by pkgver() function.
-pkgver=238.0
+pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
+_tag='27d60e13ed5db2194cac14ad4cc86ad06d753805' # git rev-parse v${pkgver}
+pkgver=246.6
 pkgrel=1
 arch=('x86_64')
-url="https://www.github.com/systemd/systemd"
+url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
-             'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
-             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
+             'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
+             'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
-             'meson' 'libseccomp' 'pcre2')
+             'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
+             'bash-completion' 'p11-kit' 'systemd')
 options=('strip')
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>
               '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-source=('git://github.com/systemd/systemd-stable.git'
-        'git://github.com/systemd/systemd.git' # pull in for tags, backports & reverts
+source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
+        "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
+        '0001-Use-Arch-Linux-device-access-groups.patch'
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
@@ -30,23 +28,36 @@ source=('git://github.com/systemd/systemd-stable.git'
         'loader.conf'
         'splash-arch.bmp'
         'systemd-user.pam'
-        'systemd-hwdb.hook'
-        'systemd-sysusers.hook'
-        'systemd-tmpfiles.hook'
-        'systemd-update.hook')
+        'systemd-hook'
+        '20-systemd-sysusers.hook'
+        '30-systemd-binfmt.hook'
+        '30-systemd-catalog.hook'
+        '30-systemd-daemon-reload.hook'
+        '30-systemd-hwdb.hook'
+        '30-systemd-sysctl.hook'
+        '30-systemd-tmpfiles.hook'
+        '30-systemd-udev-reload.hook'
+        '30-systemd-update.hook')
 sha512sums=('SKIP'
             'SKIP'
+            'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            '86d7cacd7536b1069c82bbbb08de7ec81e7f0f18a19fc2b06fabe90db4700623eb3540b75121080d325672d92e26912632ae4f93fd3c0bb48eb3e5eedd88352c'
+            'f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
             '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            '2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda'
-            '7d49a948f5d58f662a7d81544254528257ef8c0a08ca560834f09a7cdf566161d2df4d419ebbc2983196cd45c9eeefcd0c4c2c554376916dce42e895262afc30'
-            'e521d92674597f82d589b83c378c50c92c881fdb84c436c8b26f7a3436a4c91a20585824a5563933f6868a3023b9ee2fdc7bd58e04bb47c25a0a36e296308fd3'
-            '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618')
+            '869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323'
+            '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
+            '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
+            '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'
+            '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254'
+            'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154'
+            '9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de'
+            'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'
+            'a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3'
+            '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97')
 
 _backports=(
 )
@@ -54,215 +65,205 @@ _backports=(
 _reverts=(
 )
 
-_validate_tag() {
-  local success fingerprint trusted status tag=v${pkgver%.*}
-
-  parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
-
-  if (( ! success )); then
-    error 'failed to validate tag %s\n' "$tag"
-    return 1
-  fi
-
-  if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
-    error 'unknown or untrusted public key: %s\n' "$fingerprint"
-    return 1
-  fi
-
-  case $status in
-    'expired')
-      warning 'the signature has expired'
-      ;;
-    'expiredkey')
-      warning 'the key has expired'
-      ;;
-  esac
-
-  return 0
-}
-
-pkgver() {
-  local version count
-
-  cd "$pkgbase-stable"
-
-  version="$(git describe --abbrev=0 --tags)"
-  count="$(git rev-list --count ${version}..)"
-  printf '%s.%s' "${version#v}" "${count}"
-}
-
 prepare() {
   cd "$pkgbase-stable"
 
-  git remote add upstream ../systemd/
-  git fetch --all
-
-  git checkout "${_commit}"
+  # add upstream repository for cherry-picking
+  git remote add -f upstream ../systemd
 
-  _validate_tag || return
-
-  local _commit
-  for _commit in "${_backports[@]}"; do
-    git cherry-pick -n "$_commit"
+  local _c
+  for _c in "${_backports[@]}"; do
+    git log --oneline -1 "${_c}"
+    git cherry-pick -n "${_c}"
   done
-  for _commit in "${_reverts[@]}"; do
-    git revert -n "$_commit"
+  for _c in "${_reverts[@]}"; do
+    git log --oneline -1 "${_c}"
+    git revert -n "${_c}"
   done
+
+  # Replace cdrom/dialout/tape groups with optical/uucp/storage
+  patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
 }
 
 build() {
-  local timeservers=({0..3}.arch.pool.ntp.org)
+  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=(
+    -Dversion-tag="${pkgver}-${pkgrel}-arch"
 
-  local meson_options=(
-    -Daudit=false
-    -Dgnuefi=true
+    -Dgnu-efi=true
     -Dima=false
+    -Dlibidn2=true
     -Dlz4=true
+    -Dman=true
 
+    # 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
-    # TODO(dreisner): consider changing this to unified
     -Ddefault-hierarchy=hybrid
     -Ddefault-kill-user-processes=false
+    -Ddefault-locale=C
+    -Ddns-over-tls=openssl
     -Dfallback-hostname='archlinux'
-    -Dntp-servers="${timeservers[*]}"
+    -Dnologin-path=/usr/bin/nologin
+    -Dntp-servers="${_timeservers[*]}"
+    -Ddns-servers="${_nameservers[*]}"
     -Drpmmacrosdir=no
     -Dsysvinit-path=
     -Dsysvrcnd-path=
   )
 
-  arch-meson "$pkgbase-stable" build "${meson_options[@]}"
+  arch-meson "$pkgbase-stable" build "${_meson_options[@]}"
 
   ninja -C build
 }
 
+check() {
+  meson test -C build
+}
+
 package_systemd() {
-  pkgdesc="system and service manager"
+  pkgdesc='system and service manager'
   license=('GPL2' 'LGPL2.1')
-  groups=('base-devel')
-  depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
-           'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
-           'util-linux' 'xz' 'pcre2')
+  depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'
+           'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwids' 'libcap' 'libcap.so'
+           'libgcrypt' 'libxcrypt' 'libcrypt.so' 'systemd-libs' 'libidn2' 'libidn2.so' 'lz4' 'pam'
+           'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so'
+           'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so' 'libp11-kit'
+           'libp11-kit.so' 'openssl')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
   replaces=('nss-myhostname' 'systemd-tools' 'udev')
   conflicts=('nss-myhostname' 'systemd-tools' 'udev')
   optdepends=('libmicrohttpd: remote journald capabilities'
               'quota-tools: kernel-level quota management'
               'systemd-sysvcompat: symlink package to provide sysvinit binaries'
-              'polkit: allow administration as unprivileged user')
+              'polkit: allow administration as unprivileged user'
+              'curl: machinectl pull-tar and pull-raw')
   backup=(etc/pam.d/systemd-user
           etc/systemd/coredump.conf
           etc/systemd/journald.conf
           etc/systemd/journal-remote.conf
           etc/systemd/journal-upload.conf
           etc/systemd/logind.conf
+          etc/systemd/networkd.conf
+          etc/systemd/resolved.conf
+          etc/systemd/sleep.conf
           etc/systemd/system.conf
           etc/systemd/timesyncd.conf
-          etc/systemd/resolved.conf
           etc/systemd/user.conf
           etc/udev/udev.conf)
-  install="systemd.install"
+  install=systemd.install
 
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 
-  # don't write units to /etc by default. some of these will be re-enabled on
-  # post_install.
-  rm -r "$pkgdir/etc/systemd/system/"*.wants
-  rm -r "$pkgdir/etc/systemd/system/"*.service
+  # we'll create this on installation
+  #rmdir "$pkgdir"/var/log/journal/remote
 
-  # add back tmpfiles.d/legacy.conf
-  install -m644 "$pkgbase-stable/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+  # runtime libraries shipped with systemd-libs
+  install -d -m0755 systemd-libs
+  mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs
 
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
-          s#GROUP="tape"#GROUP="storage"#g;
-          s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
-  sed -i 's/dialout/uucp/g;
-          s/tape/storage/g;
-          s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf
+  # manpages shipped with systemd-sysvcompat
+  rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8
 
-  # add mkinitcpio hooks
-  install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd"
-  install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
-  install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
+  # executable (symlinks) shipped with systemd-sysvcompat
+  rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,shutdown}
 
-  # ensure proper permissions for /var/log/journal
-  # The permissions are stored with named group by tar, so this works with
-  # users and groups populated by systemd-sysusers. This is only to prevent a
-  # warning from pacman as permissions are set by systemd-tmpfiles anyway.
-  chown root:systemd-journal "$pkgdir/var/log/journal"
-  chmod 2755 "$pkgdir/var/log/journal"
+  # files shipped with systemd-resolvconf
+  rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
 
-  # match directory owner/group and mode from extra/polkit
-  chown root:102 "$pkgdir"/usr/share/polkit-1/rules.d
-  chmod 0750     "$pkgdir"/usr/share/polkit-1/rules.d
+  # avoid a potential conflict with [core]/filesystem
+  rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf}
+  sed -i -e '/^C \/etc\/nsswitch\.conf/d' \
+    -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
 
-  # we'll create this on installation
-  # rmdir "$pkgdir/var/log/journal/remote"
+  # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat
+  install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d
 
   # ship default policy to leave services disabled
   echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
 
-  # manpages shipped with systemd-sysvcompat
-  rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8
-
-  # executable (symlinks) shipped with systemd-sysvcompat
-  rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
+  # 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
 
-  # runtime libraries shipped with libsystemd
-  rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
+  # 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
 
-  # allow core/filesystem to pristine nsswitch.conf
-  rm "$pkgdir/usr/share/factory/etc/nsswitch.conf"
-  sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir/usr/lib/tmpfiles.d/etc.conf"
+  # match directory owner/group and mode from [extra]/polkit
+  install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d
 
   # add example bootctl configuration
-  install -Dm644 "$srcdir/arch.conf" "$pkgdir"/usr/share/systemd/bootctl/arch.conf
-  install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf
-  install -Dm644 "$srcdir/splash-arch.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp
+  install -D -m0644 arch.conf "$pkgdir"/usr/share/systemd/bootctl/arch.conf
+  install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf
+  install -D -m0644 splash-arch.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp
 
-  install -Dm644 "$srcdir/systemd-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-hwdb.hook"
-  install -Dm644 "$srcdir/systemd-sysusers.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook"
-  install -Dm644 "$srcdir/systemd-tmpfiles.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook"
-  install -Dm644 "$srcdir/systemd-update.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-update.hook"
+  # pacman hooks
+  install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook
+  install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook
 
   # overwrite the systemd-user PAM configuration with our own
-  install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user"
+  install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user
 }
 
-package_libsystemd() {
-  pkgdesc="systemd client libraries"
-  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
-  license=('GPL2')
-  provides=('libsystemd.so' 'libudev.so')
+package_systemd-libs() {
+  pkgdesc='systemd client libraries'
+  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz' 'zstd')
+  license=('LGPL2.1')
+  provides=('libsystemd' 'libsystemd.so' 'libudev.so')
+  conflicts=('libsystemd')
+  replaces=('libsystemd')
 
-  # meson does not support installing subsets of files, no?
-  # So do a full install to temporary directory, then install what we need.
-  DESTDIR="$srcdir"/full-install ninja -C build install
+  install -d -m0755 "$pkgdir"/usr
+  mv systemd-libs "$pkgdir"/usr/lib
+}
 
-  install -dm755 "$pkgdir"/usr/lib/
-  cp --archive "$srcdir"/full-install/usr/lib/lib{nss_*,systemd,udev}.so* "$pkgdir"/usr/lib/
+package_systemd-resolvconf() {
+  pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)'
+  license=('LGPL2.1')
+  depends=('systemd')
+  provides=('openresolv' 'resolvconf')
+  conflicts=('openresolv')
+
+  install -d -m0755 "$pkgdir"/usr/bin
+  ln -s resolvectl "$pkgdir"/usr/bin/resolvconf
+
+  install -d -m0755 "$pkgdir"/usr/share/man/man1
+  ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz
 }
 
 package_systemd-sysvcompat() {
-  pkgdesc="sysvinit compat for systemd"
+  pkgdesc='sysvinit compat for systemd'
   license=('GPL2')
-  groups=('base')
   conflicts=('sysvinit')
   depends=('systemd')
 
-  install -dm755 "$pkgdir"/usr/share/man/man8
-  cp -d --no-preserve=ownership,timestamp \
-    build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-    "$pkgdir"/usr/share/man/man8
-
-  install -dm755 "$pkgdir/usr/bin"
-  # for tool in runlevel reboot shutdown poweroff halt telinit; do
-  for tool in runlevel telinit; do
-    ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
-  done
+  install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \
+    build/man/{halt,poweroff,reboot,shutdown}.8
 
-  ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
+  install -d -m0755 "$pkgdir"/usr/bin
+  ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init
+#  for tool in halt poweroff reboot shutdown; do
+#    ln -s systemctl "$pkgdir"/usr/bin/$tool
+#  done
 }
 
-# vim: ft=sh syn=sh et
+# vim:ft=sh syn=sh et sw=2:
diff --git a/abs/core/systemd/__changelog b/abs/core/systemd/__changelog
index 591fa91..b70327a 100644
--- a/abs/core/systemd/__changelog
+++ b/abs/core/systemd/__changelog
@@ -1,3 +1,5 @@
 PKGBUILD: comment out rmdir "$pkgdir/var/log/journal/remote"
-PKGBUILD: Change for tool in runlevel reboot shutdown poweroff halt telinit; do
-              to for tool in runlevel telinit; do
+PKGBUILD: comment out:
+   for tool in halt poweroff reboot shutdown; do
+     ln -s systemctl "$pkgdir"/usr/bin/$tool
+   done
diff --git a/abs/core/systemd/initcpio-install-systemd b/abs/core/systemd/initcpio-install-systemd
index 40a352c..9e23070 100644
--- a/abs/core/systemd/initcpio-install-systemd
+++ b/abs/core/systemd/initcpio-install-systemd
@@ -69,10 +69,13 @@ add_systemd_unit() {
                 map add_systemd_unit "${values[@]}"
                 ;;
             Exec*)
-                # don't add binaries unless they are required
-                if [[ ${values[0]:0:1} != '-' ]]; then
-                    add_binary "${values[0]}"
-                fi
+                # 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
 
@@ -110,8 +113,10 @@ build() {
     add_binary /usr/bin/sulogin
 
     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 \
@@ -167,15 +172,9 @@ build() {
         'group: files' \
         'shadow: files'
 
-    echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
-    echo "root:x:0:root" >"$BUILDROOT/etc/group"
-    echo "root::::::::" >"$BUILDROOT/etc/shadow"
-
-    add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
-[Service]
-ExecStart=
-ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
-EOF
+    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 storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"
 
     add_dir "/etc/modules-load.d"
     (
diff --git a/abs/core/systemd/systemd-hook b/abs/core/systemd/systemd-hook
new file mode 100644
index 0000000..6f2e899
--- /dev/null
+++ b/abs/core/systemd/systemd-hook
@@ -0,0 +1,37 @@
+#!/bin/sh -e
+
+systemd_live() {
+  if [ ! -d /run/systemd/system ]; then
+    echo >&2 "  Skipped: Current root is not booted."
+    exit 0
+  fi
+}
+
+udevd_live() {
+  if [ ! -d /run/udev ]; then
+    echo >&2 "  Skipped: Device manager is not running."
+    exit 0
+  fi
+}
+
+op="$1"; shift
+
+case "$op" in
+  catalog)  /usr/bin/journalctl --update-catalog ;;
+  hwdb)     /usr/bin/systemd-hwdb --usr update ;;
+  update)   touch -c /usr ;;
+  sysusers) /usr/bin/systemd-sysusers ;;
+  tmpfiles) /usr/bin/systemd-tmpfiles --create ;;
+
+  daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;
+  udev-reload)   udevd_live;   /usr/bin/udevadm control --reload ;;
+  binfmt)        systemd_live; /usr/lib/systemd/systemd-binfmt ;;
+  sysctl)        systemd_live; /usr/lib/systemd/systemd-sysctl ;;
+
+  # For use by other packages
+  reload)        systemd_live; /usr/bin/systemctl try-reload-or-restart "$@" ;;
+
+  *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
+esac
+
+exit 0
diff --git a/abs/core/systemd/systemd-sysusers.hook b/abs/core/systemd/systemd-sysusers.hook
deleted file mode 100644
index 6b8affa..0000000
--- a/abs/core/systemd/systemd-sysusers.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/sysusers.d/*.conf
-
-[Action]
-Description = Updating system user accounts...
-When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "$(basename "$f")" ; done'
-NeedsTargets
diff --git a/abs/core/systemd/systemd.install b/abs/core/systemd/systemd.install
index fedc747..4171101 100644
--- a/abs/core/systemd/systemd.install
+++ b/abs/core/systemd/systemd.install
@@ -53,6 +53,15 @@ _233_75_3_changes() {
   fi
 }
 
+_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
+  fi
+}
+
 post_install() {
   systemd-machine-id-setup
 
@@ -87,6 +96,7 @@ post_upgrade() {
     230-1
     232-8
     233.75-3
+    242.0-2
   )
 
   for v in "${upgrades[@]}"; do