Fix version string generation & sync with core/systemd

1 files changed, 96 insertions, 66 deletions

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: