core/systemd to 255-1

This commit is contained in:
Kevin Mihelich 2023-12-07 19:09:41 +00:00
parent 236b11a5c2
commit dd3b2ec299
7 changed files with 76 additions and 41 deletions

View file

@ -1,6 +1,6 @@
pkgbase = systemd
pkgver = 254.6
pkgrel = 2
pkgver = 255
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
checkdepends = python-pefile
@ -47,10 +47,12 @@ pkgbase = systemd
makedepends = curl
makedepends = gnutls
makedepends = python-pyelftools
makedepends = libpwquality
makedepends = qrencode
makedepends = lib32-gcc-libs
options = strip
source = git+https://github.com/systemd/systemd-stable#tag=5afac6471beec5401efb51f88990eaf92f3f9507?signed
source = git+https://github.com/systemd/systemd#tag=v254?signed
source = git+https://github.com/systemd/systemd-stable#tag=0966fe6734417ce07d5eb82a245fdec3789714da?signed
source = git+https://github.com/systemd/systemd#tag=v255?signed
source = 0001-Use-Arch-Linux-device-access-groups.patch
source = initcpio-hook-udev
source = initcpio-install-systemd
@ -63,7 +65,8 @@ pkgbase = systemd
source = 20-systemd-sysusers.hook
source = 30-systemd-binfmt.hook
source = 30-systemd-catalog.hook
source = 30-systemd-daemon-reload.hook
source = 30-systemd-daemon-reload-system.hook
source = 30-systemd-daemon-reload-user.hook
source = 30-systemd-hwdb.hook
source = 30-systemd-sysctl.hook
source = 30-systemd-tmpfiles.hook
@ -77,17 +80,18 @@ pkgbase = systemd
sha512sums = SKIP
sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e
sha512sums = 4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e
sha512sums = 94a3bf4720d428c2ec4e6c493f78debeb3d3b865ba2bef266f388bffccda8592af81a1fa2cd98f3d60720935e796572fa07256ffafb8d73342214f0ca8ba7acc
sha512sums = 442e79012d654e72cde03c8b4b90c7b6e9c9e7803551fdeae79bda945f7aff92f1046f5edc64f75d23614f66b3ef044cc47c862379b3e0695ecff412fec90401
sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6
sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19
sha512sums = 5c4119bf1d84b22986dc8d0c4c2de26500b824c21dfac69f22e36809e2673f0652447cc8c9f77190ad098896f4a5e1d03fa33676fe962de631bbfa44513a8860
sha512sums = 3cb8f88c1bffc753d0c540be5d25a0fdb9224478cca64743b5663340f2f26b197775286e6e680228db54c614dcd11da1135e625674a622127681662bec4fa886
sha512sums = 299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5
sha512sums = 0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7
sha512sums = 2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc
sha512sums = 63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254
sha512sums = a436d3f5126c6c0d6b58c6865e7bd38dbfbfb7babe017eeecb5e9d162c21902cbf4e0a68cf3ac2f99815106f9fa003b075bd2b4eb5d16333fa913df6e2f3e32a
sha512sums = 190112e38d5a5c0ca91b89cd58f95595262a551530a16546e1d84700fc9644aa2ca677953ffff655261e8a7bff6e6af4e431424df5f13c00bc90b77c421bc32d
sha512sums = a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154
sha512sums = 9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de
sha512sums = da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc
@ -105,7 +109,6 @@ pkgname = systemd
depends = cryptsetup
depends = libcryptsetup.so
depends = dbus
depends = iptables
depends = kbd
depends = kmod
depends = libkmod.so
@ -137,16 +140,18 @@ pkgname = systemd
optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries
optdepends = systemd-ukify: combine kernel and initrd into a signed Unified Kernel Image
optdepends = polkit: allow administration as unprivileged user
optdepends = python: Unified Kernel Image with ukify
optdepends = curl: systemd-journal-upload, machinectl pull-tar and pull-raw
optdepends = gnutls: systemd-journal-gatewayd and systemd-journal-remote
optdepends = qrencode: show QR codes
optdepends = iptables: firewall features
optdepends = libbpf: support BPF programs
optdepends = libpwquality: check password quality
optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token
optdepends = libp11-kit: support PKCS#11
optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
provides = nss-myhostname
provides = systemd-tools=254.6
provides = udev=254.6
provides = systemd-tools=255
provides = udev=255
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev

View file

@ -8,4 +8,4 @@ Target = usr/lib/systemd/system/*
[Action]
Description = Reloading system manager configuration...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload
Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload-system

View file

@ -0,0 +1,11 @@
[Trigger]
Type = Path
Operation = Install
Operation = Upgrade
Operation = Remove
Target = usr/lib/systemd/user/*
[Action]
Description = Reloading user manager configuration...
When = PostTransaction
Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload-user

View file

@ -13,10 +13,10 @@ pkgname=('systemd'
'systemd-resolvconf'
'systemd-sysvcompat'
'systemd-ukify')
_tag='5afac6471beec5401efb51f88990eaf92f3f9507' # git rev-parse v${_tag_name}
_tag_name=254.6
_tag='0966fe6734417ce07d5eb82a245fdec3789714da' # git rev-parse v${_tag_name}
_tag_name=255
pkgver="${_tag_name/-/}"
pkgrel=2
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@ -25,7 +25,8 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
'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')
'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools'
'libpwquality' 'qrencode')
checkdepends=('python-pefile')
options=('strip' '!distcc')
validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>
@ -50,7 +51,8 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
'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'
@ -60,17 +62,18 @@ sha512sums=('SKIP'
'SKIP'
'3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
'4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e'
'94a3bf4720d428c2ec4e6c493f78debeb3d3b865ba2bef266f388bffccda8592af81a1fa2cd98f3d60720935e796572fa07256ffafb8d73342214f0ca8ba7acc'
'442e79012d654e72cde03c8b4b90c7b6e9c9e7803551fdeae79bda945f7aff92f1046f5edc64f75d23614f66b3ef044cc47c862379b3e0695ecff412fec90401'
'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
'5c4119bf1d84b22986dc8d0c4c2de26500b824c21dfac69f22e36809e2673f0652447cc8c9f77190ad098896f4a5e1d03fa33676fe962de631bbfa44513a8860'
'3cb8f88c1bffc753d0c540be5d25a0fdb9224478cca64743b5663340f2f26b197775286e6e680228db54c614dcd11da1135e625674a622127681662bec4fa886'
'299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
'0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
'2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'
'63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254'
'a436d3f5126c6c0d6b58c6865e7bd38dbfbfb7babe017eeecb5e9d162c21902cbf4e0a68cf3ac2f99815106f9fa003b075bd2b4eb5d16333fa913df6e2f3e32a'
'190112e38d5a5c0ca91b89cd58f95595262a551530a16546e1d84700fc9644aa2ca677953ffff655261e8a7bff6e6af4e431424df5f13c00bc90b77c421bc32d'
'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154'
'9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de'
'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'
@ -131,13 +134,16 @@ build() {
-Dshared-lib-tag="${pkgver}-${pkgrel}"
-Dmode=release
-Dapparmor=false
-Dbootloader=true
-Dxenctrl=false
-Dbpf-framework=true
-Dima=false
-Dlibidn2=true
-Dlz4=true
-Dman=true
-Dnscd=false
-Dselinux=false
# We disable DNSSEC by default, it still causes trouble:
# https://github.com/systemd/systemd/issues/10579
@ -181,7 +187,7 @@ package_systemd() {
pkgdesc='system and service manager'
license=('GPL2' 'LGPL2.1')
depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'
'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwdata' 'libcap' 'libcap.so'
'kbd' 'kmod' 'libkmod.so' 'hwdata' 'libcap' 'libcap.so'
'libgcrypt' 'libxcrypt' 'libcrypt.so' 'systemd-libs' 'libidn2' 'lz4' 'pam'
'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so'
'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so'
@ -194,10 +200,12 @@ package_systemd() {
'systemd-sysvcompat: symlink package to provide sysvinit binaries'
'systemd-ukify: 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'
'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')
@ -235,7 +243,8 @@ package_systemd() {
# ukify shipped in separate package
# we do *NOT* move the kernel-install files there, as other ways of
# creating uki exist!
install -d -m0755 systemd-ukify/{systemd,man1}
install -d -m0755 systemd-ukify/{bin,systemd,man1}
mv "$pkgdir"/usr/bin/ukify systemd-ukify/bin/
if [[ $CARCH != "armv7h" ]]; then
mv "$pkgdir"/usr/lib/systemd/ukify systemd-ukify/systemd/
mv "$pkgdir"/usr/share/man/man1/ukify.1 systemd-ukify/man1/
@ -336,7 +345,8 @@ package_systemd-ukify() {
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
}

View file

@ -70,6 +70,7 @@ build() {
map add_binary \
/usr/bin/journalctl \
/usr/bin/systemd-tmpfiles \
/usr/lib/systemd/systemd-executor \
/usr/lib/systemd/systemd-hibernate-resume \
/usr/lib/systemd/systemd-shutdown \
/usr/lib/systemd/systemd-sulogin-shell \
@ -105,7 +106,9 @@ build() {
sockets.target \
swap.target \
systemd-battery-check.service \
systemd-bsod.service \
systemd-fsck@.service \
systemd-hibernate-resume.service \
systemd-journald-audit.socket \
systemd-journald-dev-log.socket \
systemd-journald.service \
@ -121,8 +124,10 @@ build() {
rescue.target \
emergency.target
# add libraries dlopen()ed by tpm2-util
for LIB in tss2-{esys,rc,mu,tcti-'*'}; do
# add libraries dlopen()ed (hard and optional dependencies):
# tss2-* -> tpm2-util
# qrencode -> bsod
for LIB in tss2-{esys,rc,mu,tcti-'*'} qrencode; do
for FILE in $(find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*"); do
if [[ -L "${FILE}" ]]; then
add_symlink "${FILE}"

View file

@ -26,14 +26,27 @@ udevd_live() {
op="$1"; shift
case "$op" in
binfmt)
systemd_live
/usr/lib/systemd/systemd-binfmt
;;
catalog)
/usr/bin/journalctl --update-catalog
;;
daemon-reload-system)
systemd_live
/usr/bin/systemctl --system daemon-reload
;;
daemon-reload-user)
systemd_live
/usr/bin/systemctl kill --kill-whom='main' --signal='SIGHUP' 'user@*.service'
;;
hwdb)
/usr/bin/systemd-hwdb --usr update
;;
update)
touch -c /usr
sysctl)
systemd_live
/usr/lib/systemd/systemd-sysctl
;;
sysusers)
/usr/bin/systemd-sysusers
@ -41,10 +54,8 @@ case "$op" in
tmpfiles)
/usr/bin/systemd-tmpfiles --create
;;
daemon-reload)
systemd_live
/usr/bin/systemctl daemon-reload
update)
touch -c /usr
;;
udev-reload)
udevd_live
@ -54,14 +65,6 @@ case "$op" in
/usr/bin/udevadm settle
fi
;;
binfmt)
systemd_live
/usr/lib/systemd/systemd-binfmt
;;
sysctl)
systemd_live
/usr/lib/systemd/systemd-sysctl
;;
# For use by other packages
reload)

View file

@ -49,6 +49,7 @@ post_upgrade() {
if sd_booted; then
systemctl --system daemon-reexec
systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
fi
local v upgrades=(