From ca215a91f61ff2dde247602b4d5b1280a37ca9cd Mon Sep 17 00:00:00 2001 From: Ar Rakin Date: Wed, 17 Sep 2025 22:36:21 +0600 Subject: [PATCH 1/3] systemd: update to version 258 Signed-off-by: Ar Rakin --- systemd-selinux/.SRCINFO | 38 +++++++++---------- ...-Use-Arch-Linux-device-access-groups.patch | 29 ++++++++------ systemd-selinux/PKGBUILD | 16 +++++--- 3 files changed, 46 insertions(+), 37 deletions(-) diff --git a/systemd-selinux/.SRCINFO b/systemd-selinux/.SRCINFO index ac9ec4aa..d0ec29f8 100644 --- a/systemd-selinux/.SRCINFO +++ b/systemd-selinux/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = systemd-selinux - pkgver = 257.7 + pkgver = 258 pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 @@ -57,7 +57,7 @@ pkgbase = systemd-selinux makedepends = linux-headers makedepends = libselinux conflicts = mkinitcpio<38-1 - source = git+https://github.com/systemd/systemd#tag=v257.7?signed + source = git+https://github.com/systemd/systemd#tag=v258?signed source = 0001-Use-Arch-Linux-device-access-groups.patch source = arch.conf source = loader.conf @@ -79,8 +79,8 @@ pkgbase = systemd-selinux validpgpkeys = A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E validpgpkeys = 9A774DB5DB996C154EBBFBFDA0099A18E29326E1 validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E - sha512sums = 94c4f1fa540395653594d25a9633a47d2ce3053f0511b041b0ec73ddbb0db7877a50563be6c3ac3c9c5d1f5964b88a7de17f5fbd843e1391123ee6f0227fbd02 - sha512sums = 78065bde708118b7d6e4ed492e096c763e4679a1c54bd98750d5d609d8cc2f1373023f308880f14fc923ae7f9fea34824917ef884c0f996b1f43d08ef022c0fb + sha512sums = 4703b54464ae42acb9e8b2a123f9e76cbe94b03c416292a95b9a8eb282eb2908e0499294b8c7f9bbb7946147e9379db7b277d1c277a08ee00f92f8d0eff33330 + sha512sums = 5760869e7c7c53022903bb90bb77d8d583fce154abad08d51eba7d98a6dbb76c21eb30ff4ef3b3d807ba50d320830847283fea3dffc4d0cdf82a3fd06e817e5b sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648 sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75 @@ -105,7 +105,7 @@ pkgname = systemd-selinux license = CC0-1.0 license = GPL-2.0-or-later license = MIT-0 - depends = systemd-libs-selinux=257.7 + depends = systemd-libs-selinux=258 depends = acl depends = libacl.so depends = bash @@ -152,9 +152,9 @@ pkgname = systemd-selinux optdepends = libp11-kit: support PKCS#11 optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 provides = nss-myhostname - provides = systemd-tools=257.7 - provides = udev=257.7 - provides = systemd=257.7-1 + provides = systemd-tools=258 + provides = udev=258 + provides = systemd=258-1 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -195,7 +195,7 @@ pkgname = systemd-libs-selinux provides = libsystemd.so provides = libudev.so provides = libsystemd-selinux - provides = systemd-libs=257.7-1 + provides = systemd-libs=258-1 conflicts = libsystemd conflicts = libsystemd-selinux conflicts = systemd-libs @@ -203,34 +203,34 @@ pkgname = systemd-libs-selinux pkgname = systemd-resolvconf-selinux pkgdesc = systemd resolvconf replacement with SELinux support (for use with systemd-resolved) - depends = systemd-selinux=257.7 + depends = systemd-selinux=258 provides = openresolv provides = resolvconf - provides = systemd-resolvconf=257.7-1 + provides = systemd-resolvconf=258-1 conflicts = resolvconf - conflicts = systemd-resolvconf=257.7-1 + conflicts = systemd-resolvconf=258-1 pkgname = systemd-sysvcompat-selinux pkgdesc = sysvinit compat for systemd with SELinux support - depends = systemd-selinux=257.7 - provides = systemd-sysvcompat=257.7-1 - provides = selinux-systemd-sysvcompat=257.7-1 + depends = systemd-selinux=258 + provides = systemd-sysvcompat=258-1 + provides = selinux-systemd-sysvcompat=258-1 conflicts = sysvinit conflicts = systemd-sysvcompat conflicts = selinux-systemd-sysvcompat pkgname = systemd-tests-selinux pkgdesc = systemd tests with SELinux support - depends = systemd-selinux=257.7 - provides = systemd-tests=257.7-1 + depends = systemd-selinux=258 + provides = systemd-tests=258-1 pkgname = systemd-ukify-selinux pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image with SELinux support - depends = systemd-selinux=257.7 + depends = systemd-selinux=258 depends = binutils depends = python-cryptography depends = python-pefile optdepends = python-pillow: Show the size of splash image optdepends = sbsigntools: Sign the embedded kernel provides = ukify - provides = systemd-ukify=257.7-1 + provides = systemd-ukify=258-1 diff --git a/systemd-selinux/0001-Use-Arch-Linux-device-access-groups.patch b/systemd-selinux/0001-Use-Arch-Linux-device-access-groups.patch index 79c23585..847577b8 100644 --- a/systemd-selinux/0001-Use-Arch-Linux-device-access-groups.patch +++ b/systemd-selinux/0001-Use-Arch-Linux-device-access-groups.patch @@ -1,4 +1,4 @@ -From dfdd57b81916ac4c9a69b4c4400a9145d9746e9f Mon Sep 17 00:00:00 2001 +From 24112f5adb393febab43dbff3a8533146b25d7a3 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 6 Mar 2018 23:39:47 +0100 Subject: [PATCH] Use Arch Linux' device access groups @@ -14,14 +14,15 @@ Subject: [PATCH] Use Arch Linux' device access groups 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meson.build b/meson.build -index d392610625..ab8689da68 100644 +index e87c8ea2ec..8f56e87b68 100644 --- a/meson.build +++ b/meson.build -@@ -940,19 +940,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group) +@@ -949,20 +949,20 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group) static_ugids = [] foreach option : ['adm-gid', 'audio-gid', - 'cdrom-gid', + 'clock-gid', - 'dialout-gid', 'disk-gid', 'input-gid', @@ -41,21 +42,23 @@ index d392610625..ab8689da68 100644 'wheel-gid', 'systemd-journal-gid', diff --git a/meson_options.txt b/meson_options.txt -index 78ec25bfa3..0ac81db762 100644 +index c616f23297..3999595c2f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -287,10 +287,6 @@ option('adm-gid', type : 'integer', value : 0, +@@ -289,12 +289,8 @@ option('adm-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "adm" group') option('audio-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "audio" group') -option('cdrom-gid', type : 'integer', value : 0, - description : 'soft-static allocation for the "cdrom" group') + option('clock-gid', type : 'integer', value : 0, + description : 'soft-static allocation for the "clock" group') -option('dialout-gid', type : 'integer', value : 0, - description : 'soft-static allocation for the "dialout" group') option('disk-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "disk" group') option('input-gid', type : 'integer', value : 0, -@@ -301,18 +297,22 @@ option('kvm-gid', type : 'integer', value : 0, +@@ -305,18 +301,22 @@ option('kvm-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "kvm" group') option('lp-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "lp" group') @@ -81,19 +84,19 @@ index 78ec25bfa3..0ac81db762 100644 description : 'soft-static allocation for the "video" group') option('wheel-gid', type : 'integer', value : 0, diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in -index 6f80feeecf..40c1bf3dbc 100644 +index 078a78ad1a..c54ef92943 100644 --- a/rules.d/50-udev-default.rules.in +++ b/rules.d/50-udev-default.rules.in -@@ -39,7 +39,7 @@ SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666" +@@ -41,7 +41,7 @@ SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666" SUBSYSTEM=="tty", KERNEL=="tty", GROUP="tty", MODE="0666" - SUBSYSTEM=="tty", KERNEL=="tty[0-9]*|hvc[0-9]*|sclp_line[0-9]*|ttysclp[0-9]*|3270/tty[0-9]*", GROUP="tty", MODE="0620" + 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}}" SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" -KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" +KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp" SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" -@@ -86,13 +86,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" +@@ -88,13 +88,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" SUBSYSTEM=="block", GROUP="disk" @@ -114,14 +117,15 @@ index 6f80feeecf..40c1bf3dbc 100644 KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control" diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in -index 992af346ca..86e622e5dd 100644 +index 503a4c4dac..0052690d97 100644 --- a/sysusers.d/basic.conf.in +++ b/sysusers.d/basic.conf.in -@@ -24,17 +24,17 @@ g utmp {{UTMP_GID }} - - +@@ -24,18 +24,18 @@ g utmp {{UTMP_GID }} - - # Physical and virtual hardware access groups g audio {{AUDIO_GID }} - - -g cdrom {{CDROM_GID }} - - + g clock {{CLOCK_GID }} - - -g dialout {{DIALOUT_GID}} - - g disk {{DISK_GID }} - - g input {{INPUT_GID }} - - @@ -138,3 +142,4 @@ index 992af346ca..86e622e5dd 100644 g video {{VIDEO_GID }} - - # Default group for normal users + diff --git a/systemd-selinux/PKGBUILD b/systemd-selinux/PKGBUILD index 4f787b49..cbf6bf89 100644 --- a/systemd-selinux/PKGBUILD +++ b/systemd-selinux/PKGBUILD @@ -24,7 +24,7 @@ pkgname=('systemd-selinux' # Upstream versioning is incompatible with pacman's version comparisons, one # way or another. We use proper version for pacman here (no dash for rc # release!), and change in source array below. -pkgver=257.7 +pkgver=258 pkgrel=1 arch=('x86_64' 'aarch64') license=('LGPL-2.1-or-later') @@ -66,8 +66,8 @@ source=("git+https://github.com/systemd/systemd#tag=v${pkgver/rc/-rc}?signed" '30-systemd-tmpfiles.hook' '30-systemd-udev-reload.hook' '30-systemd-update.hook') -sha512sums=('94c4f1fa540395653594d25a9633a47d2ce3053f0511b041b0ec73ddbb0db7877a50563be6c3ac3c9c5d1f5964b88a7de17f5fbd843e1391123ee6f0227fbd02' - '78065bde708118b7d6e4ed492e096c763e4679a1c54bd98750d5d609d8cc2f1373023f308880f14fc923ae7f9fea34824917ef884c0f996b1f43d08ef022c0fb' +sha512sums=('4703b54464ae42acb9e8b2a123f9e76cbe94b03c416292a95b9a8eb282eb2908e0499294b8c7f9bbb7946147e9379db7b277d1c277a08ee00f92f8d0eff33330' + '5760869e7c7c53022903bb90bb77d8d583fce154abad08d51eba7d98a6dbb76c21eb30ff4ef3b3d807ba50d320830847283fea3dffc4d0cdf82a3fd06e817e5b' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' @@ -258,10 +258,14 @@ package_systemd-selinux() { # runtime libraries shipped with systemd-libs install -d -m0755 systemd-libs/lib/ + mkdir -p systemd-libs/lib/pkgconfig systemd-libs/include systemd-libs/man3 + mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs/lib/ - mv "$pkgdir"/usr/lib/pkgconfig systemd-libs/lib/pkgconfig - mv "$pkgdir"/usr/include systemd-libs/include - mv "$pkgdir"/usr/share/man/man3 systemd-libs/man3 + mv "$pkgdir"/usr/lib/pkgconfig/* systemd-libs/lib/pkgconfig/ + cp -r "$pkgdir"/usr/include systemd-libs/include + cp -r "$pkgdir"/usr/share/man/man3 systemd-libs/man3 + rm -rf "$pkgdir/usr/include" + rm -rf "$pkgdir/usr/share/man/man3" # ukify shipped in separate package install -d -m0755 systemd-ukify/{bin,systemd,man1,install.d} From f823354b3832a5e4d750f1cc858fc67067bb4ff9 Mon Sep 17 00:00:00 2001 From: Ar Rakin Date: Tue, 23 Sep 2025 21:17:39 +0600 Subject: [PATCH 2/3] systemd: correctly copy header files to systemd-libs/ during build --- systemd-selinux/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd-selinux/PKGBUILD b/systemd-selinux/PKGBUILD index cbf6bf89..a230a2b6 100644 --- a/systemd-selinux/PKGBUILD +++ b/systemd-selinux/PKGBUILD @@ -262,8 +262,8 @@ package_systemd-selinux() { mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs/lib/ mv "$pkgdir"/usr/lib/pkgconfig/* systemd-libs/lib/pkgconfig/ - cp -r "$pkgdir"/usr/include systemd-libs/include - cp -r "$pkgdir"/usr/share/man/man3 systemd-libs/man3 + cp -r "$pkgdir"/usr/include/* systemd-libs/include/ + cp -r "$pkgdir"/usr/share/man/man3/* systemd-libs/man3/ rm -rf "$pkgdir/usr/include" rm -rf "$pkgdir/usr/share/man/man3" From fbc668478808cd5940a400114ee362ca1d8f35ac Mon Sep 17 00:00:00 2001 From: Ar Rakin Date: Fri, 26 Sep 2025 22:32:23 +0600 Subject: [PATCH 3/3] systemd: revert installation logic change --- systemd-selinux/PKGBUILD | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/systemd-selinux/PKGBUILD b/systemd-selinux/PKGBUILD index a230a2b6..fdf04571 100644 --- a/systemd-selinux/PKGBUILD +++ b/systemd-selinux/PKGBUILD @@ -258,14 +258,11 @@ package_systemd-selinux() { # runtime libraries shipped with systemd-libs install -d -m0755 systemd-libs/lib/ - mkdir -p systemd-libs/lib/pkgconfig systemd-libs/include systemd-libs/man3 mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs/lib/ - mv "$pkgdir"/usr/lib/pkgconfig/* systemd-libs/lib/pkgconfig/ - cp -r "$pkgdir"/usr/include/* systemd-libs/include/ - cp -r "$pkgdir"/usr/share/man/man3/* systemd-libs/man3/ - rm -rf "$pkgdir/usr/include" - rm -rf "$pkgdir/usr/share/man/man3" + mv "$pkgdir"/usr/lib/pkgconfig systemd-libs/lib/pkgconfig + mv "$pkgdir"/usr/include systemd-libs/include + mv "$pkgdir"/usr/share/man/man3 systemd-libs/man3 # ukify shipped in separate package install -d -m0755 systemd-ukify/{bin,systemd,man1,install.d}