diff --git a/systemd/.SRCINFO b/systemd/.SRCINFO index fcb8a0c41f..97b988d197 100644 --- a/systemd/.SRCINFO +++ b/systemd/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = systemd - pkgver = 256.2 + pkgver = 256.6 pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 @@ -15,6 +15,7 @@ pkgbase = systemd makedepends = intltool makedepends = iptables makedepends = kmod + makedepends = libarchive makedepends = libcap makedepends = libidn2 makedepends = libgcrypt @@ -52,7 +53,7 @@ pkgbase = systemd makedepends = lib32-gcc-libs makedepends = python-pefile conflicts = mkinitcpio<38-1 - source = git+https://github.com/systemd/systemd#tag=v256.2?signed + source = git+https://github.com/systemd/systemd#tag=v256.6?signed source = 0001-Use-Arch-Linux-device-access-groups.patch source = arch.conf source = loader.conf @@ -73,7 +74,7 @@ pkgbase = systemd validpgpkeys = A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E validpgpkeys = 9A774DB5DB996C154EBBFBFDA0099A18E29326E1 validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E - sha512sums = 7440e619af100458ccd54ab1aafdaa339f473c226b6f7d9ceca35716ad30e9ed112ae8e2230116b2104e88171d92309ad78780f4f02d5f9f59c0e7fce15606c9 + sha512sums = e9fc19946f329aa89c1014a735d4d7828cebaa32ece8244b79e101c41d1c0cb0207b4109ce55d14204b0915f6cac57ace6286c6abaebd809031949693131de16 sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648 sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 @@ -98,7 +99,7 @@ pkgname = systemd license = CC0-1.0 license = GPL-2.0-or-later license = MIT-0 - depends = systemd-libs=256.2 + depends = systemd-libs=256.6 depends = acl depends = libacl.so depends = bash @@ -139,14 +140,15 @@ pkgname = systemd optdepends = gnutls: systemd-journal-gatewayd and systemd-journal-remote optdepends = qrencode: show QR codes optdepends = iptables: firewall features + optdepends = libarchive: convert DDIs to tarballs 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=256.2 - provides = udev=256.2 + provides = systemd-tools=256.6 + provides = udev=256.6 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -191,19 +193,19 @@ pkgname = systemd-libs pkgname = systemd-resolvconf pkgdesc = systemd resolvconf replacement (for use with systemd-resolved) - depends = systemd=256.2 + depends = systemd=256.6 provides = openresolv provides = resolvconf conflicts = resolvconf pkgname = systemd-sysvcompat pkgdesc = sysvinit compat for systemd - depends = systemd=256.2 + depends = systemd=256.6 conflicts = sysvinit pkgname = systemd-ukify pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image - depends = systemd=256.2 + depends = systemd=256.6 depends = binutils depends = python-cryptography depends = python-pefile diff --git a/systemd/PKGBUILD b/systemd/PKGBUILD index dd58102d86..54d62a7ae3 100644 --- a/systemd/PKGBUILD +++ b/systemd/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('systemd' case "${CARCH}" in x86_64) pkgname+=('systemd-ukify') ;; esac -_tag='256.2' +_tag='256.6' # Upstream versioning is incompatible with pacman's version comparisons, one # way or another. So we replace dashes and tildes with the empty string to # make sure pacman's version comparing does the right thing for rc versions: @@ -19,7 +19,7 @@ arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) 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' @@ -52,7 +52,7 @@ source=("git+https://github.com/systemd/systemd#tag=v${_tag}?signed" '30-systemd-tmpfiles.hook' '30-systemd-udev-reload.hook' '30-systemd-update.hook') -sha512sums=('7440e619af100458ccd54ab1aafdaa339f473c226b6f7d9ceca35716ad30e9ed112ae8e2230116b2104e88171d92309ad78780f4f02d5f9f59c0e7fce15606c9' +sha512sums=('e9fc19946f329aa89c1014a735d4d7828cebaa32ece8244b79e101c41d1c0cb0207b4109ce55d14204b0915f6cac57ace6286c6abaebd809031949693131de16' '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e' '76e58855f9025feffb21108f8714f7d8fa7cb163919b54128fb614c74af503f3ac651df7d6fefcee1dbc7753a63fb9edd342ea23f2106a1221c013af0078b89b' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' @@ -81,8 +81,6 @@ if ((_systemd_UPSTREAM)); then _meson_vcs_tag='true' _meson_mode='developer' pkgname+=('systemd-tests') - makedepends+=('libarchive') - optdepends_upstream=('libarchive: convert DDIs to tarballs') if ((_systemd_QUIET)); then _meson_install=('--quiet') else @@ -173,10 +171,10 @@ build() { ) case "${CARCH}" in - x86_64) _meson_options+=(-Dbootloader=true) ;; - riscv64) _meson_options+=(-Dbootloader=true -Dukify=false -Dseccomp=false) ;; #FIXME: seccomp breaks systemd on riscv64 - powerpc) _meson_options+=(-Dbootloader=false -Dukify=false -Dseccomp=false) ;; #FIXME: seccomp breaks systemd on powerpc - *) _meson_options+=(-Dbootloader=false -Dukify=false) ;; + x86_64) _meson_options+=(-Dbootloader=enabled) ;; + riscv64) _meson_options+=(-Dbootloader=enabled -Dukify=false -Dseccomp=false) ;; #FIXME: seccomp breaks systemd on riscv64 + powerpc) _meson_options+=(-Dbootloader=disabled -Dukify=false -Dseccomp=false) ;; #FIXME: seccomp breaks systemd on powerpc + *) _meson_options+=(-Dbootloader=disabled -Dukify=false) ;; esac arch-meson "${pkgbase}" build "${_meson_options[@]}" $MESON_EXTRA_CONFIGURE_OPTIONS @@ -213,6 +211,7 @@ package_systemd() { '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' @@ -221,7 +220,6 @@ package_systemd() { optdepends_x86_64=( 'systemd-ukify: combine kernel and initrd into a signed Unified Kernel Image' ) - optdepends+=("${_optdepends_upstream[@]}") backup=(etc/pam.d/systemd-user etc/systemd/coredump.conf etc/systemd/homed.conf @@ -253,7 +251,6 @@ package_systemd() { mv "$pkgdir"/usr/include systemd-libs/include mv "$pkgdir"/usr/share/man/man3 systemd-libs/man3 - case "${CARCH}" in x86_64) # ukify shipped in separate package @@ -304,6 +301,13 @@ package_systemd() { # 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() { diff --git a/systemd/keys/pgp/63CDA1E5D3FC22B998D20DD6327F26951A015CC4.asc b/systemd/keys/pgp/63CDA1E5D3FC22B998D20DD6327F26951A015CC4.asc index 2c907f78c1..c889904eab 100644 --- a/systemd/keys/pgp/63CDA1E5D3FC22B998D20DD6327F26951A015CC4.asc +++ b/systemd/keys/pgp/63CDA1E5D3FC22B998D20DD6327F26951A015CC4.asc @@ -8,13 +8,13 @@ hvupalZDEL8CJVh+jKA9HcF584mQzV9BURxaWsU89sT7Jg7incdsOOSOJkCyaasO slt7vGKlUjHBqYCUCp336BVDOY5k2c6U52bsMvfywVAAFf4cDn3S9QHDyaYkur2R aqMrA/4giC+bF/K1sn4MHacr97QxEeeGNM6KG4z4QDmLeNdAANmJOLQaQFH+84Qj r8KyRV0zd0sioh3419AsZ/o41W4cIahovJKWyDcNwKI0tP2y3KZDVtmD26RQ/BO4 -aFEqv3Uii0Cop6j495XmSvteL7CZHLEog90hexe9ExI0xIIBs7QrTGVubmFydCBQ -b2V0dGVyaW5nIDxsZW5uYXJ0QHBvZXR0ZXJpbmcubmV0PohjBBMRAgAjAhsDBgsJ -CAcDAgQVAggDBBYCAwECHgECF4AFAkZkpWkCGQEACgkQMn8mlRoBXMTV9ACg3hY9 -4BfhZQjIJ8NSVrv3zOR/KWIAoO1UczsbaRBIg0sN+4b+Hon8qOz+tCpMZW5uYXJ0 -IFBvZXR0ZXJpbmcgPGxlbm5hcnRAcG9ldHRlcmluZy5kZT6IXgQTEQIAFgQLCgQD -AxUDAgMWAgECF4AFAkZkpWgAEgdlR1BHAAEBCRAyfyaVGgFcxKgAAJwI1MS3uN1m -9VV4BhlC7lxqJ0dm9QCcCvAPuYktZ10RQrZddY57I5j7Raa0L0xlbm5hcnQgUG9l +aFEqv3Uii0Cop6j495XmSvteL7CZHLEog90hexe9ExI0xIIBs7QqTGVubmFydCBQ +b2V0dGVyaW5nIDxsZW5uYXJ0QHBvZXR0ZXJpbmcuZGU+iF4EExECABYECwoEAwMV +AwIDFgIBAheABQJGZKVoABIHZUdQRwABAQkQMn8mlRoBXMSoAACcCNTEt7jdZvVV +eAYZQu5caidHZvUAnArwD7mJLWddEUK2XXWOeyOY+0WmtCtMZW5uYXJ0IFBvZXR0 +ZXJpbmcgPGxlbm5hcnRAcG9ldHRlcmluZy5uZXQ+iGMEExECACMCGwMGCwkIBwMC +BBUCCAMEFgIDAQIeAQIXgAUCRmSlaQIZAQAKCRAyfyaVGgFcxNX0AKDeFj3gF+Fl +CMgnw1JWu/fM5H8pYgCg7VRzOxtpEEiDSw37hv4eifyo7P60L0xlbm5hcnQgUG9l dHRlcmluZyAoTGlzYSkgPGxwb2V0dGVyaW5nQGxpc2EuZGU+iEkEMBECAAkFAk6K PXcCHSAACgkQMn8mlRoBXMSZNgCgjKt+QUMXVT1a2h25RkUyiiBPeAYAnRpV0f+q i9N55hov5qCieRGUdvVctDJMZW5uYXJ0IFBvZXR0ZXJpbmcgKFJlZCBIYXQpIDxs @@ -68,5 +68,5 @@ gjtxiXZHH/DPqxjqsO+jJQxOjf9Io6o93jR9O5knsmtaVp8JNE3RzO40Lyszwyeu lxylMpd1HfOt6MZYk0we0Ed7vVEPEjE08YF6sC0Qk1b7crk/t0GLOdYtABEBAAGI SQQYEQIACQUCToo80gIbDAAKCRAyfyaVGgFcxNUwAKCvb0Lisf/Rll5vPLqGGIci sDadOQCg30tdWRaNvasUMaTQL+fqE/pFzeI= -=uJel +=mDgC -----END PGP PUBLIC KEY BLOCK----- diff --git a/systemd/keys/pgp/A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E.asc b/systemd/keys/pgp/A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E.asc index d740744a8a..bc71b06db3 100644 --- a/systemd/keys/pgp/A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E.asc +++ b/systemd/keys/pgp/A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E.asc @@ -11,32 +11,32 @@ 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 @@ -237,5 +237,5 @@ EYg7fYzIgMj7JQU5MR3+LZ1A0I2YuTCFhKbQnHN5qZlZ9mG0fTGpHNgwMEA0CDrT Fo4vvaeUz76JkFQDMBLP5tkgH24/6hsBULhZSuC9wGCa6nBi8OwwWwdMiHU3PnMg W0ePKaKUB0Pjs5caJm5zY1wnWz/uRp9WZRyH8jBjoXpzcx7QA35+O345uBk/LEGp j9htU27IOllKJQujQjFUwwuStWNfTGRzA4ixtODAv8ZUwdPdgmAb4zxY+MrRk1Q= -=Zx2v +=OCJO -----END PGP PUBLIC KEY BLOCK-----