From 02bb7cd9f2fb6336a8bf58aa575059fbf02ec638 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Fri, 1 Jul 2022 12:38:46 +0200 Subject: [PATCH] updpkg(root/cryptsetup): update to 2.4.3 Tested on aarch64 as well as arm. Creating, opening and mounting a volume works fine in both cases, if kernel is compiled with necessary CRYPTO options. --- root-packages/cryptsetup/build.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/root-packages/cryptsetup/build.sh b/root-packages/cryptsetup/build.sh index b800ae29c5..b61cd922e9 100644 --- a/root-packages/cryptsetup/build.sh +++ b/root-packages/cryptsetup/build.sh @@ -2,17 +2,31 @@ TERMUX_PKG_HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/ TERMUX_PKG_DESCRIPTION="Userspace setup tool for transparent encryption of block devices using dm-crypt" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.3.6 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=2.4.3 TERMUX_PKG_SRCURL=https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v${TERMUX_PKG_VERSION:0:3}/cryptsetup-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f -TERMUX_PKG_DEPENDS="json-c, libdevmapper, libgcrypt, libpopt, libuuid, util-linux, openssl, libiconv" +TERMUX_PKG_SHA256=fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 +TERMUX_PKG_DEPENDS="json-c, libdevmapper, libgcrypt, libpopt, libuuid, util-linux, openssl, libiconv, argon2" TERMUX_PKG_BREAKS="cryptsetup-dev" TERMUX_PKG_REPLACES="cryptsetup-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-luks2-lock-path=$TERMUX_PREFIX/var/run +--enable-libargon2 +--disable-ssh-token " termux_step_pre_configure() { export LDFLAGS+=" -liconv" + + _NEED_DUMMY_LIBRT_A= + _LIBRT_A=$TERMUX_PREFIX/lib/librt.a + if [ ! -e $_LIBRT_A ]; then + _NEED_DUMMY_LIBRT_A=true + echo '!' > $_LIBRT_A + fi +} + +termux_step_post_make_install() { + if [ $_NEED_DUMMY_LIBRT_A ]; then + rm -f $_LIBRT_A + fi }