From 02227aeda72f1bfd1f172f56ffb6bec7a1b6792c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 3 Jun 2020 02:01:51 +0000
Subject: [PATCH] core/systemd to 245.6-1

---
 core/systemd/PKGBUILD                 | 17 +++++++-----
 core/systemd/initcpio-install-systemd | 39 ++++++++++++++++++++-------
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index f301bf491..c38fe532f 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -11,8 +11,8 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
 _tag='a520e63382396661d79f630b2babe717a85b1209' # git rev-parse v${pkgver}
-pkgver=245.5
-pkgrel=2
+pkgver=245.6
+pkgrel=1
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -20,7 +20,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-lxml' 'quota-tools' 'shadow' 'git'
              'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
-             'bash-completion' 'p11-kit')
+             'bash-completion' 'p11-kit' 'systemd')
 options=('strip')
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>
               '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
@@ -52,7 +52,7 @@ sha512sums=('SKIP'
             'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
             'df7ec8f840a54b404d1f3ab2708ae2a618820cb411b826128cf10b20ccdab057306446295c6b1c98a05ca0adb1b30d390dfb0156b52ea772978e1f1bf5135e09'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'
+            'bc16cd288fa4fe8f8d2d4ba7a3198f942626af08330e4d1656ee38c408b23bb532a1955a1327ec367ae35161e3cc1f336d9285fb9c7d4322f2865451fb9b8961'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -169,9 +169,12 @@ check() {
 package_systemd() {
   pkgdesc='system and service manager'
   license=('GPL2' 'LGPL2.1')
-  depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
-           'libgcrypt' 'systemd-libs' 'libidn2' 'libidn2.so' 'lz4' 'pam' 'libelf'
-           'libseccomp' 'util-linux' 'xz' 'pcre2' 'audit' 'libp11-kit')
+  depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'
+           'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwids' 'libcap' 'libcap.so'
+           'libgcrypt' 'systemd-libs' 'libidn2' 'libidn2.so' 'lz4' 'pam'
+           'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so'
+           'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so' 'libp11-kit'
+           'libp11-kit.so')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
   replaces=('nss-myhostname' 'systemd-tools' 'udev')
   conflicts=('nss-myhostname' 'systemd-tools' 'udev')
diff --git a/core/systemd/initcpio-install-systemd b/core/systemd/initcpio-install-systemd
index 8fb4441f7..0a9740bae 100644
--- a/core/systemd/initcpio-install-systemd
+++ b/core/systemd/initcpio-install-systemd
@@ -110,6 +110,7 @@ build() {
     add_binary /usr/bin/sulogin
 
     map add_binary \
+        /usr/bin/journalctl \
         /usr/bin/systemd-tmpfiles \
         /usr/lib/systemd/systemd-hibernate-resume \
         /usr/lib/systemd/systemd-shutdown \
@@ -118,9 +119,6 @@ build() {
         /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
         /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
 
-    # for journalctl in emergency shell
-    add_binary journalctl
-
     # udev rules and systemd units
     map add_udev_rule "$rules" \
             50-udev-default.rules \
@@ -171,14 +169,35 @@ build() {
         'group: files' \
         'shadow: files'
 
-    echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
-    echo "root:x:0:root" >"$BUILDROOT/etc/group"
-    echo "root::::::::" >"$BUILDROOT/etc/shadow"
+    add_file /etc/passwd <<EOF
+root:x:0:0:Super User:/root:/bin/sh
+nobody:x:65534:65534:Nobody:/:/usr/bin/nologin
+EOF
 
-    add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
-[Service]
-ExecStart=
-ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
+    add_file /etc/shadow <<EOF
+root:!!:0::::::
+nobody:!!:0::::::
+EOF
+
+    add_file /etc/group <<EOF
+root:x:0:
+tty:x:5:
+users:x:985:
+video:x:986:
+uucp:x:987:
+storage:x:988:
+render:x:989:
+optical:x:990:
+lp:x:991:
+kvm:x:992:
+input:x:993:
+disk:x:994:
+audio:x:995:
+utmp:x:996:
+kmem:x:997:
+wheel:x:998:
+adm:x:999:
+nobody:x:65534:
 EOF
 
     add_dir "/etc/modules-load.d"