diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | 0001-Use-Arch-Linux-device-access-groups.patch | 76 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
3 files changed, 52 insertions, 44 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-git pkgdesc = systemd (git version) - pkgver = 251.r58405.4e5c39597a + pkgver = 251.r58942.91375fb9cf pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 @@ -61,7 +61,7 @@ pkgbase = systemd-git source = 30-systemd-udev-reload.hook source = 30-systemd-update.hook sha512sums = SKIP - sha512sums = cc0c2ffb5f7c3a7176cd68f3dddd85ca000dcc4cdf3044746a20147234adb6811800fd28a4713faa6a59bf8c02be9fd43c2d6aa6695fd1dbf03ae773a91d090c + sha512sums = e9d16140a2b412c1d2f61fb27543baee40cc9369e6545abf6a06f99af5a07c3df536083ffe058b4a6467ec9dcefc99a75eae730a9ffc58533511ef752a6e2763 sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73 sha512sums = aeefb607471cffb5ed4c3d9f36dc0954a9a08cee4b7b4ff55468b561e089e3d8448398906a7df328049ba51b712e4d50698b96bc152bdb03a35ce39c3f51a7cb sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6 @@ -126,9 +126,9 @@ pkgname = systemd-git optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 provides = nss-myhostname - provides = systemd-tools=251.r58405.4e5c39597a - provides = udev=251.r58405.4e5c39597a - provides = systemd=251.r58405.4e5c39597a + provides = systemd-tools=251.r58942.91375fb9cf + provides = udev=251.r58942.91375fb9cf + provides = systemd=251.r58942.91375fb9cf conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -166,7 +166,7 @@ pkgname = systemd-libs-git provides = libsystemd provides = libsystemd.so provides = libudev.so - provides = systemd-libs=251.r58405.4e5c39597a + provides = systemd-libs=251.r58942.91375fb9cf conflicts = libsystemd conflicts = systemd-libs replaces = libsystemd @@ -177,7 +177,7 @@ pkgname = systemd-resolvconf-git depends = systemd-git provides = openresolv provides = resolvconf - provides = systemd-resolvconf=251.r58405.4e5c39597a + provides = systemd-resolvconf=251.r58942.91375fb9cf conflicts = openresolv conflicts = systemd-resolvconf @@ -185,6 +185,6 @@ pkgname = systemd-sysvcompat-git pkgdesc = sysvinit compat for systemd (git version) license = GPL2 depends = systemd-git - provides = systemd-sysvcompat=251.r58405.4e5c39597a + provides = systemd-sysvcompat=251.r58942.91375fb9cf conflicts = sysvinit conflicts = systemd-sysvcompat diff --git a/0001-Use-Arch-Linux-device-access-groups.patch b/0001-Use-Arch-Linux-device-access-groups.patch index 6f7dd4a18a60..4935de58f7c7 100644 --- a/0001-Use-Arch-Linux-device-access-groups.patch +++ b/0001-Use-Arch-Linux-device-access-groups.patch @@ -1,7 +1,10 @@ -From f7d07e298c819a81eab965efbdbf53a2ce67fc0e Mon Sep 17 00:00:00 2001 +From c553f5d0c0e4dcbba02b34e997f5af872064e763 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Tue, 6 Mar 2018 23:39:47 +0100 -Subject: [PATCH] Use Arch Linux' device access groups +Subject: [PATCH 1/2] Use Arch Linux' device access groups +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit cdrom → optical dialout → uucp @@ -14,10 +17,10 @@ Subject: [PATCH] Use Arch Linux' device access groups 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meson.build b/meson.build -index 32e5413a62..f781e06fed 100644 +index 6bbb2db55d..2ef5c3c344 100644 --- a/meson.build +++ b/meson.build -@@ -796,19 +796,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group) +@@ -913,19 +913,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group) static_ugids = [] foreach option : ['adm-gid', 'audio-gid', @@ -41,50 +44,48 @@ index 32e5413a62..f781e06fed 100644 'wheel-gid', 'systemd-journal-gid', diff --git a/meson_options.txt b/meson_options.txt -index 5048de755d..676e5e2e0d 100644 +index d5237f02ae..7b531c4710 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -235,10 +235,6 @@ option('adm-gid', type : 'integer', value : '-1', +@@ -257,10 +257,6 @@ option('adm-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "adm" group') - option('audio-gid', type : 'integer', value : '-1', + option('audio-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "audio" group') --option('cdrom-gid', type : 'integer', value : '-1', +-option('cdrom-gid', type : 'integer', value : 0, - description : 'soft-static allocation for the "cdrom" group') --option('dialout-gid', type : 'integer', value : '-1', +-option('dialout-gid', type : 'integer', value : 0, - description : 'soft-static allocation for the "dialout" group') - option('disk-gid', type : 'integer', value : '-1', + option('disk-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "disk" group') - option('input-gid', type : 'integer', value : '-1', -@@ -249,18 +245,22 @@ option('kvm-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "kvm" group') - option('lp-gid', type : 'integer', value : '-1', + option('input-gid', type : 'integer', value : 0, +@@ -273,16 +269,20 @@ option('lp-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "lp" group') -+option('optical-gid', type : 'integer', value : '-1', -+ description : 'soft-static allocation for the "optical" group') - option('render-gid', type : 'integer', value : '-1', + option('render-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "render" group') - option('sgx-gid', type : 'integer', value : '-1', ++option('optical-gid', type : 'integer', value : '0', ++ description : 'soft-static allocation for the "optical" group') + option('sgx-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "sgx" group') --option('tape-gid', type : 'integer', value : '-1', +-option('tape-gid', type : 'integer', value : 0, - description : 'soft-static allocation for the "tape" group') -+option('storage-gid', type : 'integer', value : '-1', ++option('storage-gid', type : 'integer', value : '0', + description : 'soft-static allocation for the "storage" group') option('tty-gid', type : 'integer', value : 5, description : 'the numeric GID of the "tty" group') - option('users-gid', type : 'integer', value : '-1', + option('users-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "users" group') - option('utmp-gid', type : 'integer', value : '-1', + option('utmp-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "utmp" group') -+option('uucp-gid', type : 'integer', value : '-1', ++option('uucp-gid', type : 'integer', value : '0', + description : 'soft-static allocation for the "uucp" group') - option('video-gid', type : 'integer', value : '-1', + option('video-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "video" group') - option('wheel-gid', type : 'integer', value : '-1', + 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 18a3cf46bf..f3c440fd89 100644 +index 0394530479..0437396cf2 100644 --- a/rules.d/50-udev-default.rules.in +++ b/rules.d/50-udev-default.rules.in -@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" +@@ -26,7 +26,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" @@ -93,7 +94,7 @@ index 18a3cf46bf..f3c440fd89 100644 SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" -@@ -67,13 +67,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" +@@ -72,13 +72,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,10 +115,10 @@ index 18a3cf46bf..f3c440fd89 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 8cc1a7cad2..21bb6d8948 100644 +index a602b872e4..8d38febb6a 100644 --- a/sysusers.d/basic.conf.in +++ b/sysusers.d/basic.conf.in -@@ -22,17 +22,17 @@ g utmp {{UTMP_GID }} - - +@@ -23,17 +23,17 @@ g utmp {{UTMP_GID }} - - # Physical and virtual hardware access groups g audio {{AUDIO_GID }} - - @@ -138,10 +139,14 @@ index 8cc1a7cad2..21bb6d8948 100644 g video {{VIDEO_GID }} - - # Default group for normal users -From 14de5ced41edc9fa8e380330c03adc89ef257fbc Mon Sep 17 00:00:00 2001 +-- +2.37.1 + +From ab2adb92b4f2ca54082eece6cc236626f7208c9e Mon Sep 17 00:00:00 2001 From: Christian Hesse <mail@eworm.de> Date: Mon, 27 Dec 2021 23:32:42 +0100 -Subject: [PATCH] generate tmpfiles.d/legacy.conf +Subject: [PATCH 2/2] generate tmpfiles.d/legacy.conf + --- tmpfiles.d/legacy.conf.in | 3 --- tmpfiles.d/meson.build | 2 +- @@ -162,10 +167,10 @@ index 4f2c0d7c43..62e2ae0986 100644 # /run/lock/subsys is used for serializing SysV service execution, and # hence without use on SysV-less systems. diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build -index b8d3919025..000bd0bd22 100644 +index ca1abbf3fe..25e2b53402 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build -@@ -27,7 +27,7 @@ foreach pair : files +@@ -29,7 +29,7 @@ foreach pair : files endforeach in_files = [['etc.conf', ''], @@ -174,3 +179,6 @@ index b8d3919025..000bd0bd22 100644 ['static-nodes-permissions.conf', ''], ['systemd.conf', ''], ['var.conf', ''], +-- +2.37.1 + @@ -5,7 +5,7 @@ _pkgbase=systemd pkgbase=$_pkgbase-git pkgname=('systemd-git' 'systemd-libs-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git') pkgdesc='systemd (git version)' -pkgver=251.r58405.4e5c39597a +pkgver=251.r58942.91375fb9cf pkgrel=1 arch=('x86_64') url='https://www.github.com/systemd/systemd' @@ -35,7 +35,7 @@ source=('git+https://github.com/systemd/systemd' '30-systemd-udev-reload.hook' '30-systemd-update.hook') sha512sums=('SKIP' - 'cc0c2ffb5f7c3a7176cd68f3dddd85ca000dcc4cdf3044746a20147234adb6811800fd28a4713faa6a59bf8c02be9fd43c2d6aa6695fd1dbf03ae773a91d090c' + 'e9d16140a2b412c1d2f61fb27543baee40cc9369e6545abf6a06f99af5a07c3df536083ffe058b4a6467ec9dcefc99a75eae730a9ffc58533511ef752a6e2763' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' 'aeefb607471cffb5ed4c3d9f36dc0954a9a08cee4b7b4ff55468b561e089e3d8448398906a7df328049ba51b712e4d50698b96bc152bdb03a35ce39c3f51a7cb' 'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6' |