239.860

2 files changed, 29 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f86d9dacbddb..927519294adf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-git
 	pkgdesc = systemd (git version)
-	pkgver = 239.857
+	pkgver = 239.860
 	pkgrel = 1
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = systemd-git
 	makedepends = iptables
 	makedepends = kmod
 	makedepends = libcap
-	makedepends = libidn
+	makedepends = libidn2
 	makedepends = libgcrypt
 	makedepends = libmicrohttpd
 	makedepends = libxslt
@@ -30,6 +30,10 @@ pkgbase = systemd-git
 	makedepends = meson
 	makedepends = libseccomp
 	makedepends = pcre2
+	makedepends = audit
+	makedepends = kexec-tools
+	makedepends = libxkbcommon
+	makedepends = bash-completion
 	options = strip
 	options = !distcc
 	options = !ccache
@@ -89,7 +93,7 @@ pkgname = systemd-git
 	depends = libcap
 	depends = libgcrypt
 	depends = libsystemd
-	depends = libidn
+	depends = libidn2
 	depends = lz4
 	depends = pam
 	depends = libelf
@@ -97,22 +101,24 @@ pkgname = systemd-git
 	depends = util-linux
 	depends = xz
 	depends = pcre2
+	depends = audit
 	optdepends = libmicrohttpd: remote journald capabilities
 	optdepends = quota-tools: kernel-level quota management
 	optdepends = systemd-sysvcompat-git: symlink package to provide sysvinit binaries
 	optdepends = polkit: allow administration as unprivileged user
+	optdepends = curl: machinectl pull-tar and pull-raw
+	provides = systemd=239.860
 	provides = nss-myhostname
-	provides = systemd-tools=239.857
-	provides = udev=239.857
-	provides = systemd=239.857
+	provides = systemd-tools=239.860
+	provides = udev=239.860
+	conflicts = systemd
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
-	conflicts = systemd
+	replaces = systemd
 	replaces = nss-myhostname
 	replaces = systemd-tools
 	replaces = udev
-	replaces = systemd
 	backup = etc/pam.d/systemd-user
 	backup = etc/systemd/coredump.conf
 	backup = etc/systemd/journald.conf
diff --git a/PKGBUILD b/PKGBUILD
index 20179d99a4ca..b648d842af82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,16 @@ pkgbase=systemd-git
 _pkgbase=systemd
 pkgname=('systemd-git' 'libsystemd-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git')
 pkgdesc="systemd (git version)"
-pkgver=239.857
+pkgver=239.860
 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'
+             'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
              'libmicrohttpd' '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')
 options=('strip' '!distcc' '!ccache')
 source=('git+https://github.com/systemd/systemd'
         '0001-Use-Arch-Linux-device-access-groups.patch'
@@ -89,9 +90,9 @@ build() {
   )
 
   local _meson_options=(
-    -Daudit=false
-    -Dgnuefi=true
+    -Dgnu-efi=true
     -Dima=false
+    -Dlibidn2=true
     -Dlz4=true
 
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
@@ -121,15 +122,16 @@ package_systemd-git() {
   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')
-  provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver")
-  replaces=('nss-myhostname' 'systemd-tools' 'udev' 'systemd')
-  conflicts=('nss-myhostname' 'systemd-tools' 'udev' 'systemd')
+           'libgcrypt' 'libsystemd' 'libidn2' 'lz4' 'pam' 'libelf' 'libseccomp'
+           'util-linux' 'xz' 'pcre2' 'audit')
+  provides=( "systemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
+  replaces=('systemd' 'nss-myhostname' 'systemd-tools' 'udev')
+  conflicts=('systemd' 'nss-myhostname' 'systemd-tools' 'udev')
   optdepends=('libmicrohttpd: remote journald capabilities'
               'quota-tools: kernel-level quota management'
               'systemd-sysvcompat-git: 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
@@ -143,7 +145,7 @@ package_systemd-git() {
           etc/udev/udev.conf)
   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.