diff options
Diffstat (limited to 'filesystems/fuse-encfs/patches')
3 files changed, 12 insertions, 37 deletions
diff --git a/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake b/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake deleted file mode 100644 index 9c39f1b3ffb..00000000000 --- a/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cmake_FindFUSE.cmake,v 1.1 2017/06/19 18:41:39 maya Exp $ - -Also try to find (netbsd) librefuse - ---- cmake/FindFUSE.cmake.orig 2016-09-18 20:16:04.000000000 +0000 -+++ cmake/FindFUSE.cmake -@@ -13,8 +13,8 @@ if (APPLE) - set (FUSE_NAMES libosxfuse.dylib fuse) - set (FUSE_SUFFIXES osxfuse fuse) - else (APPLE) -- set (FUSE_NAMES fuse) -- set (FUSE_SUFFIXES fuse) -+ set (FUSE_NAMES fuse refuse) -+ set (FUSE_SUFFIXES fuse refuse) - endif (APPLE) - - # find includes diff --git a/filesystems/fuse-encfs/patches/patch-encfs_main.cpp b/filesystems/fuse-encfs/patches/patch-encfs_main.cpp index 09d61277c92..1b260c21e46 100644 --- a/filesystems/fuse-encfs/patches/patch-encfs_main.cpp +++ b/filesystems/fuse-encfs/patches/patch-encfs_main.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-encfs_main.cpp,v 1.1 2017/06/19 18:41:39 maya Exp $ +$NetBSD: patch-encfs_main.cpp,v 1.2 2017/11/11 03:18:16 gdt Exp $ ---- encfs/main.cpp.orig 2016-09-18 20:16:04.000000000 +0000 +--- encfs/main.cpp.orig 2017-07-25 18:26:45.000000000 +0000 +++ encfs/main.cpp @@ -488,8 +488,10 @@ static void *idleMonitor(void *); void *encfs_init(fuse_conn_info *conn) { @@ -11,5 +11,5 @@ $NetBSD: patch-encfs_main.cpp,v 1.1 2017/06/19 18:41:39 maya Exp $ conn->async_read = true; +#endif - if (ctx->args->isDaemon) { - // Switch to using syslog. + // if an idle timeout is specified, then setup a thread to monitor the + // filesystem. diff --git a/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h b/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h index ab68dbb8e85..f426e7c95d5 100644 --- a/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h +++ b/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h @@ -1,34 +1,26 @@ -$NetBSD: patch-internal_easylogging++.h,v 1.1 2017/06/19 18:41:39 maya Exp $ +$NetBSD: patch-internal_easylogging++.h,v 1.2 2017/11/11 03:18:16 gdt Exp $ NetBSD support, it's a unixy OS. ---- internal/easylogging++.h.orig 2016-09-18 20:16:04.000000000 +0000 +--- internal/easylogging++.h.orig 2017-07-25 18:26:45.000000000 +0000 +++ internal/easylogging++.h -@@ -99,13 +99,19 @@ +@@ -98,13 +98,18 @@ #else - # define ELPP_OS_FREEBSD 0 + # define ELPP_OS_FREEBSD 0 #endif +#if (defined(__NetBSD__)) +# define ELPP_OS_NETBSD 1 +#else +# define ELPP_OS_NETBSD 0 +#endif -+ #if (defined(__sun)) - # define ELPP_OS_SOLARIS 1 + # define ELPP_OS_SOLARIS 1 #else - # define ELPP_OS_SOLARIS 0 + # define ELPP_OS_SOLARIS 0 #endif // Unix -#if ((ELPP_OS_LINUX || ELPP_OS_MAC || ELPP_OS_FREEBSD || ELPP_OS_SOLARIS) && (!ELPP_OS_WINDOWS)) +#if ((ELPP_OS_LINUX || ELPP_OS_MAC || ELPP_OS_FREEBSD || ELPP_OS_NETBSD || ELPP_OS_SOLARIS) && (!ELPP_OS_WINDOWS)) - # define ELPP_OS_UNIX 1 + # define ELPP_OS_UNIX 1 #else - # define ELPP_OS_UNIX 0 -@@ -6692,4 +6698,4 @@ el::base::debug::CrashHandler elCrashHan - #else - # define START_EASYLOGGINGPP(argc, argv) el::Helpers::setArgs(argc, argv) - #endif // defined(ELPP_UNICODE) --#endif // EASYLOGGINGPP_H -\ No newline at end of file -+#endif // EASYLOGGINGPP_H + # define ELPP_OS_UNIX 0 |