sync with testing/systemd

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

2 files changed, 23 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3dcf01a06c83..efb407b54084 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-git
 	pkgdesc = systemd (git version)
-	pkgver = 252.r60865.9df82722f6
+	pkgver = 252.r61711.71eaa9291d
 	pkgrel = 1
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
@@ -41,6 +41,10 @@ pkgbase = systemd-git
 	makedepends = libfido2
 	makedepends = tpm2-tss
 	makedepends = rsync
+	makedepends = bpf
+	makedepends = libbpf
+	makedepends = clang
+	makedepends = llvm
 	source = git+https://github.com/systemd/systemd
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
 	source = initcpio-hook-udev
@@ -81,7 +85,7 @@ pkgbase = systemd-git
 	sha512sums = 825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97
 
 pkgname = systemd-git
-	pkgdesc = + (git version)
+	pkgdesc = system and service manager (git version)
 	install = systemd.install
 	license = GPL2
 	license = LGPL2.1
@@ -125,12 +129,13 @@ pkgname = systemd-git
 	optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries
 	optdepends = polkit: allow administration as unprivileged user
 	optdepends = curl: machinectl pull-tar and pull-raw
+	optdepends = libbpf: support BPF programs
 	optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token
 	optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
 	provides = nss-myhostname
-	provides = systemd-tools=252.r60865.9df82722f6
-	provides = udev=252.r60865.9df82722f6
-	provides = systemd=252.r60865.9df82722f6
+	provides = systemd-tools=252.r61711.71eaa9291d
+	provides = udev=252.r61711.71eaa9291d
+	provides = systemd=252.r61711.71eaa9291d
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -168,7 +173,7 @@ pkgname = systemd-libs-git
 	provides = libsystemd
 	provides = libsystemd.so
 	provides = libudev.so
-	provides = systemd-libs=252.r60865.9df82722f6
+	provides = systemd-libs=252.r61711.71eaa9291d
 	conflicts = libsystemd
 	conflicts = systemd-libs
 	replaces = libsystemd
@@ -179,7 +184,7 @@ pkgname = systemd-resolvconf-git
 	depends = systemd-git
 	provides = openresolv
 	provides = resolvconf
-	provides = systemd-resolvconf=252.r60865.9df82722f6
+	provides = systemd-resolvconf=252.r61711.71eaa9291d
 	conflicts = openresolv
 	conflicts = systemd-resolvconf
 
@@ -187,6 +192,6 @@ pkgname = systemd-sysvcompat-git
 	pkgdesc = sysvinit compat for systemd (git version)
 	license = GPL2
 	depends = systemd-git
-	provides = systemd-sysvcompat=252.r60865.9df82722f6
+	provides = systemd-sysvcompat=252.r61711.71eaa9291d
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index cacc04320cc6..de3cb7bd1d7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Yurii Kolesnykov <root@yurikoles.com>
-# Based on core/systemd by Christian Hesse <mail@eworm.de>
+# Based on testing/systemd by Christian Hesse <mail@eworm.de>
 
 _pkgbase=systemd
-pkgbase=$_pkgbase-git
+pkgbase=${_pkgbase}-git
 pkgname=('systemd-git' 'systemd-libs-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git')
 pkgdesc='systemd (git version)'
-pkgver=252.r60865.9df82722f6
+pkgver=252.r61711.71eaa9291d
 pkgrel=1
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
@@ -14,7 +14,8 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
              'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
-             'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync')
+             'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync'
+             'bpf' 'libbpf' 'clang' 'llvm')
 source=('git+https://github.com/systemd/systemd'
         '0001-Use-Arch-Linux-device-access-groups.patch'
         'initcpio-hook-udev'
@@ -89,6 +90,7 @@ build() {
     -Dshared-lib-tag="${pkgver}-${pkgrel}"
     -Dmode=release
 
+    -Dbpf-framework=true
     -Dgnu-efi=true
     -Dima=false
     -Dlibidn2=true
@@ -114,10 +116,10 @@ build() {
     -Dsysvrcnd-path=
 
     -Dsbat-distro='arch'
-    -Dsbat-distro-summary='Arch Linux'
+    -Dsbat-distro-summary='Arch Linux AUR'
     -Dsbat-distro-pkgname="${pkgname}"
     -Dsbat-distro-version="${pkgver}"
-    -Dsbat-distro-url="https://archlinux.org/packages/core/x86_64/${pkgname}/"
+    -Dsbat-distro-url="https://aur.archlinux.org/pkgbase/${pkgname}"
   )
 
   arch-meson "$_pkgbase" build "${_meson_options[@]}"
@@ -131,7 +133,7 @@ check() {
 
 package_systemd-git() {
   pkgdesc='system and service manager'
-  pkgdesc=+' (git version)'
+  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'
@@ -149,6 +151,7 @@ package_systemd-git() {
               'systemd-sysvcompat: symlink package to provide sysvinit binaries'
               'polkit: allow administration as unprivileged user'
               'curl: machinectl pull-tar and pull-raw'
+              'libbpf: support BPF programs'
               'libfido2: unlocking LUKS2 volumes with FIDO2 token'
               'tpm2-tss: unlocking LUKS2 volumes with TPM2')
   backup=(etc/pam.d/systemd-user