From 775d81bdecfbe62cf12782b6d47e302d9b986174 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 4 Apr 2021 15:07:16 +0000
Subject: [PATCH] core/systemd to 248-2

---
 core/systemd/PKGBUILD                 | 9 +++++----
 core/systemd/initcpio-install-systemd | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 736af4b8f..e87c91cfa 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
 _tag='e13126bd95857eb9344e030edbb4c603aab63884' # git rev-parse v${_tag_name}
 _tag_name=248
 pkgver="${_tag_name/-/}"
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -21,7 +21,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
              'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-lxml' 'quota-tools' 'shadow' 'git'
              'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
-             'bash-completion' 'p11-kit' 'systemd' 'libfido2')
+             'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss')
 makedepends_aarch64=('gnu-efi-libs')
 options=('strip')
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>
@@ -54,7 +54,7 @@ sha512sums=('SKIP'
             '313f3d6cc3d88f718509007e029213a82d84b196afdadc6ef560580acf70ab480aaecd7622f51726cc1af7d7841c6ec5390f72890b055a54fc74722341395651'
             'e190abdadffecc8539c25558845c1c5a5c04082f9caa2423df104bb01ca698bd41bcb7692e6aac5cdc2cd035fa2452bfccb1b5a35357a20e8cd57393bc25d18a'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            '4ad9db3e7335ab8577eb3189b25478d407f569cc4ffaeae34ca3fc5a075ac5dd9cd4ca39194d0e8e56e1a4ead13fb960b850a79373d0df8b3d3e5db0c914a68b'
+            '1c8bdc6ecc3b755b0258faf4cbfac1b5bc25dbcd88c68cbb2ef1c41842ed349cdce84ce3f6f537845e49fab02cb5282504e1f97aa73c163fbc78997f9f00fc61'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -179,7 +179,8 @@ package_systemd() {
               'systemd-sysvcompat: symlink package to provide sysvinit binaries'
               'polkit: allow administration as unprivileged user'
               'curl: machinectl pull-tar and pull-raw'
-              'libfido2: unlocking LUKS2 volumes')
+              'libfido2: unlocking LUKS2 volumes'
+              'tpm2-tss: unlocking LUKS2 volumes')
   backup=(etc/pam.d/systemd-user
           etc/systemd/coredump.conf
           etc/systemd/homed.conf
diff --git a/core/systemd/initcpio-install-systemd b/core/systemd/initcpio-install-systemd
index d52b9091e..c5b82b17d 100644
--- a/core/systemd/initcpio-install-systemd
+++ b/core/systemd/initcpio-install-systemd
@@ -125,6 +125,7 @@ build() {
     # udev rules and systemd units
     map add_udev_rule "$rules" \
             50-udev-default.rules \
+            60-fido-id.rules \
             60-persistent-storage.rules \
             64-btrfs.rules \
             80-drivers.rules \
@@ -164,8 +165,8 @@ build() {
             emergency.target
 
     # add libraries dlopen()ed by systemd and its tools
-    for LIB in fido2; do
-        for FILE in $(find /usr/lib/ -name "lib${LIB}.so*"); do
+    for LIB in fido2 tss2-{{esys,rc,mu},tcti-'*'}; do
+        for FILE in $(find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*"); do
             if [[ -L "${FILE}" ]]; then
                 add_symlink "${FILE}"
             else