diff --git a/core/systemd/.SRCINFO b/core/systemd/.SRCINFO index 3c372c58d..ca0a03a45 100644 --- a/core/systemd/.SRCINFO +++ b/core/systemd/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = systemd - pkgver = 256.1 + pkgver = 256.2 pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 @@ -52,7 +52,7 @@ pkgbase = systemd makedepends = qrencode makedepends = lib32-gcc-libs conflicts = mkinitcpio<38-1 - source = git+https://github.com/systemd/systemd#tag=v256.1?signed + source = git+https://github.com/systemd/systemd#tag=v256.2?signed source = 0001-Use-Arch-Linux-device-access-groups.patch source = arch.conf source = loader.conf @@ -73,7 +73,7 @@ pkgbase = systemd validpgpkeys = A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E validpgpkeys = 9A774DB5DB996C154EBBFBFDA0099A18E29326E1 validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E - sha512sums = 1ba38dd45cd910c7a2b4c7f23f982c5b0e5b13cd5874571ebc9b609ff85c058cecdb61019141ef2010fd4882c3ffc5a13a2b0d6370db4067ad90c28b83de6760 + sha512sums = 7440e619af100458ccd54ab1aafdaa339f473c226b6f7d9ceca35716ad30e9ed112ae8e2230116b2104e88171d92309ad78780f4f02d5f9f59c0e7fce15606c9 sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648 sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 @@ -98,7 +98,7 @@ pkgname = systemd license = CC0-1.0 license = GPL-2.0-or-later license = MIT-0 - depends = systemd-libs=256.1 + depends = systemd-libs=256.2 depends = acl depends = libacl.so depends = bash @@ -145,8 +145,8 @@ pkgname = systemd optdepends = libp11-kit: support PKCS#11 optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 provides = nss-myhostname - provides = systemd-tools=256.1 - provides = udev=256.1 + provides = systemd-tools=256.2 + provides = udev=256.2 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -191,19 +191,19 @@ pkgname = systemd-libs pkgname = systemd-resolvconf pkgdesc = systemd resolvconf replacement (for use with systemd-resolved) - depends = systemd=256.1 + depends = systemd=256.2 provides = openresolv provides = resolvconf conflicts = resolvconf pkgname = systemd-sysvcompat pkgdesc = sysvinit compat for systemd - depends = systemd=256.1 + depends = systemd=256.2 conflicts = sysvinit pkgname = systemd-ukify pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image - depends = systemd=256.1 + depends = systemd=256.2 depends = binutils depends = python-cryptography depends = python-pefile diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index a4f2ed8b1..9eef43fdd 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('systemd' 'systemd-resolvconf' 'systemd-sysvcompat' 'systemd-ukify') -_tag='256.1' +_tag='256.2' # 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: @@ -56,7 +56,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=('1ba38dd45cd910c7a2b4c7f23f982c5b0e5b13cd5874571ebc9b609ff85c058cecdb61019141ef2010fd4882c3ffc5a13a2b0d6370db4067ad90c28b83de6760' +sha512sums=('7440e619af100458ccd54ab1aafdaa339f473c226b6f7d9ceca35716ad30e9ed112ae8e2230116b2104e88171d92309ad78780f4f02d5f9f59c0e7fce15606c9' '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' @@ -75,12 +75,14 @@ sha512sums=('1ba38dd45cd910c7a2b4c7f23f982c5b0e5b13cd5874571ebc9b609ff85c058cecd '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97') _meson_version="${pkgver}-${pkgrel}" +_meson_vcs_tag='false' _meson_mode='release' _meson_compile=() _meson_install=() if ((_systemd_UPSTREAM)); then _meson_version="${pkgver}" + _meson_vcs_tag='true' _meson_mode='developer' pkgname+=('systemd-tests') makedepends+=('libarchive') @@ -138,6 +140,7 @@ build() { local _meson_options=( -Dversion-tag="${_meson_version}-arch" + -Dvcs-tag="${_meson_vcs_tag}" -Dshared-lib-tag="${_meson_version}" -Dmode="${_meson_mode}"