summaryrefslogtreecommitdiff
path: root/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2018-03-21 22:38:57 +0000
committergdt <gdt@pkgsrc.org>2018-03-21 22:38:57 +0000
commit2b1e2a3559a21d0d2ae0d3da5ca5145ece87ec41 (patch)
tree3692a2c2c9c110d1ab53bd6b201c472d506cd86d /filesystems/fuse-encfs/patches/patch-encfs_main.cpp
parentaf82604195062fba9a56f3f80b7d7eb9632ce3bf (diff)
downloadpkgsrc-2b1e2a3559a21d0d2ae0d3da5ca5145ece87ec41.tar.gz
encfs: Update to 1.9.4
Upstream changes: v1.9.4 / 2018-01-28 =================== * Fix packaging error leading to wrong version output * Fix shared lib compilation (cmake -DBUILD_SHARED_LIBS=ON ..) v1.9.3 / 2018-01-28 =================== * Fix compilation with "-std=c++11" * Fix a gid permission issue with allow_other * Fix operations on symlinks * Fix a race in idle unmount * Add `--reversewrite` cli option * Add PID to syslog logging * Deep code sanity check * Modernize coding style * Make codebase warnings & clang-tidy clean * Bump FUSE_USE_VERSION to 29 * Ensure compatibility with LibreSSL * Switch to vendored lib tinyxml2 & easylogging * Reorganize man page and add missing options * Add gtest and micro benchmarks
Diffstat (limited to 'filesystems/fuse-encfs/patches/patch-encfs_main.cpp')
-rw-r--r--filesystems/fuse-encfs/patches/patch-encfs_main.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/filesystems/fuse-encfs/patches/patch-encfs_main.cpp b/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
index 1b260c21e46..bab6c82bc5e 100644
--- a/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
+++ b/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
@@ -1,14 +1,13 @@
-$NetBSD: patch-encfs_main.cpp,v 1.2 2017/11/11 03:18:16 gdt Exp $
+$NetBSD: patch-encfs_main.cpp,v 1.3 2018/03/21 22:38:57 gdt Exp $
---- encfs/main.cpp.orig 2017-07-25 18:26:45.000000000 +0000
+--- encfs/main.cpp.orig 2018-01-28 21:07:41.000000000 +0000
+++ encfs/main.cpp
-@@ -488,8 +488,10 @@ static void *idleMonitor(void *);
- void *encfs_init(fuse_conn_info *conn) {
- EncFS_Context *ctx = (EncFS_Context *)fuse_get_context()->private_data;
+@@ -530,7 +530,9 @@ void *encfs_init(fuse_conn_info *conn) {
+ auto *ctx = (EncFS_Context *)fuse_get_context()->private_data;
-+#ifndef __NetBSD__ /* XXX FUSE API too old */
// set fuse connection options
- conn->async_read = true;
++#ifndef __NetBSD__ /* XXX FUSE API too old */
+ conn->async_read = 1u;
+#endif
// if an idle timeout is specified, then setup a thread to monitor the