[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Christian Hesse
eworm at archlinux.org
Thu Apr 1 19:42:42 UTC 2021
Date: Thursday, April 1, 2021 @ 19:42:41
Author: eworm
Revision: 411402
upgpkg: systemd 248-2: optdepend on tpm2-tss for unlocking LUKS (FS#70247)
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--------------------------+
PKGBUILD | 9 +++++----
initcpio-install-systemd | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-01 19:27:39 UTC (rev 411401)
+++ PKGBUILD 2021-04-01 19:42:41 UTC (rev 411402)
@@ -7,7 +7,7 @@
_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'
@@ -15,7 +15,7 @@
'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'
'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
- 'bash-completion' 'p11-kit' 'systemd' 'libfido2')
+ 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss')
options=('strip')
validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart at poettering.net>
'5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
@@ -45,7 +45,7 @@
'882e486b6d88c8bafc50088845e41a49686e98981967f72ca1fb4ef07a01767400632f4b648fd31857d2a2a24a8fd65bcc2a8983284dd4fff2380732741d4c41'
'313f3d6cc3d88f718509007e029213a82d84b196afdadc6ef560580acf70ab480aaecd7622f51726cc1af7d7841c6ec5390f72890b055a54fc74722341395651'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
- '6e21d05ca620491ee604f29cfa15d3d03565342939a0391f496c42ab4b2cd056070bd0504160c6c931af722d3dcd59197a0032ca95c6dd905ee2018a0f8ae148'
+ '1c8bdc6ecc3b755b0258faf4cbfac1b5bc25dbcd88c68cbb2ef1c41842ed349cdce84ce3f6f537845e49fab02cb5282504e1f97aa73c163fbc78997f9f00fc61'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -162,7 +162,8 @@
'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
Modified: initcpio-install-systemd
===================================================================
--- initcpio-install-systemd 2021-04-01 19:27:39 UTC (rev 411401)
+++ initcpio-install-systemd 2021-04-01 19:42:41 UTC (rev 411402)
@@ -165,8 +165,8 @@
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
More information about the arch-commits
mailing list