From 2910ea37d62d22601ae00a7c0786105486e65b9d Mon Sep 17 00:00:00 2001 From: maya Date: Tue, 9 Apr 2019 16:43:10 +0000 Subject: fuse-encfs: update comment. It's unclear what is happening here, but apparently netbsd knew future FUSE API before upstream FUSE did. And it didn't do the in-between version used here. --- filesystems/fuse-encfs/distinfo | 4 ++-- filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/filesystems/fuse-encfs/distinfo b/filesystems/fuse-encfs/distinfo index 4a030155cc4..6f73939de13 100644 --- a/filesystems/fuse-encfs/distinfo +++ b/filesystems/fuse-encfs/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2019/04/09 16:32:28 maya Exp $ +$NetBSD: distinfo,v 1.10 2019/04/09 16:43:10 maya Exp $ SHA1 (encfs-1.9.4.tar.gz) = bf1e2b7688ee715c487d3d181e810d53c5983a0a RMD160 (encfs-1.9.4.tar.gz) = 847f943f6ae7622d54aa9ef25a64344153c23da0 SHA512 (encfs-1.9.4.tar.gz) = 082e35e6eae4730b5e7827eed729422f9d995ebe9e441c5f9725f39cc2f46f014ac1479c7b0a7ce04e9e7228c1a93ecf5b4228e667fc48e6a7d3b68d2324cd0b Size (encfs-1.9.4.tar.gz) = 2794574 bytes SHA1 (patch-encfs_DirNode.cpp) = 960480ee442f534357e3325c5001b6056b2338a6 -SHA1 (patch-encfs_FileUtils.cpp) = 6c39557409ac91e6fdd2505a6511b9c47ddc7619 +SHA1 (patch-encfs_FileUtils.cpp) = 52cfc5d4111f052f490cb64ca7bd00e70ee2e664 SHA1 (patch-encfs_main.cpp) = f7f1d9aa6d953aee98b534428e111f38b012d70f diff --git a/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp b/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp index 41741816afb..9e04e89f62a 100644 --- a/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp +++ b/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp @@ -1,7 +1,10 @@ -$NetBSD: patch-encfs_FileUtils.cpp,v 1.1 2019/04/09 16:32:28 maya Exp $ +$NetBSD: patch-encfs_FileUtils.cpp,v 1.2 2019/04/09 16:43:10 maya Exp $ -Unclear FUSE API mismatch. fuse_unmount as of FUSE 3.0 seems to take -a single argument, but NetBSD perfuse thinks it's since FUSE 2.2. +NetBSD ReFUSE doesn't have the fuse_unmount from FUSE 2.2 - FUSE 2.9. +Workaround by using the version belonging to FUSE >= 3.0. + +This might be a temporal aberration: NetBSD ReFUSE had the newer FUSE +API before upstream FUSE did. --- encfs/FileUtils.cpp.orig 2018-01-28 21:07:41.000000000 +0000 +++ encfs/FileUtils.cpp -- cgit v1.2.3