new packages: cryptsetup and libdevmapper
This commit is contained in:
parent
b6cb1cc24e
commit
59b1998eb6
6
root-packages/cryptsetup/build.sh
Normal file
6
root-packages/cryptsetup/build.sh
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
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_DEPENDS="json-c, libdevmapper, libgcrypt, libpopt, libuuid"
|
||||||
|
TERMUX_PKG_VERSION=2.0.3
|
||||||
|
TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/cryptsetup-${TERMUX_PKG_VERSION}.tar.xz
|
||||||
|
TERMUX_PKG_SHA256=4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4
|
17
root-packages/libdevmapper/build.sh
Normal file
17
root-packages/libdevmapper/build.sh
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
TERMUX_PKG_HOMEPAGE=http://sourceware.org/lvm2/
|
||||||
|
TERMUX_PKG_DESCRIPTION="A device-mapper library from LVM2 package"
|
||||||
|
TERMUX_PKG_DEPENDS="libandroid-support"
|
||||||
|
TERMUX_PKG_VERSION=2.02.177
|
||||||
|
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${TERMUX_PKG_VERSION}.tgz
|
||||||
|
TERMUX_PKG_SHA256=4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2
|
||||||
|
TERMUX_PKG_BUILD_IN_SRC=yes
|
||||||
|
|
||||||
|
termux_step_make() {
|
||||||
|
make -j"${TERMUX_MAKE_PROCESSES}" lib.device-mapper
|
||||||
|
}
|
||||||
|
|
||||||
|
termux_step_make_install() {
|
||||||
|
cd libdm
|
||||||
|
make install
|
||||||
|
}
|
||||||
|
|
76
root-packages/libdevmapper/pthread-fix.patch
Normal file
76
root-packages/libdevmapper/pthread-fix.patch
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
diff -uNr LVM2.2.02.177/configure LVM2.2.02.177.mod/configure
|
||||||
|
--- LVM2.2.02.177/configure 2017-12-18 22:44:34.000000000 +0200
|
||||||
|
+++ LVM2.2.02.177.mod/configure 2018-05-26 12:58:21.206743983 +0300
|
||||||
|
@@ -10806,11 +10806,11 @@
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
- check_lib_no_libs dlm dlm_lock -lpthread
|
||||||
|
+ check_lib_no_libs dlm dlm_lock
|
||||||
|
if test $NOTFOUND = 0; then
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for libdlm, using -ldlm" >&5
|
||||||
|
$as_echo "no pkg for libdlm, using -ldlm" >&6; }
|
||||||
|
- DLM_LIBS="-ldlm -lpthread"
|
||||||
|
+ DLM_LIBS="-ldlm"
|
||||||
|
HAVE_DLM=yes
|
||||||
|
fi
|
||||||
|
elif test $pkg_failed = untried; then
|
||||||
|
@@ -10831,11 +10831,11 @@
|
||||||
|
|
||||||
|
done
|
||||||
|
|
||||||
|
- check_lib_no_libs dlm dlm_lock -lpthread
|
||||||
|
+ check_lib_no_libs dlm dlm_lock
|
||||||
|
if test $NOTFOUND = 0; then
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no pkg for libdlm, using -ldlm" >&5
|
||||||
|
$as_echo "no pkg for libdlm, using -ldlm" >&6; }
|
||||||
|
- DLM_LIBS="-ldlm -lpthread"
|
||||||
|
+ DLM_LIBS="-ldlm"
|
||||||
|
HAVE_DLM=yes
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
@@ -14130,7 +14130,7 @@
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
-LIBS="-lpthread $LIBS"
|
||||||
|
+LIBS="$LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
@@ -14161,7 +14161,7 @@
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
|
||||||
|
$as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
|
||||||
|
if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = xyes; then :
|
||||||
|
- PTHREAD_LIBS="-lpthread"
|
||||||
|
+ PTHREAD_LIBS="-lc"
|
||||||
|
else
|
||||||
|
hard_bailout
|
||||||
|
fi
|
||||||
|
diff -uNr LVM2.2.02.177/configure.in LVM2.2.02.177.mod/configure.in
|
||||||
|
--- LVM2.2.02.177/configure.in 2017-12-18 22:44:34.000000000 +0200
|
||||||
|
+++ LVM2.2.02.177.mod/configure.in 2018-05-26 12:57:25.986743573 +0300
|
||||||
|
@@ -907,10 +907,10 @@
|
||||||
|
PKG_CHECK_MODULES(DLM, libdlm, [HAVE_DLM=yes],
|
||||||
|
[NOTFOUND=0
|
||||||
|
AC_CHECK_HEADERS(libdlm.h,,[$bailout])
|
||||||
|
- check_lib_no_libs dlm dlm_lock -lpthread
|
||||||
|
+ check_lib_no_libs dlm dlm_lock
|
||||||
|
if test $NOTFOUND = 0; then
|
||||||
|
AC_MSG_RESULT([no pkg for libdlm, using -ldlm])
|
||||||
|
- DLM_LIBS="-ldlm -lpthread"
|
||||||
|
+ DLM_LIBS="-ldlm"
|
||||||
|
HAVE_DLM=yes
|
||||||
|
fi])
|
||||||
|
fi
|
||||||
|
@@ -1627,8 +1627,8 @@
|
||||||
|
[M_LIBS="-lm"], hard_bailout)
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
-AC_CHECK_LIB([pthread], [pthread_mutex_lock],
|
||||||
|
- [PTHREAD_LIBS="-lpthread"], hard_bailout)
|
||||||
|
+#AC_CHECK_LIB([pthread], [pthread_mutex_lock],
|
||||||
|
+# [PTHREAD_LIBS="-lpthread"], hard_bailout)
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
dnl -- Disable selinux
|
12
root-packages/libdevmapper/replace-rindex.patch
Normal file
12
root-packages/libdevmapper/replace-rindex.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -uNr LVM2.2.02.177/libdm/libdm-deptree.c LVM2.2.02.177.mod/libdm/libdm-deptree.c
|
||||||
|
--- LVM2.2.02.177/libdm/libdm-deptree.c 2017-12-18 22:44:35.000000000 +0200
|
||||||
|
+++ LVM2.2.02.177.mod/libdm/libdm-deptree.c 2018-05-26 13:44:29.530097826 +0300
|
||||||
|
@@ -576,7 +576,7 @@
|
||||||
|
default_uuid_prefix = dm_uuid_prefix();
|
||||||
|
default_uuid_prefix_len = strlen(default_uuid_prefix);
|
||||||
|
|
||||||
|
- if (suffix_list && (suffix_position = rindex(uuid, '-'))) {
|
||||||
|
+ if (suffix_list && (suffix_position = strrchr(uuid, '-'))) {
|
||||||
|
while ((suffix = suffix_list[i++])) {
|
||||||
|
if (strcmp(suffix_position + 1, suffix))
|
||||||
|
continue;
|
Loading…
Reference in New Issue
Block a user