CVS commit: pkgsrc/filesystems/fuse-encfs

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Apr  9 16:32:28 UTC 2019

Modified Files:
        pkgsrc/filesystems/fuse-encfs: Makefile distinfo
Added Files:
        pkgsrc/filesystems/fuse-encfs/patches: patch-encfs_FileUtils.cpp

Log Message:
fuse-encfs: workaround netbsd being wrong about which version of FUSE
changed the arguments of fuse_unmount. Fix build.

I get the impression this update was done by someone on NetBSD, so I speculate
the build succeeded to some people. In that cae, bump PKGREVISION, so the
right arguments will be passed!


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/filesystems/fuse-encfs/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/filesystems/fuse-encfs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/fuse-encfs/Makefile
diff -u pkgsrc/filesystems/fuse-encfs/Makefile:1.15 pkgsrc/filesystems/fuse-encfs/Makefile:1.16
--- pkgsrc/filesystems/fuse-encfs/Makefile:1.15 Wed Mar 21 22:38:57 2018
+++ pkgsrc/filesystems/fuse-encfs/Makefile      Tue Apr  9 16:32:28 2019
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2018/03/21 22:38:57 gdt Exp $
+# $NetBSD: Makefile,v 1.16 2019/04/09 16:32:28 maya Exp $
 #
 
+GITHUB_PROJECT=        encfs
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 DISTNAME=      encfs-1.9.4
 PKGNAME=       fuse-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vgough/}
 
@@ -11,9 +14,6 @@ HOMEPAGE=     http://www.arg0.net/encfs
 COMMENT=       FUSE Encrypted Filesystem
 LICENSE=       gnu-gpl-v3
 
-GITHUB_PROJECT=        encfs
-GITHUB_TAG=    v${PKGVERSION_NOREV}
-
 
 USE_TOOLS+=    autoconf cmake pkg-config
 USE_CMAKE=     yes

Index: pkgsrc/filesystems/fuse-encfs/distinfo
diff -u pkgsrc/filesystems/fuse-encfs/distinfo:1.8 pkgsrc/filesystems/fuse-encfs/distinfo:1.9
--- pkgsrc/filesystems/fuse-encfs/distinfo:1.8  Wed Mar 21 22:38:57 2018
+++ pkgsrc/filesystems/fuse-encfs/distinfo      Tue Apr  9 16:32:28 2019
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2018/03/21 22:38:57 gdt Exp $
+$NetBSD: distinfo,v 1.9 2019/04/09 16:32:28 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_main.cpp) = f7f1d9aa6d953aee98b534428e111f38b012d70f

Added files:

Index: pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp
diff -u /dev/null pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp:1.1
--- /dev/null   Tue Apr  9 16:32:28 2019
+++ pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp     Tue Apr  9 16:32:28 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-encfs_FileUtils.cpp,v 1.1 2019/04/09 16:32:28 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.
+
+--- encfs/FileUtils.cpp.orig   2018-01-28 21:07:41.000000000 +0000
++++ encfs/FileUtils.cpp
+@@ -1690,7 +1690,7 @@ bool unmountFS(EncFS_Context *ctx) {
+     return false;
+   }
+ // Time to unmount!
+-#if FUSE_USE_VERSION < 30
++#if (FUSE_USE_VERSION < 30) && !defined(__NetBSD__)
+   fuse_unmount(ctx->opts->mountPoint.c_str(), nullptr);
+ #else
+   fuse_unmount(fuse_get_context()->fuse);