Mv encfs, libfuse, squashfuse to disabled-packages for now
This commit is contained in:
parent
d68f34700a
commit
c84394b59c
@ -1,20 +0,0 @@
|
|||||||
TERMUX_PKG_HOMEPAGE=https://github.com/vgough/encfs
|
|
||||||
TERMUX_PKG_DESCRIPTION="An encrypted filesystem for FUSE"
|
|
||||||
TERMUX_PKG_LICENSE="LGPL-3.0, GPL-3.0"
|
|
||||||
TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
|
|
||||||
TERMUX_PKG_VERSION=1.9.5
|
|
||||||
TERMUX_PKG_SRCURL=https://github.com/vgough/encfs/archive/v${TERMUX_PKG_VERSION}.tar.gz
|
|
||||||
TERMUX_PKG_SHA256=4709f05395ccbad6c0a5b40a4619d60aafe3473b1a79bafb3aa700b1f756fd63
|
|
||||||
TERMUX_PKG_DEPENDS="libfuse, openssl"
|
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
|
||||||
-DFUSE_INCLUDE_DIR=$TERMUX_PREFIX/include
|
|
||||||
-DFUSE_LIBRARIES=$TERMUX_PREFIX/lib/libfuse.so
|
|
||||||
-DRUN_HAVE_POSIX_REGEX=0
|
|
||||||
-DRUN_HAVE_STD_REGEX=0
|
|
||||||
-DRUN_HAVE_STEADY_CLOCK=0
|
|
||||||
-DENABLE_NLS=off
|
|
||||||
"
|
|
||||||
|
|
||||||
termux_step_pre_configure () {
|
|
||||||
LDFLAGS="$LDFLAGS -llog"
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
--- ../encfs.cpp.orig 2018-10-14 09:22:18.445712600 +0200
|
|
||||||
+++ ./encfs/encfs.cpp 2018-10-14 09:22:24.729681665 +0200
|
|
||||||
@@ -620,7 +620,7 @@
|
|
||||||
tv[1].tv_sec = ts[1].tv_sec;
|
|
||||||
tv[1].tv_usec = ts[1].tv_nsec / 1000;
|
|
||||||
|
|
||||||
- int res = lutimes(cyName.c_str(), tv);
|
|
||||||
+ int res = utimes(cyName.c_str(), tv);
|
|
||||||
#endif
|
|
||||||
return (res == -1) ? -errno : ESUCCESS;
|
|
||||||
}
|
|
@ -1,19 +0,0 @@
|
|||||||
TERMUX_PKG_HOMEPAGE=https://github.com/libfuse/libfuse
|
|
||||||
TERMUX_PKG_DESCRIPTION="FUSE (Filesystem in Userspace) is an interface for userspace programs to export a filesystem to the Linux kernel"
|
|
||||||
TERMUX_PKG_LICENSE="LGPL-2.1, GPL-2.0"
|
|
||||||
TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
|
|
||||||
TERMUX_PKG_VERSION=2.9.8 #3.3.0
|
|
||||||
TERMUX_PKG_SRCURL=https://github.com/libfuse/libfuse/archive/fuse-${TERMUX_PKG_VERSION}.tar.gz
|
|
||||||
TERMUX_PKG_SHA256=ceadc28f033b29d7aa1d7c3a5a267d51c2b572ed4e7346e0f9e24f4f5889debb
|
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
|
||||||
--disable-mtab
|
|
||||||
MOUNT_FUSE_PATH=$TERMUX_PREFIX/bin
|
|
||||||
UDEV_RULES_PATH=$TERMUX_PREFIX/etc/udev/rules.d
|
|
||||||
INIT_D_PATH=$TERMUX_PREFIX/etc/init.d
|
|
||||||
"
|
|
||||||
# Code uses telldir() and seekdir():
|
|
||||||
TERMUX_PKG_API_LEVEL=23
|
|
||||||
# Requires 64bit off_t, we use super-ugly probably none-functioning patch to work around that for now
|
|
||||||
termux_step_pre_configure () {
|
|
||||||
./makeconf.sh
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
--- ../fsel.c.orig 2018-10-14 08:16:18.624446614 +0200
|
|
||||||
+++ ./example/fsel.c 2018-10-14 08:16:32.676370584 +0200
|
|
||||||
@@ -271,7 +271,7 @@
|
|
||||||
|
|
||||||
ret = fuse_main(argc, argv, &fsel_oper, NULL);
|
|
||||||
|
|
||||||
- pthread_cancel(producer);
|
|
||||||
+ pthread_kill(producer, 0);
|
|
||||||
pthread_join(producer, NULL);
|
|
||||||
|
|
||||||
return ret;
|
|
@ -1,11 +0,0 @@
|
|||||||
--- ../fuse.c.orig 2018-10-13 19:16:53.752578568 +0200
|
|
||||||
+++ ./lib/fuse.c 2018-10-13 19:19:03.135469989 +0200
|
|
||||||
@@ -4754,7 +4754,7 @@
|
|
||||||
{
|
|
||||||
if (lru_enabled(f)) {
|
|
||||||
pthread_mutex_lock(&f->lock);
|
|
||||||
- pthread_cancel(f->prune_thread);
|
|
||||||
+ pthread_kill(f->prune_thread, 0);
|
|
||||||
pthread_mutex_unlock(&f->lock);
|
|
||||||
pthread_join(f->prune_thread, NULL);
|
|
||||||
}
|
|
@ -1,21 +0,0 @@
|
|||||||
--- ../fuse_loop_mt.c_2.9.8_orig 2018-10-13 22:18:23.067614196 +0200
|
|
||||||
+++ ./lib/fuse_loop_mt.c 2018-10-13 22:16:17.256721029 +0200
|
|
||||||
@@ -77,9 +77,7 @@
|
|
||||||
};
|
|
||||||
int res;
|
|
||||||
|
|
||||||
- pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
|
|
||||||
res = fuse_session_receive_buf(mt->se, &fbuf, &ch);
|
|
||||||
- pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
|
|
||||||
if (res == -EINTR)
|
|
||||||
continue;
|
|
||||||
if (res <= 0) {
|
|
||||||
@@ -243,7 +241,7 @@
|
|
||||||
|
|
||||||
pthread_mutex_lock(&mt.lock);
|
|
||||||
for (w = mt.main.next; w != &mt.main; w = w->next)
|
|
||||||
- pthread_cancel(w->thread_id);
|
|
||||||
+ pthread_kill(w->thread_id, 0);
|
|
||||||
mt.exit = 1;
|
|
||||||
pthread_mutex_unlock(&mt.lock);
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
|||||||
--- ../fusermount.c.orig 2018-10-13 19:06:31.957898402 +0200
|
|
||||||
+++ ./util/fusermount.c 2018-10-13 19:13:39.298247332 +0200
|
|
||||||
@@ -22,6 +22,7 @@
|
|
||||||
#include <pwd.h>
|
|
||||||
#include <paths.h>
|
|
||||||
#include <mntent.h>
|
|
||||||
+#include <sys/file.h>
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <sys/mount.h>
|
|
||||||
@@ -114,7 +115,7 @@
|
|
||||||
progname, strerror(errno));
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
- res = lockf(mtablock, F_LOCK, 0);
|
|
||||||
+ res = flock(mtablock, F_LOCK);
|
|
||||||
if (res < 0) {
|
|
||||||
fprintf(stderr, "%s: error getting lock: %s\n", progname,
|
|
||||||
strerror(errno));
|
|
||||||
@@ -130,7 +131,7 @@
|
|
||||||
if (mtablock >= 0) {
|
|
||||||
int res;
|
|
||||||
|
|
||||||
- res = lockf(mtablock, F_ULOCK, 0);
|
|
||||||
+ res = flock(mtablock, F_ULOCK);
|
|
||||||
if (res < 0) {
|
|
||||||
fprintf(stderr, "%s: error releasing lock: %s\n",
|
|
||||||
progname, strerror(errno));
|
|
@ -1,25 +0,0 @@
|
|||||||
--- ../iconv.c.orig 2018-10-14 08:11:55.749657033 +0200
|
|
||||||
+++ ./lib/modules/iconv.c 2018-10-14 08:15:25.660725566 +0200
|
|
||||||
@@ -17,7 +17,9 @@
|
|
||||||
#include <iconv.h>
|
|
||||||
#include <pthread.h>
|
|
||||||
#include <locale.h>
|
|
||||||
+#ifndef __ANDROID__
|
|
||||||
#include <langinfo.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
struct iconv {
|
|
||||||
struct fuse_fs *next;
|
|
||||||
@@ -646,7 +648,11 @@
|
|
||||||
static void iconv_help(void)
|
|
||||||
{
|
|
||||||
char *old = strdup(setlocale(LC_CTYPE, ""));
|
|
||||||
- char *charmap = strdup(nl_langinfo(CODESET));
|
|
||||||
+ #ifndef __ANDROID__
|
|
||||||
+ char *charmap = strdup(nl_langinfo(CODESET));
|
|
||||||
+ #else
|
|
||||||
+ char *charmap = strdup("UTF-8");
|
|
||||||
+ #endif
|
|
||||||
setlocale(LC_CTYPE, old);
|
|
||||||
free(old);
|
|
||||||
fprintf(stderr,
|
|
@ -1,12 +0,0 @@
|
|||||||
TERMUX_PKG_HOMEPAGE=https://github.com/vasi/squashfuse
|
|
||||||
TERMUX_PKG_DESCRIPTION="FUSE filesystem to mount squashfs archives"
|
|
||||||
TERMUX_PKG_LICENSE="BSD 2-Clause"
|
|
||||||
TERMUX_PKG_VERSION=0.1.103
|
|
||||||
TERMUX_PKG_SHA256=bba530fe435d8f9195a32c295147677c58b060e2c63d2d4204ed8a6c9621d0dd
|
|
||||||
TERMUX_PKG_SRCURL=https://github.com/vasi/squashfuse/archive/${TERMUX_PKG_VERSION}.tar.gz
|
|
||||||
TERMUX_PKG_DEPENDS="libfuse"
|
|
||||||
|
|
||||||
termux_step_pre_configure () {
|
|
||||||
aclocal --install
|
|
||||||
autoreconf -vfi
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user