diff options
-rw-r--r-- | .SRCINFO | 23 | ||||
-rw-r--r-- | PKGBUILD | 10 |
2 files changed, 17 insertions, 16 deletions
@@ -1,5 +1,5 @@ pkgbase = systemd-selinux - pkgver = 250.5 + pkgver = 251 pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 @@ -44,8 +44,8 @@ pkgbase = systemd-selinux makedepends = rsync makedepends = libselinux options = strip - source = git+https://github.com/systemd/systemd-stable#tag=20e3fdcb595febff92fe3e89ee33da2c04c5c682?signed - source = git+https://github.com/systemd/systemd#tag=v250?signed + source = git+https://github.com/systemd/systemd-stable#tag=e93cff8c9c8ceaee8d19cf2599b84a7683ce4ecd?signed + source = git+https://github.com/systemd/systemd#tag=v251?signed source = 0001-Use-Arch-Linux-device-access-groups.patch source = initcpio-hook-udev source = initcpio-install-systemd @@ -66,6 +66,7 @@ pkgbase = systemd-selinux source = 30-systemd-update.hook validpgpkeys = 63CDA1E5D3FC22B998D20DD6327F26951A015CC4 validpgpkeys = A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E + validpgpkeys = 9A774DB5DB996C154EBBFBFDA0099A18E29326E1 validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E sha512sums = SKIP sha512sums = SKIP @@ -134,9 +135,9 @@ pkgname = systemd-selinux optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 provides = nss-myhostname - provides = systemd-tools=250.5 - provides = udev=250.5 - provides = systemd=250.5-1 + provides = systemd-tools=251 + provides = udev=251 + provides = systemd=251-1 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -174,7 +175,7 @@ pkgname = systemd-libs-selinux provides = libsystemd.so provides = libudev.so provides = libsystemd-selinux - provides = systemd-libs=250.5-1 + provides = systemd-libs=251-1 conflicts = libsystemd conflicts = libsystemd-selinux conflicts = systemd-libs @@ -186,16 +187,16 @@ pkgname = systemd-resolvconf-selinux depends = systemd-selinux provides = openresolv provides = resolvconf - provides = systemd-resolvconf=250.5-1 + provides = systemd-resolvconf=251-1 conflicts = openresolv - conflicts = systemd-resolvconf=250.5-1 + conflicts = systemd-resolvconf=251-1 pkgname = systemd-sysvcompat-selinux pkgdesc = sysvinit compat for systemd with SELinux support license = GPL2 depends = systemd-selinux - provides = systemd-sysvcompat=250.5-1 - provides = selinux-systemd-sysvcompat=250.5-1 + provides = systemd-sysvcompat=251-1 + provides = selinux-systemd-sysvcompat=251-1 conflicts = sysvinit conflicts = systemd-sysvcompat conflicts = selinux-systemd-sysvcompat @@ -10,8 +10,8 @@ pkgbase=systemd-selinux pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux') -_tag='20e3fdcb595febff92fe3e89ee33da2c04c5c682' # git rev-parse v${_tag_name} -_tag_name=250.5 +_tag='e93cff8c9c8ceaee8d19cf2599b84a7683ce4ecd' # git rev-parse v${_tag_name} +_tag_name=251 pkgver="${_tag_name/-/}" pkgrel=1 arch=('x86_64' 'aarch64') @@ -26,6 +26,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam-selinux' ' options=('strip') validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net> 'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi@gmail.com> + '9A774DB5DB996C154EBBFBFDA0099A18E29326E1' # Yu Watanabe <watanabe.yu+github@gmail.com> '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed" @@ -69,8 +70,6 @@ sha512sums=('SKIP' '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97') _backports=( - # bus: Use OrderedSet for introspection - 'acac88340ace3cd631126eebb6d0390cd54e8231' ) _reverts=( @@ -89,7 +88,7 @@ prepare() { else git log --oneline -1 "${_c}" fi - git cherry-pick -n "${_c}" + git cherry-pick -n -m1 "${_c}" done for _c in "${_reverts[@]}"; do git log --oneline -1 "${_c}" @@ -119,6 +118,7 @@ build() { # internal version comparison is incompatible with pacman: # 249~rc1 < 249 < 249.1 < 249rc -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-arch" + -Dshared-lib-tag="${pkgver}-${pkgrel}" -Dmode=release -Daudit=true |