summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2021-07-04 07:33:35 +0300
committerYurii Kolesnykov2021-07-04 07:33:35 +0300
commit395a17eee8f209ffe04d5a3e7dc0fa3324fdf0f7 (patch)
treeaad34a3b79d6c759aa915f7faa5b3e93602839a8
parent8d8190882adce2a6a7c4896348334392f443b1fc (diff)
downloadaur-395a17eee8f209ffe04d5a3e7dc0fa3324fdf0f7.tar.gz
sync with testing/systemd
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r--.SRCINFO18
-rw-r--r--0001-Use-Arch-Linux-device-access-groups.patch98
-rw-r--r--PKGBUILD9
3 files changed, 98 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7c95e6048c9..411956b7a2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-git
pkgdesc = systemd (git version)
- pkgver = 249.rc1.r53.gb905f3bbba
+ pkgver = 249.rc3.r19.g07eabc2beb
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
@@ -23,6 +23,7 @@ pkgbase = systemd-git
makedepends = libxslt
makedepends = util-linux
makedepends = linux-api-headers
+ makedepends = python-jinja
makedepends = python-lxml
makedepends = quota-tools
makedepends = shadow
@@ -40,7 +41,6 @@ pkgbase = systemd-git
makedepends = libfido2
makedepends = tpm2-tss
makedepends = rsync
- makedepends = python-jinja
options = strip
source = git+https://github.com/systemd/systemd
source = 0001-Use-Arch-Linux-device-access-groups.patch
@@ -63,7 +63,7 @@ pkgbase = systemd-git
source = 30-systemd-udev-reload.hook
source = 30-systemd-update.hook
sha512sums = SKIP
- sha512sums = 441c7b16f533eae41495578910a5c112197973614ff5a356256ba076c550122b31634e161abf2f4b43f42264dfc7fcf1a7e2768ba3507d67bbf8a600ca1f9032
+ sha512sums = 10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1
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=249.rc1.r53.gb905f3bbba
+ provides = systemd=249.rc3.r19.g07eabc2beb
provides = nss-myhostname
- provides = systemd-tools=249.rc1.r53.gb905f3bbba
- provides = udev=249.rc1.r53.gb905f3bbba
+ provides = systemd-tools=249.rc3.r19.g07eabc2beb
+ provides = udev=249.rc3.r19.g07eabc2beb
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=249.rc1.r53.gb905f3bbba
+ provides = systemd-libs=249.rc3.r19.g07eabc2beb
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=249.rc1.r53.gb905f3bbba
+ provides = systemd-resolvconf=249.rc3.r19.g07eabc2beb
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=249.rc1.r53.gb905f3bbba
+ provides = systemd-sysvcompat=249.rc3.r19.g07eabc2beb
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 8211de9f3b4..6449c017db0 100644
--- a/0001-Use-Arch-Linux-device-access-groups.patch
+++ b/0001-Use-Arch-Linux-device-access-groups.patch
@@ -1,14 +1,88 @@
-From cd141e77470b2b2dc7c630ed2f65c3111710aaf9 Mon Sep 17 00:00:00 2001
-From: Yurii Kolesnykov <root@yurikoles.com>
-Date: Thu, 17 Jun 2021 20:09:14 +0300
+From f7d07e298c819a81eab965efbdbf53a2ce67fc0e 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
-Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
+ cdrom → optical
+ dialout → uucp
+ tape → storage
---
+ meson.build | 6 +++---
+ meson_options.txt | 12 ++++++------
rules.d/50-udev-default.rules.in | 14 +++++++-------
sysusers.d/basic.conf.in | 6 +++---
- 2 files changed, 10 insertions(+), 10 deletions(-)
+ 4 files changed, 19 insertions(+), 19 deletions(-)
+diff --git a/meson.build b/meson.build
+index 32e5413a62..f781e06fed 100644
+--- a/meson.build
++++ b/meson.build
+@@ -796,19 +796,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group)
+ static_ugids = []
+ foreach option : ['adm-gid',
+ 'audio-gid',
+- 'cdrom-gid',
+- 'dialout-gid',
+ 'disk-gid',
+ 'input-gid',
+ 'kmem-gid',
+ 'kvm-gid',
+ 'lp-gid',
++ 'optical-gid',
+ 'render-gid',
+ 'sgx-gid',
+- 'tape-gid',
++ 'storage-gid',
+ 'tty-gid',
+ 'users-gid',
+ 'utmp-gid',
++ 'uucp-gid',
+ 'video-gid',
+ 'wheel-gid',
+ 'systemd-journal-gid',
+diff --git a/meson_options.txt b/meson_options.txt
+index 5048de755d..676e5e2e0d 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -235,10 +235,6 @@ option('adm-gid', type : 'integer', value : '-1',
+ description : 'soft-static allocation for the "adm" group')
+ option('audio-gid', type : 'integer', value : '-1',
+ description : 'soft-static allocation for the "audio" group')
+-option('cdrom-gid', type : 'integer', value : '-1',
+- description : 'soft-static allocation for the "cdrom" group')
+-option('dialout-gid', type : 'integer', value : '-1',
+- description : 'soft-static allocation for the "dialout" group')
+ option('disk-gid', type : 'integer', value : '-1',
+ 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',
+ 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',
+ description : 'soft-static allocation for the "render" group')
+ option('sgx-gid', type : 'integer', value : '-1',
+ description : 'soft-static allocation for the "sgx" group')
+-option('tape-gid', type : 'integer', value : '-1',
+- description : 'soft-static allocation for the "tape" group')
++option('storage-gid', type : 'integer', value : '-1',
++ 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',
+ description : 'soft-static allocation for the "users" group')
+ option('utmp-gid', type : 'integer', value : '-1',
+ description : 'soft-static allocation for the "utmp" group')
++option('uucp-gid', type : 'integer', value : '-1',
++ description : 'soft-static allocation for the "uucp" group')
+ option('video-gid', type : 'integer', value : '-1',
+ description : 'soft-static allocation for the "video" group')
+ option('wheel-gid', type : 'integer', value : '-1',
diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
index 18a3cf46bf..f3c440fd89 100644
--- a/rules.d/50-udev-default.rules.in
@@ -43,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..be12c76ab6 100644
+index 8cc1a7cad2..21bb6d8948 100644
--- a/sysusers.d/basic.conf.in
+++ b/sysusers.d/basic.conf.in
-@@ -22,16 +22,16 @@ g utmp {{UTMP_GID }} - -
+@@ -22,17 +22,17 @@ g utmp {{UTMP_GID }} - -
# Physical and virtual hardware access groups
g audio {{AUDIO_GID }} - -
@@ -57,15 +131,13 @@ index 8cc1a7cad2..be12c76ab6 100644
g kmem {{KMEM_GID }} - -
g kvm {{KVM_GID }} - -
g lp {{LP_GID }} - -
-+g optical - - -
++g optical {{OPTICAL_GID}} - -
g render {{RENDER_GID }} - -
g sgx {{SGX_GID }} - -
-g tape {{TAPE_GID }} - -
-+g storage - - -
-+g uucp - - -
++g storage {{STORAGE_GID}} - -
g tty {{TTY_GID }} - -
++g uucp {{UUCP_GID }} - -
g video {{VIDEO_GID }} - -
---
-2.32.0
-
+ # Default group for normal users
diff --git a/PKGBUILD b/PKGBUILD
index 20bd25e3215..d8b3f66d57a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,17 +8,16 @@ _pkgbase=systemd
pkgbase=$_pkgbase-git
pkgname=('systemd-git' 'systemd-libs-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git')
pkgdesc='systemd (git version)'
-pkgver=249.rc1.r53.gb905f3bbba
+pkgver=249.rc3.r19.g07eabc2beb
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'
- 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
+ 'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
- 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync'
- 'python-jinja')
+ 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync')
options=('strip')
source=('git+https://github.com/systemd/systemd'
'0001-Use-Arch-Linux-device-access-groups.patch'
@@ -41,7 +40,7 @@ source=('git+https://github.com/systemd/systemd'
'30-systemd-udev-reload.hook'
'30-systemd-update.hook')
sha512sums=('SKIP'
- '441c7b16f533eae41495578910a5c112197973614ff5a356256ba076c550122b31634e161abf2f4b43f42264dfc7fcf1a7e2768ba3507d67bbf8a600ca1f9032'
+ '10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1'
'34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
'8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a'