diff options
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | 0001-Use-Arch-Linux-device-access-groups.patch | 38 | ||||
-rw-r--r-- | PKGBUILD | 6 |
3 files changed, 33 insertions, 27 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-git pkgdesc = systemd (git version) - pkgver = 252.r60763.b6a23ad642 + pkgver = 252.r60865.9df82722f6 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 = d53034fcb1c8ebaee6f3abc3bf55766d0948ba87129e15da1609c8f84d9340f8ff18642db04e5ee5e05b2bab208a18e39a0170981c55e010b7dbc18c6dfa0fdc + sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73 sha512sums = aeefb607471cffb5ed4c3d9f36dc0954a9a08cee4b7b4ff55468b561e089e3d8448398906a7df328049ba51b712e4d50698b96bc152bdb03a35ce39c3f51a7cb sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6 @@ -128,9 +128,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=252.r60763.b6a23ad642 - provides = udev=252.r60763.b6a23ad642 - provides = systemd=252.r60763.b6a23ad642 + provides = systemd-tools=252.r60865.9df82722f6 + provides = udev=252.r60865.9df82722f6 + provides = systemd=252.r60865.9df82722f6 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -168,7 +168,7 @@ pkgname = systemd-libs-git provides = libsystemd provides = libsystemd.so provides = libudev.so - provides = systemd-libs=252.r60763.b6a23ad642 + provides = systemd-libs=252.r60865.9df82722f6 conflicts = libsystemd conflicts = systemd-libs replaces = libsystemd @@ -179,7 +179,7 @@ pkgname = systemd-resolvconf-git depends = systemd-git provides = openresolv provides = resolvconf - provides = systemd-resolvconf=252.r60763.b6a23ad642 + provides = systemd-resolvconf=252.r60865.9df82722f6 conflicts = openresolv conflicts = systemd-resolvconf @@ -187,6 +187,6 @@ pkgname = systemd-sysvcompat-git pkgdesc = sysvinit compat for systemd (git version) license = GPL2 depends = systemd-git - provides = systemd-sysvcompat=252.r60763.b6a23ad642 + provides = systemd-sysvcompat=252.r60865.9df82722f6 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 0a55b8d30838..d88486575209 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 0e8c18bc2639da328274d02d9222ee2c1f6bf696 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 +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 76ad51d3fb..5cf679b088 100644 --- a/meson.build +++ b/meson.build -@@ -796,19 +796,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group) +@@ -915,19 +915,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group) static_ugids = [] foreach option : ['adm-gid', 'audio-gid', @@ -41,7 +44,7 @@ index 32e5413a62..f781e06fed 100644 'wheel-gid', 'systemd-journal-gid', diff --git a/meson_options.txt b/meson_options.txt -index d5237f02ae..7b531c4710 100644 +index 814f340840..253a77ecb3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -257,10 +257,6 @@ option('adm-gid', type : 'integer', value : 0, @@ -55,12 +58,14 @@ index d5237f02ae..7b531c4710 100644 option('disk-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "disk" group') option('input-gid', type : 'integer', value : 0, -@@ -273,16 +269,20 @@ option('lp-gid', type : 'integer', value : 0, +@@ -271,18 +267,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') - option('render-gid', type : 'integer', value : 0, - description : 'soft-static allocation for the "render" group') +option('optical-gid', type : 'integer', value : '0', + description : 'soft-static allocation for the "optical" group') + option('render-gid', type : 'integer', value : 0, + description : 'soft-static allocation for the "render" group') option('sgx-gid', type : 'integer', value : 0, description : 'soft-static allocation for the "sgx" group') -option('tape-gid', type : 'integer', value : 0, @@ -79,10 +84,10 @@ index d5237f02ae..7b531c4710 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 18a3cf46bf..f3c440fd89 100644 +index 843bdaf9ce..a192f091df 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" @@ -91,7 +96,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" @@ -112,10 +117,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 }} - - @@ -136,10 +141,12 @@ index 8cc1a7cad2..21bb6d8948 100644 g video {{VIDEO_GID }} - - # Default group for normal users -From 14de5ced41edc9fa8e380330c03adc89ef257fbc Mon Sep 17 00:00:00 2001 + +From 9e2987a7b4d09d7b554141e9ef2c911cb3fda570 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 + --- tmpfiles.d/legacy.conf.in | 3 --- tmpfiles.d/meson.build | 2 +- @@ -160,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', ''], @@ -172,4 +179,3 @@ index b8d3919025..000bd0bd22 100644 ['static-nodes-permissions.conf', ''], ['systemd.conf', ''], ['var.conf', ''], - @@ -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=252.r60763.b6a23ad642 +pkgver=252.r60865.9df82722f6 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' - 'd53034fcb1c8ebaee6f3abc3bf55766d0948ba87129e15da1609c8f84d9340f8ff18642db04e5ee5e05b2bab208a18e39a0170981c55e010b7dbc18c6dfa0fdc' + '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' 'aeefb607471cffb5ed4c3d9f36dc0954a9a08cee4b7b4ff55468b561e089e3d8448398906a7df328049ba51b712e4d50698b96bc152bdb03a35ce39c3f51a7cb' 'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6' @@ -85,7 +85,7 @@ build() { local _meson_options=( # internal version comparison is incompatible with pacman: # 249~rc1 < 249 < 249.1 < 249rc - -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-arch" + -Dversion-tag="${pkgver}-${pkgrel}-arch" -Dshared-lib-tag="${pkgver}-${pkgrel}" -Dmode=release |