Date: Wednesday, January 3, 2018 @ 23:45:44 Author: eworm Revision: 314001
upgpkg: cryptsetup 2.0.0-5 use upstream change that fixes LUKS2 in early userspace https://gitlab.com/cryptsetup/cryptsetup/issues/362 Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/hooks-encrypt cryptsetup/trunk/install-sd-encrypt --------------------+ PKGBUILD | 12 ++++++++---- hooks-encrypt | 2 -- install-sd-encrypt | 9 --------- 3 files changed, 8 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-03 23:32:52 UTC (rev 314000) +++ PKGBUILD 2018-01-03 23:45:44 UTC (rev 314001) @@ -4,7 +4,7 @@ pkgname=cryptsetup pkgver=2.0.0 -pkgrel=4 +pkgrel=5 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -20,18 +20,22 @@ 'install-sd-encrypt') sha256sums=('adc623b9e3e3ab5c14145b8baf21b741e513ee5bf90d2b4d85a745c2f05da199' 'SKIP' - '9b827e6e91d17efe1add010049dd0781902255939702561485073cda8ae6c923' + '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' '6a68c833ff0af50651e66471aa21de8219e3cf66b28f87227a9580c48b689115' - 'b6b7f1328f291c44b9515a220815d1aaee2f1cf89dce5d5c3db47a90ae697939') + 'dbcb94323f65eab2cdd7a241fe3eba7aa3b344c1bdaaaa10a7fd800f146e61e8') build() { cd "${srcdir}"/$pkgname-${pkgver} + # https://gitlab.com/cryptsetup/cryptsetup/issues/362 + # TODO: remove configure option once this hits a release + ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ --enable-libargon2 \ - --disable-static + --disable-static \ + --with-luks2-lock-path=/run/cryptsetup make } Modified: hooks-encrypt =================================================================== --- hooks-encrypt 2018-01-03 23:32:52 UTC (rev 314000) +++ hooks-encrypt 2018-01-03 23:45:44 UTC (rev 314001) @@ -4,8 +4,6 @@ modprobe -a -q dm-crypt >/dev/null 2>&1 [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" - mkdir -p "/run/lock/cryptsetup/" - # Get keyfile if specified ckeyfile="/crypto_keyfile.bin" if [ -n "$cryptkey" ]; then Modified: install-sd-encrypt =================================================================== --- install-sd-encrypt 2018-01-03 23:32:52 UTC (rev 314000) +++ install-sd-encrypt 2018-01-03 23:45:44 UTC (rev 314001) @@ -25,15 +25,6 @@ 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/[email protected]/" - cat >"$BUILDROOT/etc/systemd/system/[email protected]/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"
