Skip to content

Commit

Permalink
Merge systemd-selinux 255.4-2 update
Browse files Browse the repository at this point in the history
  • Loading branch information
fishilico committed Mar 6, 2024
2 parents a98dca2 + 4d70007 commit d8770b1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 259 deletions.
23 changes: 9 additions & 14 deletions systemd-selinux/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgbase = systemd-selinux
pkgver = 255.4
pkgrel = 1
pkgrel = 2
url = https://www.github.com/systemd/systemd
arch = x86_64
arch = aarch64
Expand Down Expand Up @@ -54,12 +54,10 @@ pkgbase = systemd-selinux
makedepends = lib32-gcc-libs
makedepends = python-pefile
makedepends = libselinux
conflicts = mkinitcpio<38-1
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
source = initcpio-install-systemd
source = initcpio-install-udev
source = arch.conf
source = loader.conf
source = splash-arch.bmp::https://raw.githubusercontent.com/archlinux/svntogit-packages/391c1f5d4a18d08be809caa08c769ef9cded28db/trunk/splash-arch.bmp
Expand All @@ -82,9 +80,6 @@ pkgbase = systemd-selinux
sha512sums = SKIP
sha512sums = SKIP
sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e
sha512sums = 4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e
sha512sums = d8fc1def3af3260f222f3b6d5693f36677d7fe08ea8b933c14367f013a7fabf11e0acafc63370a06708a4fad4fd2cc3795eda57f81117238272ffa3655f71fd0
sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6
sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
Expand Down Expand Up @@ -158,7 +153,7 @@ pkgname = systemd-selinux
provides = nss-myhostname
provides = systemd-tools=255.4
provides = udev=255.4
provides = systemd=255.4-1
provides = systemd=255.4-2
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
Expand Down Expand Up @@ -199,7 +194,7 @@ pkgname = systemd-libs-selinux
provides = libsystemd.so
provides = libudev.so
provides = libsystemd-selinux
provides = systemd-libs=255.4-1
provides = systemd-libs=255.4-2
conflicts = libsystemd
conflicts = libsystemd-selinux
conflicts = systemd-libs
Expand All @@ -210,15 +205,15 @@ pkgname = systemd-resolvconf-selinux
depends = systemd-selinux
provides = openresolv
provides = resolvconf
provides = systemd-resolvconf=255.4-1
provides = systemd-resolvconf=255.4-2
conflicts = resolvconf
conflicts = systemd-resolvconf=255.4-1
conflicts = systemd-resolvconf=255.4-2

pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
depends = systemd-selinux
provides = systemd-sysvcompat=255.4-1
provides = selinux-systemd-sysvcompat=255.4-1
provides = systemd-sysvcompat=255.4-2
provides = selinux-systemd-sysvcompat=255.4-2
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
Expand All @@ -232,4 +227,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.4-1
provides = systemd-ukify=255.4-2
15 changes: 2 additions & 13 deletions systemd-selinux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ _tag_name=255.4
# ➜ vercmp 255rc1 255
# -1
pkgver="${_tag_name/~/}"
pkgrel=1
pkgrel=2
arch=('x86_64' 'aarch64')
license=('LGPL-2.1-or-later')
url='https://www.github.com/systemd/systemd'
Expand All @@ -35,17 +35,14 @@ 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')
conflicts=("mkinitcpio<38-1")
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"
'0001-Use-Arch-Linux-device-access-groups.patch'
# mkinitcpio files
'initcpio-hook-udev'
'initcpio-install-systemd'
'initcpio-install-udev'
# bootloader files
'arch.conf'
'loader.conf'
Expand All @@ -67,9 +64,6 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
sha512sums=('SKIP'
'SKIP'
'3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
'4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e'
'd8fc1def3af3260f222f3b6d5693f36677d7fe08ea8b933c14367f013a7fabf11e0acafc63370a06708a4fad4fd2cc3795eda57f81117238272ffa3655f71fd0'
'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
Expand Down Expand Up @@ -269,11 +263,6 @@ package_systemd-selinux() {
# ship default policy to leave services disabled
echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset

# add mkinitcpio hooks
install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd
install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev
install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev

# The group 'systemd-journal' is allocated dynamically and may have varying
# gid on different systems. Let's install with gid 0 (root), systemd-tmpfiles
# will fix the permissions for us. (see /usr/lib/tmpfiles.d/systemd.conf)
Expand Down
26 changes: 0 additions & 26 deletions systemd-selinux/initcpio-hook-udev

This file was deleted.

173 changes: 0 additions & 173 deletions systemd-selinux/initcpio-install-systemd

This file was deleted.

33 changes: 0 additions & 33 deletions systemd-selinux/initcpio-install-udev

This file was deleted.

0 comments on commit d8770b1

Please sign in to comment.