diff options
author | Nicolas Iooss | 2024-03-03 13:18:10 +0100 |
---|---|---|
committer | Nicolas Iooss | 2024-03-03 13:18:10 +0100 |
commit | 7c78ae3da31d87175470983ac600cab9c0e70f68 (patch) | |
tree | 6458b4f6ec35de60de21845fd22a541b294b1d7d | |
parent | 9e49bca419ab9146fc27ddaf5f144a27dd8e46de (diff) | |
download | aur-7c78ae3da31d87175470983ac600cab9c0e70f68.tar.gz |
systemd-selinux 255.4-1 update
-rw-r--r-- | .SRCINFO | 40 | ||||
-rw-r--r-- | PKGBUILD | 44 | ||||
-rw-r--r-- | initcpio-install-systemd | 5 |
3 files changed, 48 insertions, 41 deletions
@@ -1,11 +1,11 @@ pkgbase = systemd-selinux - pkgver = 255.3 + pkgver = 255.4 pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 arch = aarch64 groups = selinux - checkdepends = python-pefile + license = LGPL-2.1-or-later makedepends = acl makedepends = cryptsetup makedepends = docbook-xsl @@ -54,8 +54,7 @@ pkgbase = systemd-selinux makedepends = lib32-gcc-libs makedepends = python-pefile makedepends = libselinux - options = strip - source = git+https://github.com/systemd/systemd-stable#tag=8cf1da1e9172ba04d90a483a63118873343ea656?signed + source = git+https://github.com/systemd/systemd-stable#tag=4003dd6754e3446691402d3cc389fbfd4faccc90?signed source = git+https://github.com/systemd/systemd#tag=v255?signed source = 0001-Use-Arch-Linux-device-access-groups.patch source = initcpio-hook-udev @@ -84,7 +83,7 @@ pkgbase = systemd-selinux sha512sums = SKIP sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e sha512sums = 4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e - sha512sums = ada692514d758fa11e2be6b4c5e1dc2d9d47548f24ada35afdce1dcac918e72ae2251c892773e6cf41fa431c3613a1608668e999eb86a565870fecb55c47b4ba + sha512sums = d8fc1def3af3260f222f3b6d5693f36677d7fe08ea8b933c14367f013a7fabf11e0acafc63370a06708a4fad4fd2cc3795eda57f81117238272ffa3655f71fd0 sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6 sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648 sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 @@ -105,8 +104,10 @@ pkgbase = systemd-selinux pkgname = systemd-selinux pkgdesc = system and service manager with SELinux support install = systemd.install - license = GPL2 - license = LGPL2.1 + license = LGPL-2.1-or-later + license = CC0-1.0 + license = GPL-2.0-or-later + license = MIT-0 depends = acl depends = libacl.so depends = bash @@ -155,9 +156,9 @@ pkgname = systemd-selinux optdepends = libp11-kit: support PKCS#11 optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 provides = nss-myhostname - provides = systemd-tools=255.3 - provides = udev=255.3 - provides = systemd=255.3-1 + provides = systemd-tools=255.4 + provides = udev=255.4 + provides = systemd=255.4-1 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -183,7 +184,9 @@ pkgname = systemd-selinux pkgname = systemd-libs-selinux pkgdesc = systemd client libraries with SELinux support - license = LGPL2.1 + license = LGPL-2.1-or-later + license = CC0-1.0 + license = GPL-2.0-or-later WITH Linux-syscall-note depends = glibc depends = gcc-libs depends = libcap @@ -196,7 +199,7 @@ pkgname = systemd-libs-selinux provides = libsystemd.so provides = libudev.so provides = libsystemd-selinux - provides = systemd-libs=255.3-1 + provides = systemd-libs=255.4-1 conflicts = libsystemd conflicts = libsystemd-selinux conflicts = systemd-libs @@ -204,27 +207,24 @@ pkgname = systemd-libs-selinux pkgname = systemd-resolvconf-selinux pkgdesc = systemd resolvconf replacement with SELinux support (for use with systemd-resolved) - license = LGPL2.1 depends = systemd-selinux provides = openresolv provides = resolvconf - provides = systemd-resolvconf=255.3-1 + provides = systemd-resolvconf=255.4-1 conflicts = resolvconf - conflicts = systemd-resolvconf=255.3-1 + conflicts = systemd-resolvconf=255.4-1 pkgname = systemd-sysvcompat-selinux pkgdesc = sysvinit compat for systemd with SELinux support - license = GPL2 depends = systemd-selinux - provides = systemd-sysvcompat=255.3-1 - provides = selinux-systemd-sysvcompat=255.3-1 + provides = systemd-sysvcompat=255.4-1 + provides = selinux-systemd-sysvcompat=255.4-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 - license = GPL2 depends = binutils depends = python-cryptography depends = python-pefile @@ -232,4 +232,4 @@ pkgname = systemd-ukify-selinux optdepends = python-pillow: Show the size of splash image optdepends = sbsigntools: Sign the embedded kernel provides = ukify - provides = systemd-ukify=255.3-1 + provides = systemd-ukify=255.4-1 @@ -12,11 +12,19 @@ pkgname=('systemd-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux' 'systemd-ukify-selinux') -_tag='8cf1da1e9172ba04d90a483a63118873343ea656' # git rev-parse v${_tag_name} -_tag_name=255.3 -pkgver="${_tag_name/-/}" +_tag='4003dd6754e3446691402d3cc389fbfd4faccc90' # git rev-parse v${_tag_name} +_tag_name=255.4 +# Upstream versioning is incompatible with pacman's version comparisons so we +# replace tildes with the empty string to make sure pacman's version comparing +# does the right thing for rc versions: +# ➜ vercmp 255~rc1 255 +# 1 +# ➜ vercmp 255rc1 255 +# -1 +pkgver="${_tag_name/~/}" pkgrel=1 arch=('x86_64' 'aarch64') +license=('LGPL-2.1-or-later') url='https://www.github.com/systemd/systemd' groups=('selinux') makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam-selinux' 'libelf' @@ -27,8 +35,6 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam-selinux' ' 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync' 'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools' 'libpwquality' 'qrencode' 'lib32-gcc-libs' 'python-pefile' 'libselinux') -checkdepends=('python-pefile') -options=('strip') validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net> 'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi@gmail.com> '9A774DB5DB996C154EBBFBFDA0099A18E29326E1' # Yu Watanabe <watanabe.yu+github@gmail.com> @@ -62,7 +68,7 @@ sha512sums=('SKIP' 'SKIP' '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e' '4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e' - 'ada692514d758fa11e2be6b4c5e1dc2d9d47548f24ada35afdce1dcac918e72ae2251c892773e6cf41fa431c3613a1608668e999eb86a565870fecb55c47b4ba' + 'd8fc1def3af3260f222f3b6d5693f36677d7fe08ea8b933c14367f013a7fabf11e0acafc63370a06708a4fad4fd2cc3795eda57f81117238272ffa3655f71fd0' 'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' @@ -124,9 +130,9 @@ build() { ) local _meson_options=( - # internal version comparison is incompatible with pacman: - # 249~rc1 < 249 < 249.1 < 249rc - -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-arch" + -Dversion-tag="${_tag_name}-${pkgrel}-arch" + # We use the version without tildes as the shared library tag because + # pacman looks at the shared library version. -Dshared-lib-tag="${pkgver}-${pkgrel}" -Dmode=release @@ -166,22 +172,22 @@ build() { -Dsbat-distro-url="https://aur.archlinux.org/packages/${pkgname}/" ) - # 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 "${pkgbase/-selinux}-stable" build "${_meson_options[@]}" meson compile -C build } check() { - meson test -C build + meson test -C build --print-errorlogs } package_systemd-selinux() { pkgdesc='system and service manager with SELinux support' - license=('GPL2' 'LGPL2.1') + license+=( + 'CC0-1.0' # siphash + 'GPL-2.0-or-later' # udev + 'MIT-0' # documentation and config files + ) depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus' 'dbus-units' 'kbd' 'kmod' 'libkmod.so' 'hwdata' 'libcap' 'libcap.so' 'libgcrypt' 'libxcrypt' 'libcrypt.so' 'systemd-libs-selinux' 'libidn2' 'lz4' 'pam-selinux' @@ -289,7 +295,10 @@ package_systemd-selinux() { package_systemd-libs-selinux() { pkgdesc='systemd client libraries with SELinux support' depends=('glibc' 'gcc-libs' 'libcap' 'libgcrypt' 'lz4' 'xz' 'zstd' 'libselinux') - license=('LGPL2.1') + license+=( + 'CC0-1.0' # siphash + 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/* + ) provides=('libsystemd' 'libsystemd.so' 'libudev.so' 'libsystemd-selinux' "${pkgname/-selinux}=${pkgver}-${pkgrel}") @@ -304,7 +313,6 @@ package_systemd-libs-selinux() { package_systemd-resolvconf-selinux() { pkgdesc='systemd resolvconf replacement with SELinux support (for use with systemd-resolved)' - license=('LGPL2.1') depends=('systemd-selinux') provides=('openresolv' 'resolvconf' "${pkgname/-selinux}=${pkgver}-${pkgrel}") conflicts=('resolvconf' "${pkgname/-selinux}=${pkgver}-${pkgrel}") @@ -318,7 +326,6 @@ package_systemd-resolvconf-selinux() { package_systemd-sysvcompat-selinux() { pkgdesc='sysvinit compat for systemd with SELinux support' - license=('GPL2') conflicts=('sysvinit' "${pkgname/-selinux}" 'selinux-systemd-sysvcompat') depends=('systemd-selinux') provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}" @@ -336,7 +343,6 @@ package_systemd-sysvcompat-selinux() { package_systemd-ukify-selinux() { pkgdesc='Combine kernel and initrd into a signed Unified Kernel Image' - license=('GPL2') provides=('ukify' "${pkgname/-selinux}=${pkgver}-${pkgrel}") depends=('binutils' 'python-cryptography' 'python-pefile' 'systemd') optdepends=('python-pillow: Show the size of splash image' diff --git a/initcpio-install-systemd b/initcpio-install-systemd index 3355f4b85e99..e2790c80f300 100644 --- a/initcpio-install-systemd +++ b/initcpio-install-systemd @@ -125,9 +125,10 @@ build() { emergency.target # add libraries dlopen()ed (hard and optional dependencies): - # tss2-* -> tpm2-util + # kmod -> systemd-shared # qrencode -> bsod - for LIB in tss2-{esys,rc,mu,tcti-'*'} qrencode; do + # tss2-* -> tpm2-util + for LIB in kmod qrencode tss2-{esys,rc,mu,tcti-'*'}; do for FILE in $(find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*"); do if [[ -L "${FILE}" ]]; then add_symlink "${FILE}" |