diff --git a/.SRCINFO b/.SRCINFO index 4292f29b..fc7124cd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = systemd-selinux - pkgver = 256.4 + pkgver = 256.5 pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 @@ -56,7 +56,7 @@ pkgbase = systemd-selinux makedepends = python-pefile makedepends = libselinux conflicts = mkinitcpio<38-1 - source = git+https://github.com/systemd/systemd#tag=v256.4?signed + source = git+https://github.com/systemd/systemd#tag=v256.5?signed source = 0001-Use-Arch-Linux-device-access-groups.patch source = arch.conf source = loader.conf @@ -77,7 +77,7 @@ pkgbase = systemd-selinux validpgpkeys = A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E validpgpkeys = 9A774DB5DB996C154EBBFBFDA0099A18E29326E1 validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E - sha512sums = 8ac4d672e4be9f43a6f177cfa0ad91c1d5434e85c6aef633740b6a0e27f6ca15c859b29269a775fe32f14626944db5be87e1a8ebaa7620de7452dd14d902e09e + sha512sums = 493daf7c4d80b5c3c2f90822f0aa18cd2f9c8c5de950f71947a8b1ef2bada1b0b163ec5d850bab48ae46426694838041bbe1ee00920e384080b2a2625bf68ef5 sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648 sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 @@ -102,7 +102,7 @@ pkgname = systemd-selinux license = CC0-1.0 license = GPL-2.0-or-later license = MIT-0 - depends = systemd-libs-selinux=256.4 + depends = systemd-libs-selinux=256.5 depends = acl depends = libacl.so depends = bash @@ -150,9 +150,9 @@ pkgname = systemd-selinux optdepends = libp11-kit: support PKCS#11 optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 provides = nss-myhostname - provides = systemd-tools=256.4 - provides = udev=256.4 - provides = systemd=256.4-1 + provides = systemd-tools=256.5 + provides = udev=256.5 + provides = systemd=256.5-1 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -193,7 +193,7 @@ pkgname = systemd-libs-selinux provides = libsystemd.so provides = libudev.so provides = libsystemd-selinux - provides = systemd-libs=256.4-1 + provides = systemd-libs=256.5-1 conflicts = libsystemd conflicts = libsystemd-selinux conflicts = systemd-libs @@ -201,29 +201,29 @@ pkgname = systemd-libs-selinux pkgname = systemd-resolvconf-selinux pkgdesc = systemd resolvconf replacement with SELinux support (for use with systemd-resolved) - depends = systemd-selinux=256.4 + depends = systemd-selinux=256.5 provides = openresolv provides = resolvconf - provides = systemd-resolvconf=256.4-1 + provides = systemd-resolvconf=256.5-1 conflicts = resolvconf - conflicts = systemd-resolvconf=256.4-1 + conflicts = systemd-resolvconf=256.5-1 pkgname = systemd-sysvcompat-selinux pkgdesc = sysvinit compat for systemd with SELinux support - depends = systemd-selinux=256.4 - provides = systemd-sysvcompat=256.4-1 - provides = selinux-systemd-sysvcompat=256.4-1 + depends = systemd-selinux=256.5 + provides = systemd-sysvcompat=256.5-1 + provides = selinux-systemd-sysvcompat=256.5-1 conflicts = sysvinit conflicts = systemd-sysvcompat conflicts = selinux-systemd-sysvcompat pkgname = systemd-ukify-selinux pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image with SELinux support - depends = systemd-selinux=256.4 + depends = systemd-selinux=256.5 depends = binutils depends = python-cryptography depends = python-pefile optdepends = python-pillow: Show the size of splash image optdepends = sbsigntools: Sign the embedded kernel provides = ukify - provides = systemd-ukify=256.4-1 + provides = systemd-ukify=256.5-1 diff --git a/PKGBUILD b/PKGBUILD index e65feec0..7dd85774 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=('systemd-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux' 'systemd-ukify-selinux') -_tag='256.4' +_tag='256.5' # 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: @@ -55,7 +55,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=('8ac4d672e4be9f43a6f177cfa0ad91c1d5434e85c6aef633740b6a0e27f6ca15c859b29269a775fe32f14626944db5be87e1a8ebaa7620de7452dd14d902e09e' +sha512sums=('493daf7c4d80b5c3c2f90822f0aa18cd2f9c8c5de950f71947a8b1ef2bada1b0b163ec5d850bab48ae46426694838041bbe1ee00920e384080b2a2625bf68ef5' '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' @@ -293,6 +293,13 @@ package_systemd-selinux() { # 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-selinux() {