diff options
author | Arvedui | 2021-06-07 11:51:11 +0200 |
---|---|---|
committer | Arvedui | 2021-06-07 11:51:11 +0200 |
commit | df9410466425fda35ecaac8fd9205694d47e6be7 (patch) | |
tree | d83704b7edb9d8f3b3c5ef724beb63e2c67ba721 | |
parent | c3fe62282b6020310c0b74dee59afce08547cee6 (diff) | |
download | aur-df9410466425fda35ecaac8fd9205694d47e6be7.tar.gz |
cryptsetup-git: update hooks
-rw-r--r-- | .SRCINFO | 13 | ||||
-rw-r--r-- | PKGBUILD | 18 | ||||
-rw-r--r-- | hooks-encrypt (renamed from encrypt_hook) | 15 | ||||
-rw-r--r-- | install-encrypt (renamed from encrypt_install) | 0 | ||||
-rw-r--r-- | install-sd-encrypt (renamed from sd-encrypt) | 22 |
5 files changed, 45 insertions, 23 deletions
@@ -1,6 +1,6 @@ pkgbase = cryptsetup-git pkgdesc = Userspace setup tool for transparent encryption of block devices using dm-crypt - pkgver = v2.3.3.r81.gf3ec1e22 + pkgver = v2.3.3.r349.gcd3cb945 pkgrel = 1 url = https://gitlab.com/cryptsetup/cryptsetup arch = armv6h @@ -24,13 +24,12 @@ pkgbase = cryptsetup-git conflicts = cryptsetup options = !emptydirs source = git+https://gitlab.com/cryptsetup/cryptsetup#branch=master - source = encrypt_hook - source = encrypt_install - source = sd-encrypt + source = hooks-encrypt + source = install-encrypt + source = install-sd-encrypt sha256sums = SKIP - sha256sums = 416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2 + sha256sums = 10461d20fe3bc357864ace3b408a2e93b4b03b5cff023def3ab126ae9857720d sha256sums = d325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57 - sha256sums = 31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db + sha256sums = 46af2f1353db1909fc483f20e3fa1e13f1e7c0d14f44c0d6163ce0862916c613 pkgname = cryptsetup-git - @@ -6,7 +6,7 @@ _gitname=cryptsetup pkgname="${_gitname}-git" _gitbranch=master _gitauthor=cryptsetup -pkgver=v2.3.3.r81.gf3ec1e22 +pkgver=v2.3.3.r349.gcd3cb945 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=('armv6h' 'armv7h' 'i686' 'x86_64') @@ -20,13 +20,13 @@ conflicts=('cryptsetup') provides=('cryptsetup') options=('!emptydirs') source=("git+https://gitlab.com/${_gitauthor}/${_gitname}#branch=${_gitbranch}" - "encrypt_hook" - "encrypt_install" - "sd-encrypt") + "hooks-encrypt" + "install-encrypt" + "install-sd-encrypt") sha256sums=('SKIP' - '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' + '10461d20fe3bc357864ace3b408a2e93b4b03b5cff023def3ab126ae9857720d' 'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57' - '31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db') + '46af2f1353db1909fc483f20e3fa1e13f1e7c0d14f44c0d6163ce0862916c613') pkgver() { cd "${srcdir}/${_gitname}" @@ -48,9 +48,9 @@ package() { cd "${srcdir}/${_gitname}" make DESTDIR="${pkgdir}" install # install hook - install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt - install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt - install -D -m644 "${srcdir}"/sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt + install -D -m644 "${srcdir}"/hooks-encrypt "${pkgdir}"/usr/lib/initcpio/hooks/encrypt + install -D -m644 "${srcdir}"/install-encrypt "${pkgdir}"/usr/lib/initcpio/install/encrypt + install -D -m644 "${srcdir}"/install-sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt install -D -m644 "${srcdir}"/"${_gitname}"/scripts/cryptsetup.conf "${pkgdir}"/usr/lib/tmpfiles.d/cryptsetup.conf } diff --git a/encrypt_hook b/hooks-encrypt index 882d5fb4423d..6bc1eea35920 100644 --- a/encrypt_hook +++ b/hooks-encrypt @@ -55,16 +55,27 @@ EOF echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." } - for cryptopt in ${cryptoptions//,/ }; do + set -f + OLDIFS="$IFS"; IFS=, + for cryptopt in ${cryptoptions}; do case ${cryptopt} in - allow-discards) + allow-discards|discard) cryptargs="${cryptargs} --allow-discards" ;; + no-read-workqueue|perf-no_read_workqueue) + cryptargs="${cryptargs} --perf-no_read_workqueue" + ;; + no-write-workqueue|perf-no_read_workqueue) + cryptargs="${cryptargs} --perf-no_write_workqueue" + ;; *) echo "Encryption option '${cryptopt}' not known, ignoring." >&2 ;; esac done + set +f + IFS="$OLDIFS" + unset OLDIFS if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then diff --git a/encrypt_install b/install-encrypt index 4cffb4ff014b..4cffb4ff014b 100644 --- a/encrypt_install +++ b/install-encrypt diff --git a/sd-encrypt b/install-sd-encrypt index 1cc16cff9c2f..42ee25fe98d2 100644 --- a/sd-encrypt +++ b/install-sd-encrypt @@ -12,12 +12,13 @@ build() { else add_all_modules "/crypto/" fi + add_checked_modules "/drivers/char/tpm/" - add_binary "dmsetup" - add_file "/usr/lib/udev/rules.d/10-dm.rules" - add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" - add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" - add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" + add_udev_rule "10-dm.rules" + add_udev_rule "13-dm-disk.rules" + add_udev_rule "60-fido-id.rules" + add_udev_rule "95-dm-notify.rules" + add_udev_rule "/usr/lib/initcpio/udev/11-dm-initramfs.rules" add_systemd_unit "cryptsetup.target" add_binary "/usr/lib/systemd/system-generators/systemd-cryptsetup-generator" @@ -29,6 +30,17 @@ build() { # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1 add_binary "/usr/lib/libgcc_s.so.1" + # add libraries dlopen()ed by systemd-cryptsetup + 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 + add_binary "${FILE}" + fi + done + done + # add mkswap for creating swap space on the fly (see 'swap' in crypttab(5)) add_binary "mkswap" |