[arch-commits] Commit in cryptsetup/trunk (PKGBUILD install-sd-encrypt)

[Christian Hesse]

    Date: Wednesday, January 3, 2018 @ 15:34:13
  Author: eworm
Revision: 313987

upgpkg: cryptsetup 2.0.0-4

fix cryptsetup with LUKS2 in systemd-based initcpio (FS#56771)

Modified:
  cryptsetup/trunk/PKGBUILD
  cryptsetup/trunk/install-sd-encrypt

--------------------+
 PKGBUILD           |    4 ++--
 install-sd-encrypt |   12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-03 11:06:25 UTC (rev 313986)
+++ PKGBUILD	2018-01-03 15:34:13 UTC (rev 313987)
@@ -4,7 +4,7 @@
 
 pkgname=cryptsetup
 pkgver=2.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt'
 arch=(x86_64)
 license=('GPL')
@@ -22,7 +22,7 @@
             'SKIP'
             '9b827e6e91d17efe1add010049dd0781902255939702561485073cda8ae6c923'
             '6a68c833ff0af50651e66471aa21de8219e3cf66b28f87227a9580c48b689115'
-            'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
+            'b6b7f1328f291c44b9515a220815d1aaee2f1cf89dce5d5c3db47a90ae697939')
 
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}

Modified: install-sd-encrypt
===================================================================
--- install-sd-encrypt	2018-01-03 11:06:25 UTC (rev 313986)
+++ install-sd-encrypt	2018-01-03 15:34:13 UTC (rev 313987)
@@ -25,6 +25,18 @@
     add_systemd_unit systemd-ask-password-console.path
     add_systemd_unit systemd-ask-password-console.service
 
+    # the directory /run/lock/cryptsetup/ is supposed to be created by
+    # systemd-tmpfiles, but that is not available in early userspace.
+    # https://github.com/systemd/systemd/issues/7794
+    mkdir -p "$BUILDROOT/etc/systemd/system/systemd-cryptsetup at .service.d/"
+    cat >"$BUILDROOT/etc/systemd/system/systemd-cryptsetup at .service.d/lock.conf" <<EOF
+[Service]
+ExecStartPre=/usr/bin/mkdir -p /run/lock/cryptsetup/
+EOF
+    
+    # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
+    add_file "/usr/lib/libgcc_s.so.1"
+
     [[ -f /etc/crypttab.initramfs ]] && add_file /etc/crypttab.initramfs /etc/crypttab
 }