Skip to content

Commit

Permalink
Merge systemd-selinux 255.3-1 update
Browse files Browse the repository at this point in the history
  • Loading branch information
fishilico committed Jan 27, 2024
2 parents 2a64f9d + 9e49bca commit f27df86
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 19 deletions.
25 changes: 13 additions & 12 deletions systemd-selinux/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = systemd-selinux
pkgver = 255.2
pkgrel = 3
pkgver = 255.3
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
arch = aarch64
Expand Down Expand Up @@ -52,9 +52,10 @@ pkgbase = systemd-selinux
makedepends = libpwquality
makedepends = qrencode
makedepends = lib32-gcc-libs
makedepends = python-pefile
makedepends = libselinux
options = strip
source = git+https://github.com/systemd/systemd-stable#tag=be88ad03366b8aa059bb72b39a270128ba62b428?signed
source = git+https://github.com/systemd/systemd-stable#tag=8cf1da1e9172ba04d90a483a63118873343ea656?signed
source = git+https://github.com/systemd/systemd#tag=v255?signed
source = 0001-Use-Arch-Linux-device-access-groups.patch
source = initcpio-hook-udev
Expand Down Expand Up @@ -154,9 +155,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.2
provides = udev=255.2
provides = systemd=255.2-3
provides = systemd-tools=255.3
provides = udev=255.3
provides = systemd=255.3-1
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
Expand Down Expand Up @@ -195,7 +196,7 @@ pkgname = systemd-libs-selinux
provides = libsystemd.so
provides = libudev.so
provides = libsystemd-selinux
provides = systemd-libs=255.2-3
provides = systemd-libs=255.3-1
conflicts = libsystemd
conflicts = libsystemd-selinux
conflicts = systemd-libs
Expand All @@ -207,16 +208,16 @@ pkgname = systemd-resolvconf-selinux
depends = systemd-selinux
provides = openresolv
provides = resolvconf
provides = systemd-resolvconf=255.2-3
provides = systemd-resolvconf=255.3-1
conflicts = resolvconf
conflicts = systemd-resolvconf=255.2-3
conflicts = systemd-resolvconf=255.3-1

pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
provides = systemd-sysvcompat=255.2-3
provides = selinux-systemd-sysvcompat=255.2-3
provides = systemd-sysvcompat=255.3-1
provides = selinux-systemd-sysvcompat=255.3-1
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
Expand All @@ -231,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.2-3
provides = systemd-ukify=255.3-1
11 changes: 4 additions & 7 deletions systemd-selinux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ pkgname=('systemd-selinux'
'systemd-resolvconf-selinux'
'systemd-sysvcompat-selinux'
'systemd-ukify-selinux')
_tag='be88ad03366b8aa059bb72b39a270128ba62b428' # git rev-parse v${_tag_name}
_tag_name=255.2
_tag='8cf1da1e9172ba04d90a483a63118873343ea656' # git rev-parse v${_tag_name}
_tag_name=255.3
pkgver="${_tag_name/-/}"
pkgrel=3
pkgrel=1
arch=('x86_64' 'aarch64')
url='https://www.github.com/systemd/systemd'
groups=('selinux')
Expand All @@ -26,7 +26,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam-selinux' '
'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync'
'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools'
'libpwquality' 'qrencode' 'lib32-gcc-libs' 'libselinux')
'libpwquality' 'qrencode' 'lib32-gcc-libs' 'python-pefile' 'libselinux')
checkdepends=('python-pefile')
options=('strip')
validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>
Expand Down Expand Up @@ -273,9 +273,6 @@ package_systemd-selinux() {
# will fix the permissions for us. (see /usr/lib/tmpfiles.d/systemd.conf)
install -d -o root -g root -m 2755 "$pkgdir"/var/log/journal

# match directory owner/group and mode from [extra]/polkit
install -d -o root -g root -m 0755 "$pkgdir"/usr/share/polkit-1/rules.d

# add example bootctl configuration
install -D -m0644 arch.conf "$pkgdir"/usr/share/systemd/bootctl/arch.conf
install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf
Expand Down

0 comments on commit f27df86

Please sign in to comment.