summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2021-06-22 23:16:02 +0300
committerYurii Kolesnykov2021-06-22 23:16:02 +0300
commit8d8190882adce2a6a7c4896348334392f443b1fc (patch)
treec4ef85f0fd33fbf882c82445fc5829bdfc43b120
parent612de875ca7996334288d88fff0b3687095924f7 (diff)
downloadaur-8d8190882adce2a6a7c4896348334392f443b1fc.tar.gz
fix 0001-Use-Arch-Linux-device-access-groups.patch
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r--.SRCINFO16
-rw-r--r--0001-Use-Arch-Linux-device-access-groups.patch57
-rw-r--r--PKGBUILD10
3 files changed, 38 insertions, 45 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4e7e93ca9ba..7c95e6048c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-git
pkgdesc = systemd (git version)
- pkgver = 248.r1416.g33f2de7b64
+ pkgver = 249.rc1.r53.gb905f3bbba
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
@@ -63,7 +63,7 @@ pkgbase = systemd-git
source = 30-systemd-udev-reload.hook
source = 30-systemd-update.hook
sha512sums = SKIP
- sha512sums = 882e486b6d88c8bafc50088845e41a49686e98981967f72ca1fb4ef07a01767400632f4b648fd31857d2a2a24a8fd65bcc2a8983284dd4fff2380732741d4c41
+ sha512sums = 441c7b16f533eae41495578910a5c112197973614ff5a356256ba076c550122b31634e161abf2f4b43f42264dfc7fcf1a7e2768ba3507d67bbf8a600ca1f9032
sha512sums = 34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad
sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
sha512sums = 8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a
@@ -128,10 +128,10 @@ pkgname = systemd-git
optdepends = curl: machinectl pull-tar and pull-raw
optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token
optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
- provides = systemd=248.r1416.g33f2de7b64
+ provides = systemd=249.rc1.r53.gb905f3bbba
provides = nss-myhostname
- provides = systemd-tools=248.r1416.g33f2de7b64
- provides = udev=248.r1416.g33f2de7b64
+ provides = systemd-tools=249.rc1.r53.gb905f3bbba
+ provides = udev=249.rc1.r53.gb905f3bbba
conflicts = systemd
conflicts = nss-myhostname
conflicts = systemd-tools
@@ -166,7 +166,7 @@ pkgname = systemd-libs-git
depends = lz4
depends = xz
depends = zstd
- provides = systemd-libs=248.r1416.g33f2de7b64
+ provides = systemd-libs=249.rc1.r53.gb905f3bbba
provides = libsystemd
provides = libsystemd.so
provides = libudev.so
@@ -178,7 +178,7 @@ pkgname = systemd-resolvconf-git
pkgdesc = systemd resolvconf replacement (for use with systemd-resolved, git version)
license = LGPL2.1
depends = systemd-git
- provides = systemd-resolvconf=248.r1416.g33f2de7b64
+ provides = systemd-resolvconf=249.rc1.r53.gb905f3bbba
provides = openresolv
provides = resolvconf
conflicts = systemd-resolvconf
@@ -188,6 +188,6 @@ pkgname = systemd-sysvcompat-git
pkgdesc = sysvinit compat for systemd (git version)
license = GPL2
depends = systemd-git
- provides = systemd-sysvcompat=248.r1416.g33f2de7b64
+ provides = systemd-sysvcompat=249.rc1.r53.gb905f3bbba
conflicts = systemd-sysvcompat
conflicts = sysvinit
diff --git a/0001-Use-Arch-Linux-device-access-groups.patch b/0001-Use-Arch-Linux-device-access-groups.patch
index 3abb448bfe9..8211de9f3b4 100644
--- a/0001-Use-Arch-Linux-device-access-groups.patch
+++ b/0001-Use-Arch-Linux-device-access-groups.patch
@@ -1,21 +1,16 @@
-From 0000000000000000000000000000000000000000 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
+From cd141e77470b2b2dc7c630ed2f65c3111710aaf9 Mon Sep 17 00:00:00 2001
+From: Yurii Kolesnykov <root@yurikoles.com>
+Date: Thu, 17 Jun 2021 20:09:14 +0300
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
- tape → storage
+Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
---
rules.d/50-udev-default.rules.in | 14 +++++++-------
sysusers.d/basic.conf.in | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
-index edfa8bb107..35b8d4ba41 100644
+index 18a3cf46bf..f3c440fd89 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"
@@ -27,7 +22,7 @@ index edfa8bb107..35b8d4ba41 100644
SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
-@@ -62,13 +62,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
+@@ -67,13 +67,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
SUBSYSTEM=="block", GROUP="disk"
@@ -48,25 +43,29 @@ index edfa8bb107..35b8d4ba41 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 4be0bd869e..cc3721b58a 100644
+index 8cc1a7cad2..be12c76ab6 100644
--- a/sysusers.d/basic.conf.in
+++ b/sysusers.d/basic.conf.in
-@@ -24,15 +24,15 @@ g utmp - - -
+@@ -22,16 +22,16 @@ g utmp {{UTMP_GID }} - -
- # Hardware access groups
- g audio - - -
--g cdrom - - -
--g dialout - - -
- g disk - - -
- g input - - -
- g kvm - - -
- g lp - - -
-+g optical - - -
- g render - - -
- g sgx - - -
--g tape - - -
-+g storage - - -
-+g uucp - - -
- g video - - -
+ # Physical and virtual hardware access groups
+ g audio {{AUDIO_GID }} - -
+-g cdrom {{CDROM_GID }} - -
+-g dialout {{DIALOUT_GID}} - -
+ g disk {{DISK_GID }} - -
+ g input {{INPUT_GID }} - -
+ g kmem {{KMEM_GID }} - -
+ g kvm {{KVM_GID }} - -
+ g lp {{LP_GID }} - -
++g optical - - -
+ g render {{RENDER_GID }} - -
+ g sgx {{SGX_GID }} - -
+-g tape {{TAPE_GID }} - -
++g storage - - -
++g uucp - - -
+ g tty {{TTY_GID }} - -
+ g video {{VIDEO_GID }} - -
- # Default group for normal users
+--
+2.32.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 679f960b33b..20bd25e3215 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ _pkgbase=systemd
pkgbase=$_pkgbase-git
pkgname=('systemd-git' 'systemd-libs-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git')
pkgdesc='systemd (git version)'
-pkgver=248.r1416.g33f2de7b64
+pkgver=249.rc1.r53.gb905f3bbba
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
@@ -41,7 +41,7 @@ source=('git+https://github.com/systemd/systemd'
'30-systemd-udev-reload.hook'
'30-systemd-update.hook')
sha512sums=('SKIP'
- '882e486b6d88c8bafc50088845e41a49686e98981967f72ca1fb4ef07a01767400632f4b648fd31857d2a2a24a8fd65bcc2a8983284dd4fff2380732741d4c41'
+ '441c7b16f533eae41495578910a5c112197973614ff5a356256ba076c550122b31634e161abf2f4b43f42264dfc7fcf1a7e2768ba3507d67bbf8a600ca1f9032'
'34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
'8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a'
@@ -63,12 +63,6 @@ sha512sums=('SKIP'
prepare() {
cd "$_pkgbase"
- # although removing _build folder in build() function feels more natural,
- # that interferes with the spirit of makepkg --noextract
- if [ -d _build ]; then
- rm -rf _build
- fi
-
# Replace cdrom/dialout/tape groups with optical/uucp/storage
patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch