diff options
author | Nicolas Iooss | 2021-12-02 20:38:40 +0100 |
---|---|---|
committer | Nicolas Iooss | 2021-12-02 20:38:40 +0100 |
commit | 50423866cb3d898a17bc1dacc91b07f9a2818959 (patch) | |
tree | 1b77848790da3d65a7556f8ab160e44b1f832f9f | |
parent | 3b2e59c4877f08d204ea8efc316f87ef55f7dee9 (diff) | |
download | aur-50423866cb3d898a17bc1dacc91b07f9a2818959.tar.gz |
systemd-selinux 249.7-2 update
-rw-r--r-- | .SRCINFO | 26 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | initcpio-install-systemd | 43 | ||||
-rw-r--r-- | initcpio-install-udev | 43 |
4 files changed, 18 insertions, 106 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-selinux - pkgver = 249.6 - pkgrel = 3 + pkgver = 249.7 + pkgrel = 2 url = https://www.github.com/systemd/systemd arch = x86_64 arch = aarch64 @@ -44,7 +44,7 @@ pkgbase = systemd-selinux makedepends = rsync makedepends = libselinux options = strip - source = git+https://github.com/systemd/systemd-stable#tag=620928e8026166a00d31142f0b38ba8b8e498cc4?signed + source = git+https://github.com/systemd/systemd-stable#tag=f223664ddf5cad0db04732985ee58006bc3916e4?signed source = git+https://github.com/systemd/systemd#tag=v249?signed source = 0001-Use-Arch-Linux-device-access-groups.patch source = 0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch @@ -73,8 +73,8 @@ pkgbase = systemd-selinux sha512sums = 10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1 sha512sums = 34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73 - sha512sums = 77582416df858e34bc05a9928ddacbe506d24946576cb7c08c7131cf2a9e059d8ff80b226684fc942bca2edf0c6d2584fa3e22939284b102b30395450784c4d3 - sha512sums = 8af5d7b1553be0cc193440dbb94683c2d2d777634dac4369716d75a1b2c2564551c836f3aee8220edfa5ef59122dea737bfe60c588637249bf67e15dba0534d0 + sha512sums = 5479c8ef963ff247381392907c13308b4ae3a9383c867bd4c8a318b159f23acdb4be5f4ddae0dab4665f4927d3f30166077b1d3aaa2cde6bf53d023b7abb939c + sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6 sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648 sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75 @@ -136,9 +136,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=249.6 - provides = udev=249.6 - provides = systemd=249.6-3 + provides = systemd-tools=249.7 + provides = udev=249.7 + provides = systemd=249.7-2 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -176,7 +176,7 @@ pkgname = systemd-libs-selinux provides = libsystemd.so provides = libudev.so provides = libsystemd-selinux - provides = systemd-libs=249.6-3 + provides = systemd-libs=249.7-2 conflicts = libsystemd conflicts = libsystemd-selinux conflicts = systemd-libs @@ -188,16 +188,16 @@ pkgname = systemd-resolvconf-selinux depends = systemd-selinux provides = openresolv provides = resolvconf - provides = systemd-resolvconf=249.6-3 + provides = systemd-resolvconf=249.7-2 conflicts = openresolv - conflicts = systemd-resolvconf=249.6-3 + conflicts = systemd-resolvconf=249.7-2 pkgname = systemd-sysvcompat-selinux pkgdesc = sysvinit compat for systemd with SELinux support license = GPL2 depends = systemd-selinux - provides = systemd-sysvcompat=249.6-3 - provides = selinux-systemd-sysvcompat=249.6-3 + provides = systemd-sysvcompat=249.7-2 + provides = selinux-systemd-sysvcompat=249.7-2 conflicts = sysvinit conflicts = systemd-sysvcompat conflicts = selinux-systemd-sysvcompat @@ -10,10 +10,10 @@ pkgbase=systemd-selinux pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux') -_tag='620928e8026166a00d31142f0b38ba8b8e498cc4' # git rev-parse v${_tag_name} -_tag_name=249.6 +_tag='f223664ddf5cad0db04732985ee58006bc3916e4' # git rev-parse v${_tag_name} +_tag_name=249.7 pkgver="${_tag_name/-/}" -pkgrel=3 +pkgrel=2 arch=('x86_64' 'aarch64') url='https://www.github.com/systemd/systemd' groups=('selinux') @@ -53,8 +53,8 @@ sha512sums=('SKIP' '10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1' '34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - '77582416df858e34bc05a9928ddacbe506d24946576cb7c08c7131cf2a9e059d8ff80b226684fc942bca2edf0c6d2584fa3e22939284b102b30395450784c4d3' - '8af5d7b1553be0cc193440dbb94683c2d2d777634dac4369716d75a1b2c2564551c836f3aee8220edfa5ef59122dea737bfe60c588637249bf67e15dba0534d0' + '5479c8ef963ff247381392907c13308b4ae3a9383c867bd4c8a318b159f23acdb4be5f4ddae0dab4665f4927d3f30166077b1d3aaa2cde6bf53d023b7abb939c' + 'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' @@ -71,8 +71,6 @@ sha512sums=('SKIP' '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97') _backports=( - # scope: count successful cgroup additions when delegating via D-Bus - 'c65417a01121301fdf7f8514ee7663d287af3a72' ) _reverts=( diff --git a/initcpio-install-systemd b/initcpio-install-systemd index f53ffb639e2d..961bdbb1e850 100644 --- a/initcpio-install-systemd +++ b/initcpio-install-systemd @@ -1,48 +1,5 @@ #!/bin/bash -# This is in 'udev' and 'systemd' hook... Let's hope we have -# it in mkinitcpio soon. -# https://github.com/archlinux/mkinitcpio/pull/54 -add_udev_rule() { - # Add an udev rules file to the initcpio image. Dependencies on binaries - # will be discovered and added. - # $1: path to rules file (or name of rules file) - - local rules="$1" rule= key= value= binary= - - if [[ ${rules:0:1} != '/' ]]; then - rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1") - fi - if [[ -z $rules ]]; then - # complain about not found rules - return 1 - fi - - add_file "$rules" /usr/lib/udev/rules.d/"${rules##*/}" - - while IFS=, read -ra rule; do - # skip empty lines, comments - [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue - - for pair in "${rule[@]}"; do - IFS=' =' read -r key value <<< "$pair" - case $key in - RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD}) - # strip quotes - binary=${value//[\"\']/} - # just take the first word as the binary name - binary=${binary%% *} - [[ ${binary:0:1} == '$' ]] && continue - if [[ ${binary:0:1} != '/' ]]; then - binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") - fi - add_binary "$binary" - ;; - esac - done - done <"$rules" -} - add_systemd_unit() { # Add a systemd unit file to the initcpio image. Hard dependencies on binaries # and other unit files will be discovered and added. diff --git a/initcpio-install-udev b/initcpio-install-udev index 713fbf4cc7ea..fef6f9bb7235 100644 --- a/initcpio-install-udev +++ b/initcpio-install-udev @@ -1,48 +1,5 @@ #!/bin/bash -# This is in 'udev' and 'systemd' hook... Let's hope we have -# it in mkinitcpio soon. -# https://github.com/archlinux/mkinitcpio/pull/54 -add_udev_rule() { - # Add an udev rules file to the initcpio image. Dependencies on binaries - # will be discovered and added. - # $1: path to rules file (or name of rules file) - - local rules="$1" rule= key= value= binary= - - if [[ ${rules:0:1} != '/' ]]; then - rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1") - fi - if [[ -z $rules ]]; then - # complain about not found rules - return 1 - fi - - add_file "$rules" /usr/lib/udev/rules.d/"${rules##*/}" - - while IFS=, read -ra rule; do - # skip empty lines, comments - [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue - - for pair in "${rule[@]}"; do - IFS=' =' read -r key value <<< "$pair" - case $key in - RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD}) - # strip quotes - binary=${value//[\"\']/} - # just take the first word as the binary name - binary=${binary%% *} - [[ ${binary:0:1} == '$' ]] && continue - if [[ ${binary:0:1} != '/' ]]; then - binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") - fi - add_binary "$binary" - ;; - esac - done - done <"$rules" -} - build() { local rules tool |