[arch-commits] Commit in systemd/trunk (2 files)

[Christian Hesse]

    Date: Monday, December 27, 2021 @ 22:56:08
  Author: eworm
Revision: 433212

upgpkg: systemd 250-3: get back tmpfiles.d/legacy.conf

Modified:
  systemd/trunk/0001-Use-Arch-Linux-device-access-groups.patch
  systemd/trunk/PKGBUILD

------------------------------------------------+
 0001-Use-Arch-Linux-device-access-groups.patch |   39 +++++++++++++++++++++--
 PKGBUILD                                       |    4 +-
 2 files changed, 38 insertions(+), 5 deletions(-)

Modified: 0001-Use-Arch-Linux-device-access-groups.patch
===================================================================
--- 0001-Use-Arch-Linux-device-access-groups.patch	2021-12-27 21:56:06 UTC (rev 433211)
+++ 0001-Use-Arch-Linux-device-access-groups.patch	2021-12-27 22:56:08 UTC (rev 433212)
@@ -2,9 +2,6 @@
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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
@@ -141,3 +138,39 @@
  g video   {{VIDEO_GID  }}     -            -
  
  # Default group for normal users
+From 14de5ced41edc9fa8e380330c03adc89ef257fbc Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at 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/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
+index b8d3919025..000bd0bd22 100644
+--- a/tmpfiles.d/meson.build
++++ b/tmpfiles.d/meson.build
+@@ -27,7 +27,7 @@ foreach pair : files
+ endforeach
+ 
+ in_files = [['etc.conf',                      ''],
+-            ['legacy.conf',                   'HAVE_SYSV_COMPAT'],
++            ['legacy.conf',                   ''],
+             ['static-nodes-permissions.conf', ''],
+             ['systemd.conf',                  ''],
+             ['var.conf',                      ''],

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-27 21:56:06 UTC (rev 433211)
+++ PKGBUILD	2021-12-27 22:56:08 UTC (rev 433212)
@@ -7,7 +7,7 @@
 _tag='9c8279cdd5d0bc256b8cc0ced2312e27e069a214' # git rev-parse v${_tag_name}
 _tag_name=250
 pkgver="${_tag_name/-/}"
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -42,7 +42,7 @@
         '30-systemd-update.hook')
 sha512sums=('SKIP'
             'SKIP'
-            '10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1'
+            'cc0c2ffb5f7c3a7176cd68f3dddd85ca000dcc4cdf3044746a20147234adb6811800fd28a4713faa6a59bf8c02be9fd43c2d6aa6695fd1dbf03ae773a91d090c'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
             '5479c8ef963ff247381392907c13308b4ae3a9383c867bd4c8a318b159f23acdb4be5f4ddae0dab4665f4927d3f30166077b1d3aaa2cde6bf53d023b7abb939c'
             'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'