From 1e2badd00a3ab2103f14aa2f5115ed81a56f2544 Mon Sep 17 00:00:00 2001 From: "termux-actions[bot]" Date: Wed, 20 Apr 2022 11:07:00 +0000 Subject: [PATCH] root-packages/cryptsetup --- root-packages/cryptsetup/build.sh | 18 ++++++++++++++++ .../cryptsetup/fix-loopdev-path.patch | 21 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 root-packages/cryptsetup/build.sh create mode 100644 root-packages/cryptsetup/fix-loopdev-path.patch diff --git a/root-packages/cryptsetup/build.sh b/root-packages/cryptsetup/build.sh new file mode 100644 index 0000000000..b800ae29c5 --- /dev/null +++ b/root-packages/cryptsetup/build.sh @@ -0,0 +1,18 @@ +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_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_BREAKS="cryptsetup-dev" +TERMUX_PKG_REPLACES="cryptsetup-dev" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--with-luks2-lock-path=$TERMUX_PREFIX/var/run +" + +termux_step_pre_configure() { + export LDFLAGS+=" -liconv" +} diff --git a/root-packages/cryptsetup/fix-loopdev-path.patch b/root-packages/cryptsetup/fix-loopdev-path.patch new file mode 100644 index 0000000000..204a116ca5 --- /dev/null +++ b/root-packages/cryptsetup/fix-loopdev-path.patch @@ -0,0 +1,21 @@ +diff -uNr cryptsetup-2.0.3/lib/utils_loop.c cryptsetup-2.0.3.mod/lib/utils_loop.c +--- cryptsetup-2.0.3/lib/utils_loop.c 2018-02-28 11:20:59.000000000 +0200 ++++ cryptsetup-2.0.3.mod/lib/utils_loop.c 2018-05-26 19:02:53.546906033 +0300 +@@ -57,7 +57,7 @@ + struct loop_info64 lo64 = {0}; + + for (i = 0; i < 256; i++) { +- sprintf(dev, "/dev/loop%d", i); ++ sprintf(dev, "/dev/block/loop%d", i); + + loop_fd = open(dev, O_RDONLY); + if (loop_fd < 0) +@@ -91,7 +91,7 @@ + } + close(loop_fd); + +- if (sprintf(dev, "/dev/loop%d", i) < 0) ++ if (sprintf(dev, "/dev/block/loop%d", i) < 0) + return NULL; + + if (stat(dev, &st) || !S_ISBLK(st.st_mode))