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

[Christian Hesse]

    Date: Thursday, March 18, 2021 @ 12:08:16
  Author: eworm
Revision: 410219

upgpkg: systemd 248rc4-1: new upstream pre-release

For testing only, do not move!

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

------------------------------------------------+
 0001-Use-Arch-Linux-device-access-groups.patch |   11 ++++++-----
 PKGBUILD                                       |   18 +++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

Modified: 0001-Use-Arch-Linux-device-access-groups.patch
===================================================================
--- 0001-Use-Arch-Linux-device-access-groups.patch	2021-03-18 11:09:35 UTC (rev 410218)
+++ 0001-Use-Arch-Linux-device-access-groups.patch	2021-03-18 12:08:16 UTC (rev 410219)
@@ -7,11 +7,11 @@
   tape    → storage
 ---
  rules.d/50-udev-default.rules.in | 14 +++++++-------
- sysusers.d/basic.conf.in       |  6 +++---
+ 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 191f56f42..f81c4d0fc 100644
+index edfa8bb107..35b8d4ba41 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"
@@ -23,7 +23,7 @@
  
  SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
  
-@@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
+@@ -62,13 +62,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
  SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
  
  SUBSYSTEM=="block", GROUP="disk"
@@ -44,10 +44,10 @@
  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 8e358c02d..33e513a36 100644
+index 4be0bd869e..cc3721b58a 100644
 --- a/sysusers.d/basic.conf.in
 +++ b/sysusers.d/basic.conf.in
-@@ -24,14 +24,14 @@ g utmp    -     -            -
+@@ -24,15 +24,15 @@ g utmp    -     -            -
  
  # Hardware access groups
  g audio   -     -            -
@@ -59,6 +59,7 @@
  g lp      -     -            -
 +g optical -     -            -
  g render  -     -            -
+ g sgx     -     -            -
 -g tape    -     -            -
 +g storage -     -            -
 +g uucp    -     -            -

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-18 11:09:35 UTC (rev 410218)
+++ PKGBUILD	2021-03-18 12:08:16 UTC (rev 410219)
@@ -4,9 +4,10 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
-_tag='f948f652768a5279087e13961ebb87f345626e2e' # git rev-parse v${pkgver}
-pkgver=247.4
-pkgrel=2
+_tag='e878547b1a4aaee27c90e835a986a6a96a00c507' # git rev-parse v${_tag_name}
+_tag_name=248-rc4
+pkgver="${_tag_name/-/}"
+pkgrel=1
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -19,7 +20,7 @@
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart at poettering.net>
               '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
 source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
-        "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
+        "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"
         '0001-Use-Arch-Linux-device-access-groups.patch'
         'initcpio-hook-udev'
         'initcpio-install-systemd'
@@ -40,7 +41,7 @@
         '30-systemd-update.hook')
 sha512sums=('SKIP'
             'SKIP'
-            'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
+            '5b7cf0b51df7ee76f9dc644aee1084f88748791e9e37a35d99781846d21574a16e8e84f4f26dacd60a8f9da3be0aaafc4312877b7d0959f654aeaf0086665e57'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
             '8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
@@ -63,8 +64,6 @@
 )
 
 _reverts=(
-  # resolved: gracefully handle with packets with too large RR count
-  'fdfffdaf20a18a50c9a6d858359cf4af6d2f4c8b'
 )
 
 prepare() {
@@ -118,7 +117,7 @@
     
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
     -Ddefault-dnssec=no
-    -Ddefault-hierarchy=hybrid
+    -Ddefault-hierarchy=unified
     -Ddefault-kill-user-processes=false
     -Ddefault-locale=C
     -Ddns-over-tls=openssl
@@ -165,6 +164,7 @@
           etc/systemd/journal-upload.conf
           etc/systemd/logind.conf
           etc/systemd/networkd.conf
+          etc/systemd/oomd.conf
           etc/systemd/pstore.conf
           etc/systemd/resolved.conf
           etc/systemd/sleep.conf
@@ -231,7 +231,7 @@
 
 package_systemd-libs() {
   pkgdesc='systemd client libraries'
-  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz' 'zstd')
+  depends=('glibc' 'libcap' 'libgcrypt' 'libp11-kit' 'lz4' 'xz' 'zstd')
   license=('LGPL2.1')
   provides=('libsystemd' 'libsystemd.so' 'libudev.so')
   conflicts=('libsystemd')