Skip to content

Commit 779d73c

Browse files
committed
2 parents 2113dba + f2cf9ec commit 779d73c

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

systemd-selinux/.SRCINFO

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pkgbase = systemd-selinux
2-
pkgver = 256.4
2+
pkgver = 256.5
33
pkgrel = 1
44
url = https://www.github.com/systemd/systemd
55
arch = x86_64
@@ -56,7 +56,7 @@ pkgbase = systemd-selinux
5656
makedepends = python-pefile
5757
makedepends = libselinux
5858
conflicts = mkinitcpio<38-1
59-
source = git+https://github.com/systemd/systemd#tag=v256.4?signed
59+
source = git+https://github.com/systemd/systemd#tag=v256.5?signed
6060
source = 0001-Use-Arch-Linux-device-access-groups.patch
6161
source = arch.conf
6262
source = loader.conf
@@ -77,7 +77,7 @@ pkgbase = systemd-selinux
7777
validpgpkeys = A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E
7878
validpgpkeys = 9A774DB5DB996C154EBBFBFDA0099A18E29326E1
7979
validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E
80-
sha512sums = 8ac4d672e4be9f43a6f177cfa0ad91c1d5434e85c6aef633740b6a0e27f6ca15c859b29269a775fe32f14626944db5be87e1a8ebaa7620de7452dd14d902e09e
80+
sha512sums = 493daf7c4d80b5c3c2f90822f0aa18cd2f9c8c5de950f71947a8b1ef2bada1b0b163ec5d850bab48ae46426694838041bbe1ee00920e384080b2a2625bf68ef5
8181
sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e
8282
sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
8383
sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
@@ -102,7 +102,7 @@ pkgname = systemd-selinux
102102
license = CC0-1.0
103103
license = GPL-2.0-or-later
104104
license = MIT-0
105-
depends = systemd-libs-selinux=256.4
105+
depends = systemd-libs-selinux=256.5
106106
depends = acl
107107
depends = libacl.so
108108
depends = bash
@@ -150,9 +150,9 @@ pkgname = systemd-selinux
150150
optdepends = libp11-kit: support PKCS#11
151151
optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
152152
provides = nss-myhostname
153-
provides = systemd-tools=256.4
154-
provides = udev=256.4
155-
provides = systemd=256.4-1
153+
provides = systemd-tools=256.5
154+
provides = udev=256.5
155+
provides = systemd=256.5-1
156156
conflicts = nss-myhostname
157157
conflicts = systemd-tools
158158
conflicts = udev
@@ -193,37 +193,37 @@ pkgname = systemd-libs-selinux
193193
provides = libsystemd.so
194194
provides = libudev.so
195195
provides = libsystemd-selinux
196-
provides = systemd-libs=256.4-1
196+
provides = systemd-libs=256.5-1
197197
conflicts = libsystemd
198198
conflicts = libsystemd-selinux
199199
conflicts = systemd-libs
200200
replaces = libsystemd-selinux
201201

202202
pkgname = systemd-resolvconf-selinux
203203
pkgdesc = systemd resolvconf replacement with SELinux support (for use with systemd-resolved)
204-
depends = systemd-selinux=256.4
204+
depends = systemd-selinux=256.5
205205
provides = openresolv
206206
provides = resolvconf
207-
provides = systemd-resolvconf=256.4-1
207+
provides = systemd-resolvconf=256.5-1
208208
conflicts = resolvconf
209-
conflicts = systemd-resolvconf=256.4-1
209+
conflicts = systemd-resolvconf=256.5-1
210210

211211
pkgname = systemd-sysvcompat-selinux
212212
pkgdesc = sysvinit compat for systemd with SELinux support
213-
depends = systemd-selinux=256.4
214-
provides = systemd-sysvcompat=256.4-1
215-
provides = selinux-systemd-sysvcompat=256.4-1
213+
depends = systemd-selinux=256.5
214+
provides = systemd-sysvcompat=256.5-1
215+
provides = selinux-systemd-sysvcompat=256.5-1
216216
conflicts = sysvinit
217217
conflicts = systemd-sysvcompat
218218
conflicts = selinux-systemd-sysvcompat
219219

220220
pkgname = systemd-ukify-selinux
221221
pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image with SELinux support
222-
depends = systemd-selinux=256.4
222+
depends = systemd-selinux=256.5
223223
depends = binutils
224224
depends = python-cryptography
225225
depends = python-pefile
226226
optdepends = python-pillow: Show the size of splash image
227227
optdepends = sbsigntools: Sign the embedded kernel
228228
provides = ukify
229-
provides = systemd-ukify=256.4-1
229+
provides = systemd-ukify=256.5-1

systemd-selinux/PKGBUILD

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pkgname=('systemd-selinux'
1212
'systemd-resolvconf-selinux'
1313
'systemd-sysvcompat-selinux'
1414
'systemd-ukify-selinux')
15-
_tag='256.4'
15+
_tag='256.5'
1616
# Upstream versioning is incompatible with pacman's version comparisons, one
1717
# way or another. So we replace dashes and tildes with the empty string to
1818
# make sure pacman's version comparing does the right thing for rc versions:
@@ -55,7 +55,7 @@ source=("git+https://github.com/systemd/systemd#tag=v${_tag}?signed"
5555
'30-systemd-tmpfiles.hook'
5656
'30-systemd-udev-reload.hook'
5757
'30-systemd-update.hook')
58-
sha512sums=('8ac4d672e4be9f43a6f177cfa0ad91c1d5434e85c6aef633740b6a0e27f6ca15c859b29269a775fe32f14626944db5be87e1a8ebaa7620de7452dd14d902e09e'
58+
sha512sums=('493daf7c4d80b5c3c2f90822f0aa18cd2f9c8c5de950f71947a8b1ef2bada1b0b163ec5d850bab48ae46426694838041bbe1ee00920e384080b2a2625bf68ef5'
5959
'3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
6060
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
6161
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -293,6 +293,13 @@ package_systemd-selinux() {
293293

294294
# overwrite the systemd-user PAM configuration with our own
295295
install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user
296+
297+
# create a directory for cryptsetup keys
298+
install -d -m0700 "$pkgdir"/etc/cryptsetup-keys.d
299+
300+
# handle uncommon license
301+
install -d -m0755 "$pkgdir/usr/share/licenses/$pkgbase"
302+
ln -s -t "$_" /usr/share/doc/systemd/LICENSES/MIT-0.txt
296303
}
297304

298305
package_systemd-libs-selinux() {

0 commit comments

Comments
 (0)