Date: Friday, December 24, 2021 @ 09:37:03 Author: eworm Revision: 433013
upgpkg: cryptsetup 2.4.2-2: fix opening LUKS with fido2, pkcs11 & tpm2... ... with systemd >= 250 Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/install-sd-encrypt --------------------+ PKGBUILD | 4 ++-- install-sd-encrypt | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-24 09:05:44 UTC (rev 433012) +++ PKGBUILD 2021-12-24 09:37:03 UTC (rev 433013) @@ -3,7 +3,7 @@ pkgname=cryptsetup pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -22,7 +22,7 @@ 'SKIP' '29a3f1db5b86a8e6b7c914125e2c46711d6d5985bbf4089e158e06af551c8307' '817686b47e5ffd32913bcae7efe717f3377a48062b6311549d4440cfd3eadf17' - 'b616470eebbda8edf2a8cb0cd265cada5f03f9a6096683a01974f3812ab9c0f0') + '9aab9bd0f2e3d9e22bba1c81d3513321fdfee80802ec7eb195311089b0c644e9') build() { cd "${srcdir}"/$pkgname-${pkgver} Modified: install-sd-encrypt =================================================================== --- install-sd-encrypt 2021-12-24 09:05:44 UTC (rev 433012) +++ install-sd-encrypt 2021-12-24 09:37:03 UTC (rev 433013) @@ -21,13 +21,16 @@ '95-dm-notify.rules' \ '/usr/lib/initcpio/udev/11-dm-initramfs.rules' - add_systemd_unit 'cryptsetup.target' - add_binary '/usr/lib/systemd/system-generators/systemd-cryptsetup-generator' - add_binary '/usr/lib/systemd/systemd-cryptsetup' + add_systemd_unit 'cryptsetup.target' \ + 'systemd-ask-password-console.path' \ + 'systemd-ask-password-console.service' + map add_binary \ + '/usr/lib/systemd/system-generators/systemd-cryptsetup-generator' \ + '/usr/lib/systemd/systemd-cryptsetup' \ + '/usr/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so' \ + '/usr/lib/cryptsetup/libcryptsetup-token-systemd-pkcs11.so' \ + '/usr/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so' \ - add_systemd_unit 'systemd-ask-password-console.path' - add_systemd_unit 'systemd-ask-password-console.service' - # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1 add_binary '/usr/lib/libgcc_s.so.1'