eworms patch of same effect was applied upstream

3 files changed, 18 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c12d729..75ed173 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-git
 	pkgdesc = systemd (git version)
-	pkgver = 257.rc2.r77730.d209e197f89
+	pkgver = 257.rc2.r77745.4b356c90dcc
 	pkgrel = 1
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
@@ -73,7 +73,7 @@ pkgbase = systemd-git
 	source = 30-systemd-udev-reload.hook
 	source = 30-systemd-update.hook
 	sha512sums = SKIP
-	sha512sums = bf09fbaddbc5429c98d04f4c2e02415c6cb2c8e3314c3aaa898cbf324e09bc6790b190ee1338689e02961eaf8276d02bd08b83d423d6e6d5ebb62467f5a9d683
+	sha512sums = 407089fb35ccc701dd44022bcbd86bb30034c99ae160234d9d3c354a54eced2bd47ca9059e01fb65d730ad2b0e9e8501a2cab0b2f97a1ba5f73794122b0dd8d5
 	sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
 	sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
 	sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
@@ -97,7 +97,7 @@ pkgname = systemd-git
 	license = CC0-1.0
 	license = GPL-2.0-or-later
 	license = MIT-0
-	depends = systemd-libs-git=257.rc2.r77730.d209e197f89
+	depends = systemd-libs-git=257.rc2.r77745.4b356c90dcc
 	depends = acl
 	depends = libacl.so
 	depends = bash
@@ -132,7 +132,7 @@ pkgname = systemd-git
 	optdepends = libmicrohttpd: systemd-journal-gatewayd and systemd-journal-remote
 	optdepends = quota-tools: kernel-level quota management
 	optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries
-	optdepends = systemd-ukify-git=257.rc2.r77730.d209e197f89: combine kernel and initrd into a signed Unified Kernel Image
+	optdepends = systemd-ukify-git=257.rc2.r77745.4b356c90dcc: combine kernel and initrd into a signed Unified Kernel Image
 	optdepends = polkit: allow administration as unprivileged user
 	optdepends = python: Unified Kernel Image with ukify
 	optdepends = curl: systemd-journal-upload, machinectl pull-tar and pull-raw
@@ -146,9 +146,9 @@ pkgname = systemd-git
 	optdepends = libp11-kit: support PKCS#11
 	optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
 	provides = nss-myhostname
-	provides = systemd-tools=257.rc2.r77730.d209e197f89
-	provides = udev=257.rc2.r77730.d209e197f89
-	provides = systemd=257.rc2.r77730.d209e197f89
+	provides = systemd-tools=257.rc2.r77745.4b356c90dcc
+	provides = udev=257.rc2.r77745.4b356c90dcc
+	provides = systemd=257.rc2.r77745.4b356c90dcc
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -189,41 +189,41 @@ pkgname = systemd-libs-git
 	provides = libsystemd
 	provides = libsystemd.so
 	provides = libudev.so
-	provides = systemd-libs=257.rc2.r77730.d209e197f89
+	provides = systemd-libs=257.rc2.r77745.4b356c90dcc
 	conflicts = libsystemd
 	conflicts = systemd-libs
 	replaces = libsystemd
 
 pkgname = systemd-resolvconf-git
 	pkgdesc = systemd resolvconf replacement (for use with systemd-resolved) (git version)
-	depends = systemd-git=257.rc2.r77730.d209e197f89
+	depends = systemd-git=257.rc2.r77745.4b356c90dcc
 	provides = openresolv
 	provides = resolvconf
-	provides = systemd-resolvconf=257.rc2.r77730.d209e197f89
+	provides = systemd-resolvconf=257.rc2.r77745.4b356c90dcc
 	conflicts = resolvconf
 	conflicts = systemd-resolvconf
 
 pkgname = systemd-sysvcompat-git
 	pkgdesc = sysvinit compat for systemd (git version)
-	depends = systemd-git=257.rc2.r77730.d209e197f89
-	provides = systemd-sysvcompat=257.rc2.r77730.d209e197f89
+	depends = systemd-git=257.rc2.r77745.4b356c90dcc
+	provides = systemd-sysvcompat=257.rc2.r77745.4b356c90dcc
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 
 pkgname = systemd-tests-git
 	pkgdesc = systemd tests (git version)
-	depends = systemd=257.rc2.r77730.d209e197f89
-	provides = systemd-tests=257.rc2.r77730.d209e197f89
+	depends = systemd=257.rc2.r77745.4b356c90dcc
+	provides = systemd-tests=257.rc2.r77745.4b356c90dcc
 	conflicts = systemd-tests
 
 pkgname = systemd-ukify-git
 	pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image (git version)
-	depends = systemd-git=257.rc2.r77730.d209e197f89
+	depends = systemd-git=257.rc2.r77745.4b356c90dcc
 	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.rc2.r77730.d209e197f89
+	provides = systemd-ukify=257.rc2.r77745.4b356c90dcc
 	conflicts = systemd-ukify
diff --git a/0001-Use-Arch-Linux-device-access-groups.patch b/0001-Use-Arch-Linux-device-access-groups.patch
index 7b9d674..78c9f33 100644
--- a/0001-Use-Arch-Linux-device-access-groups.patch
+++ b/0001-Use-Arch-Linux-device-access-groups.patch
@@ -143,31 +143,5 @@ index a602b872e4..8d38febb6a 100644
  # Default group for normal users
 
 
-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 +-
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in
-index 4f2c0d7c43..62e2ae0986 100644
---- a/tmpfiles.d/legacy.conf.in
-+++ b/tmpfiles.d/legacy.conf.in
-@@ -12,9 +12,6 @@
- 
- d /run/lock 0755 root root -
- L /var/lock - - - - ../run/lock
--{% if CREATE_LOG_DIRS %}
--L$ /var/log/README - - - - ../..{{DOC_DIR}}/README.logs
--{% endif %}
- 
- # /run/lock/subsys is used for serializing SysV service execution, and
- # hence without use on SysV-less systems.
-
-
 --
 
diff --git a/PKGBUILD b/PKGBUILD
index 244c803..e8d6180 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('systemd-git'
          'systemd-tests-git'
          'systemd-ukify-git')
 pkgdesc='systemd (git version)'
-pkgver=257.rc2.r77730.d209e197f89
+pkgver=257.rc2.r77745.4b356c90dcc
 pkgrel=1
 arch=('x86_64')
 license=('LGPL-2.1-or-later')
@@ -46,7 +46,7 @@ source=("$pkgbase-stable::git+https://github.com/systemd/systemd"
         '30-systemd-udev-reload.hook'
         '30-systemd-update.hook')
 sha512sums=('SKIP'
-            'bf09fbaddbc5429c98d04f4c2e02415c6cb2c8e3314c3aaa898cbf324e09bc6790b190ee1338689e02961eaf8276d02bd08b83d423d6e6d5ebb62467f5a9d683'
+            '407089fb35ccc701dd44022bcbd86bb30034c99ae160234d9d3c354a54eced2bd47ca9059e01fb65d730ad2b0e9e8501a2cab0b2f97a1ba5f73794122b0dd8d5'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
             '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'