Skip to content

Commit 4f6cc49

Browse files
fishilicofishilico
committed
Merge systemd-selinux 258.1-1 update
Merge AUR commit 13a58f4: https://aur.archlinux.org/cgit/aur.git/commit/?h=systemd-selinux&id=13a58f440adb27fd95144430fc74ccac181b4d32
2 parents 9eb13cf + 13a58f4 commit 4f6cc49

10 files changed

Lines changed: 303 additions & 61 deletions

File tree

‎systemd-selinux/.SRCINFO‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
pkgbase = systemd-selinux
2-
pkgver = 257.7
2+
pkgver = 258.1
33
pkgrel = 1
44
url = https://www.github.com/systemd/systemd
55
arch = x86_64
66
arch = aarch64
77
groups = selinux
88
license = LGPL-2.1-or-later
99
makedepends = acl
10+
makedepends = apparmor
1011
makedepends = cryptsetup
1112
makedepends = docbook-xsl
1213
makedepends = gperf
@@ -57,7 +58,7 @@ pkgbase = systemd-selinux
5758
makedepends = linux-headers
5859
makedepends = libselinux
5960
conflicts = mkinitcpio<38-1
60-
source = git+https://github.com/systemd/systemd#tag=v257.7?signed
61+
source = git+https://github.com/systemd/systemd#tag=v258.1?signed
6162
source = 0001-Use-Arch-Linux-device-access-groups.patch
6263
source = arch.conf
6364
source = loader.conf
@@ -79,13 +80,13 @@ pkgbase = systemd-selinux
7980
validpgpkeys = A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E
8081
validpgpkeys = 9A774DB5DB996C154EBBFBFDA0099A18E29326E1
8182
validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E
82-
sha512sums = 94c4f1fa540395653594d25a9633a47d2ce3053f0511b041b0ec73ddbb0db7877a50563be6c3ac3c9c5d1f5964b88a7de17f5fbd843e1391123ee6f0227fbd02
83-
sha512sums = 78065bde708118b7d6e4ed492e096c763e4679a1c54bd98750d5d609d8cc2f1373023f308880f14fc923ae7f9fea34824917ef884c0f996b1f43d08ef022c0fb
83+
sha512sums = fa8330f7f5e3a97309399703c784a12a975c139d01882d1cd089c9b102467f7edd01845ddef765b3f06812b270bb77b6b6564f9a2af81081079d27d2ee9d1b43
84+
sha512sums = beb15210d8afe69e1e47c99a81da5967428ccc64ece85b8a843333cb741eda061ae7a91a79cec8a1136a624e93e63140013986499589bf10edcc52d865729377
8485
sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
85-
sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
86+
sha512sums = 3194d1f8bff31b88a79657df83632b9224b66ca2cf8fd806a3ef35cf7a43f46c09c57f3dfd02256a99b6514a8f789b7d3bcfd7e17e00e34aa55ff0c6cedb5f01
8687
sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
87-
sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19
88-
sha512sums = 81baa1ae439b0f4d1f09371a82c02db06a97a4fc35545fc2654f7905b4422fc8cf085f70304919a4323f39e662df1e05aa8d977d1dde73507527abe3072c386b
88+
sha512sums = 30a408b5491ea59ec6ff6e773ea587fe12900c9b8169a0e16451d1cc6a452f2424e6ce1ee595448ff009b88fcbadf4cc4ae70a553235bae4a31aa1ec12a0c777
89+
sha512sums = 05a3b19a2132c8c3048a66f2d06a9f8790e9c84c9ebdacc358456e38c5ebc8c02c542838f6aca3301f19ae83bc9fda66e701c682624dd5cf9fb119e452338a56
8990
sha512sums = 299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5
9091
sha512sums = 0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7
9192
sha512sums = 2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc
@@ -105,7 +106,7 @@ pkgname = systemd-selinux
105106
license = CC0-1.0
106107
license = GPL-2.0-or-later
107108
license = MIT-0
108-
depends = systemd-libs-selinux=257.7
109+
depends = systemd-libs-selinux=258.1
109110
depends = acl
110111
depends = libacl.so
111112
depends = bash
@@ -138,8 +139,10 @@ pkgname = systemd-selinux
138139
depends = libcrypto.so
139140
depends = libssl.so
140141
optdepends = libmicrohttpd: systemd-journal-gatewayd and systemd-journal-remote
142+
optdepends = apparmor: additional security features
141143
optdepends = quota-tools: kernel-level quota management
142144
optdepends = systemd-sysvcompat-selinux: symlink package to provide sysvinit binaries
145+
optdepends = systemd-ukify-selinux: combine kernel and initrd into a signed Unified Kernel Image
143146
optdepends = polkit: allow administration as unprivileged user
144147
optdepends = curl: systemd-journal-upload, machinectl pull-tar and pull-raw
145148
optdepends = gnutls: systemd-journal-gatewayd and systemd-journal-remote
@@ -152,15 +155,14 @@ pkgname = systemd-selinux
152155
optdepends = libp11-kit: support PKCS#11
153156
optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
154157
provides = nss-myhostname
155-
provides = systemd-tools=257.7
156-
provides = udev=257.7
157-
provides = systemd=257.7-1
158+
provides = systemd-tools=258.1
159+
provides = udev=258.1
160+
provides = systemd=258.1-1
158161
conflicts = nss-myhostname
159162
conflicts = systemd-tools
160163
conflicts = udev
161164
conflicts = systemd
162165
conflicts = selinux-systemd
163-
backup = etc/pam.d/systemd-user
164166
backup = etc/systemd/coredump.conf
165167
backup = etc/systemd/homed.conf
166168
backup = etc/systemd/journald.conf
@@ -195,42 +197,42 @@ pkgname = systemd-libs-selinux
195197
provides = libsystemd.so
196198
provides = libudev.so
197199
provides = libsystemd-selinux
198-
provides = systemd-libs=257.7-1
200+
provides = systemd-libs=258.1-1
199201
conflicts = libsystemd
200202
conflicts = libsystemd-selinux
201203
conflicts = systemd-libs
202204
replaces = libsystemd-selinux
203205

204206
pkgname = systemd-resolvconf-selinux
205207
pkgdesc = systemd resolvconf replacement with SELinux support (for use with systemd-resolved)
206-
depends = systemd-selinux=257.7
208+
depends = systemd-selinux=258.1
207209
provides = openresolv
208210
provides = resolvconf
209-
provides = systemd-resolvconf=257.7-1
211+
provides = systemd-resolvconf=258.1-1
210212
conflicts = resolvconf
211-
conflicts = systemd-resolvconf=257.7-1
213+
conflicts = systemd-resolvconf=258.1-1
212214

213215
pkgname = systemd-sysvcompat-selinux
214216
pkgdesc = sysvinit compat for systemd with SELinux support
215-
depends = systemd-selinux=257.7
216-
provides = systemd-sysvcompat=257.7-1
217-
provides = selinux-systemd-sysvcompat=257.7-1
217+
depends = systemd-selinux=258.1
218+
provides = systemd-sysvcompat=258.1-1
219+
provides = selinux-systemd-sysvcompat=258.1-1
218220
conflicts = sysvinit
219221
conflicts = systemd-sysvcompat
220222
conflicts = selinux-systemd-sysvcompat
221223

222224
pkgname = systemd-tests-selinux
223225
pkgdesc = systemd tests with SELinux support
224-
depends = systemd-selinux=257.7
225-
provides = systemd-tests=257.7-1
226+
depends = systemd-selinux=258.1
227+
provides = systemd-tests=258.1-1
226228

227229
pkgname = systemd-ukify-selinux
228230
pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image with SELinux support
229-
depends = systemd-selinux=257.7
231+
depends = systemd-selinux=258.1
230232
depends = binutils
231233
depends = python-cryptography
232234
depends = python-pefile
233235
optdepends = python-pillow: Show the size of splash image
234236
optdepends = sbsigntools: Sign the embedded kernel
235237
provides = ukify
236-
provides = systemd-ukify=257.7-1
238+
provides = systemd-ukify=258.1-1

‎systemd-selinux/0001-Use-Arch-Linux-device-access-groups.patch‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From dfdd57b81916ac4c9a69b4c4400a9145d9746e9f Mon Sep 17 00:00:00 2001
1+
From 24112f5adb393febab43dbff3a8533146b25d7a3 Mon Sep 17 00:00:00 2001
22
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
33
Date: Tue, 6 Mar 2018 23:39:47 +0100
44
Subject: [PATCH] Use Arch Linux' device access groups
@@ -14,14 +14,15 @@ Subject: [PATCH] Use Arch Linux' device access groups
1414
4 files changed, 19 insertions(+), 19 deletions(-)
1515

1616
diff --git a/meson.build b/meson.build
17-
index d392610625..ab8689da68 100644
17+
index e87c8ea2ec..8f56e87b68 100644
1818
--- a/meson.build
1919
+++ b/meson.build
20-
@@ -940,19 +940,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group)
20+
@@ -949,20 +949,20 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group)
2121
static_ugids = []
2222
foreach option : ['adm-gid',
2323
'audio-gid',
2424
- 'cdrom-gid',
25+
'clock-gid',
2526
- 'dialout-gid',
2627
'disk-gid',
2728
'input-gid',
@@ -41,21 +42,23 @@ index d392610625..ab8689da68 100644
4142
'wheel-gid',
4243
'systemd-journal-gid',
4344
diff --git a/meson_options.txt b/meson_options.txt
44-
index 78ec25bfa3..0ac81db762 100644
45+
index c616f23297..3999595c2f 100644
4546
--- a/meson_options.txt
4647
+++ b/meson_options.txt
47-
@@ -287,10 +287,6 @@ option('adm-gid', type : 'integer', value : 0,
48+
@@ -289,12 +289,8 @@ option('adm-gid', type : 'integer', value : 0,
4849
description : 'soft-static allocation for the "adm" group')
4950
option('audio-gid', type : 'integer', value : 0,
5051
description : 'soft-static allocation for the "audio" group')
5152
-option('cdrom-gid', type : 'integer', value : 0,
5253
- description : 'soft-static allocation for the "cdrom" group')
54+
option('clock-gid', type : 'integer', value : 0,
55+
description : 'soft-static allocation for the "clock" group')
5356
-option('dialout-gid', type : 'integer', value : 0,
5457
- description : 'soft-static allocation for the "dialout" group')
5558
option('disk-gid', type : 'integer', value : 0,
5659
description : 'soft-static allocation for the "disk" group')
5760
option('input-gid', type : 'integer', value : 0,
58-
@@ -301,18 +297,22 @@ option('kvm-gid', type : 'integer', value : 0,
61+
@@ -305,18 +301,22 @@ option('kvm-gid', type : 'integer', value : 0,
5962
description : 'soft-static allocation for the "kvm" group')
6063
option('lp-gid', type : 'integer', value : 0,
6164
description : 'soft-static allocation for the "lp" group')
@@ -81,19 +84,19 @@ index 78ec25bfa3..0ac81db762 100644
8184
description : 'soft-static allocation for the "video" group')
8285
option('wheel-gid', type : 'integer', value : 0,
8386
diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
84-
index 6f80feeecf..40c1bf3dbc 100644
87+
index 078a78ad1a..c54ef92943 100644
8588
--- a/rules.d/50-udev-default.rules.in
8689
+++ b/rules.d/50-udev-default.rules.in
87-
@@ -39,7 +39,7 @@ SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666"
90+
@@ -41,7 +41,7 @@ SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666"
8891
SUBSYSTEM=="tty", KERNEL=="tty", GROUP="tty", MODE="0666"
89-
SUBSYSTEM=="tty", KERNEL=="tty[0-9]*|hvc[0-9]*|sclp_line[0-9]*|ttysclp[0-9]*|3270/tty[0-9]*", GROUP="tty", MODE="0620"
92+
SUBSYSTEM=="tty", KERNEL=="tty[0-9]*|hvc[0-9]*|sclp_line[0-9]*|ttysclp[0-9]*|3270/tty[0-9]*", GROUP="tty", MODE="{{TTY_MODE}}"
9093
SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
9194
-KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
9295
+KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
9396

9497
SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
9598

96-
@@ -86,13 +86,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
99+
@@ -88,13 +88,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
97100
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
98101

99102
SUBSYSTEM=="block", GROUP="disk"
@@ -114,14 +117,15 @@ index 6f80feeecf..40c1bf3dbc 100644
114117
KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
115118
KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"
116119
diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
117-
index 992af346ca..86e622e5dd 100644
120+
index 503a4c4dac..0052690d97 100644
118121
--- a/sysusers.d/basic.conf.in
119122
+++ b/sysusers.d/basic.conf.in
120-
@@ -24,17 +24,17 @@ g utmp {{UTMP_GID }} - -
123+
@@ -24,18 +24,18 @@ g utmp {{UTMP_GID }} - -
121124

122125
# Physical and virtual hardware access groups
123126
g audio {{AUDIO_GID }} - -
124127
-g cdrom {{CDROM_GID }} - -
128+
g clock {{CLOCK_GID }} - -
125129
-g dialout {{DIALOUT_GID}} - -
126130
g disk {{DISK_GID }} - -
127131
g input {{INPUT_GID }} - -

‎systemd-selinux/LICENSE‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Copyright Arch Linux Contributors
2+
3+
Permission to use, copy, modify, and/or distribute this software for
4+
any purpose with or without fee is hereby granted.
5+
6+
THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
7+
WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
8+
OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
9+
FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
10+
DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
11+
AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
12+
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

‎systemd-selinux/LICENSES/0BSD.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../LICENSE

0 commit comments

Comments
 (0)