UGH

Signed-off-by: fbt <fbt@fleshless.org>

.gitea/workflows/build-package.yaml

@@ -1,9 +1,9 @@
-name: Gitea Actions Demo
+name: Package builder
-run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+run-name: ${{ gitea.actor }} is building ${{ gitea.repo }}
 on: [push]
 
 jobs:
-  Explore-Gitea-Actions:
+  BuildPackage:
     runs-on: autobuilder
     container:
       volumes:
@@ -30,4 +30,3 @@ jobs:
 #          path: ./*.pkg.tar.zst
       - name: Put the packages into the import dir
         run: cp -v ./*.pkg.tar.zst /import
-      - run: echo "This job's status is ${{ job.status }}."

PKGBUILD

@@ -3,8 +3,8 @@
 
 pkgbase=systemd-libs
 pkgname=('systemd-libs-systemd' 'systemd-libs-udev')
-_tag='472b4e59c3c095248b316ccceac5565fcaae9d3a' # git rev-parse v${pkgver}
+_tag='42f5ba1e56ddb81c244e0d85f13109acdb14cbee' # git rev-parse v${_tag_name}
-_tag_name=252.1
+_tag_name=254.5
 pkgver="${_tag_name/-/}"
 pkgrel=1
 arch=('x86_64')
@@ -12,9 +12,11 @@ url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
              'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'
-             'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
+             'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'git'
              'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
-             'bash-completion' 'p11-kit' 'python-jinja')
+             'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync'
+             'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools'
+             'lib32-gcc-libs')
 options=('strip')
 #validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>
 #              '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
@@ -23,15 +25,6 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}"
         '0001-Use-Arch-Linux-device-access-groups.patch')
 
 _backports=(
-  # boot: Fix error message
-  '6ee4aa22140dd8d51b1a18882eb4220629b8dd8f'
-  # boot: Several fixes
-  'b7b327f856b3782f28be561d612d66ff406c7789~1..967a868563996e928f1fade5bcafc82a7219742b'
-
-  # tpm2-util: force default TCTI to be "device" with parameter "/dev/tpmrm0"
-  '34906680afe60d724ea435b79b9b830a4bf2e7e9'
-  # tpm2: add some extra validation of device string before using it
-  '50a085143fa8f5dd6b6b3cef8a6ea2ec7c53ed0d'
 )
 
 _reverts=(
@@ -78,23 +71,29 @@ build() {
   )
 
   local _meson_options=(
-    -Dversion-tag="${pkgver}-${pkgrel}-arch"
+    # internal version comparison is incompatible with pacman:
+    #   249~rc1 < 249 < 249.1 < 249rc
+    -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-arch"
+    -Dshared-lib-tag="${pkgver}-${pkgrel}"
     -Dmode=release
 
-    -Dgnu-efi=true
+    -Dbootloader=true
+    -Dbpf-framework=true
     -Dima=false
     -Dlibidn2=true
     -Dlz4=true
     -Dman=true
+    -Dnscd=false
 
     # 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=hybrid
+    -Ddefault-hierarchy=unified
     -Ddefault-kill-user-processes=false
-    -Ddefault-locale=C
+    -Ddefault-locale='C.UTF-8'
+    -Dlocalegen-path=/usr/bin/locale-gen
     -Ddns-over-tls=openssl
     -Dfallback-hostname='archlinux'
     -Dnologin-path=/usr/bin/nologin
@@ -103,11 +102,21 @@ build() {
     -Drpmmacrosdir=no
     -Dsysvinit-path=
     -Dsysvrcnd-path=
+
+    -Dsbat-distro='arch'
+    -Dsbat-distro-summary='Arch Linux'
+    -Dsbat-distro-pkgname="systemd"
+    -Dsbat-distro-version="${pkgver}"
+    -Dsbat-distro-url="https://archlinux.org/packages/core/x86_64/systemd/"
   )
 
+  # this uses malloc_usable_size, which is incompatible with fortification level 3
+  export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
+  export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
+
   arch-meson "systemd-stable" build "${_meson_options[@]}"
 
-  ninja -C build
+  meson compile -C build
 }
 
 #check() { meson test -C build; }