fuse-encfs: update to 1.9.1

A decade of changes, please refer to the following link for changes:
https://github.com/vgough/encfs/blob/bf2cee54f53fc53910476fcd497782f3fd062923/ChangeLog

16 files changed, 174 insertions, 184 deletions

diff --git a/filesystems/fuse-encfs/Makefile b/filesystems/fuse-encfs/Makefile
index a4b5c14d3a3..53feb857929 100644
--- a/filesystems/fuse-encfs/Makefile
+++ b/filesystems/fuse-encfs/Makefile
@@ -1,25 +1,32 @@
-# $NetBSD: Makefile,v 1.12 2016/03/05 11:28:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2017/06/19 18:41:39 maya Exp $
 #
 
-DISTNAME=	encfs-1.2.0-2
-PKGNAME=	fuse-${DISTNAME:S/-2/.2/}
-PKGREVISION=	5
+DISTNAME=	encfs-1.9.1
+PKGNAME=	fuse-${DISTNAME}
 CATEGORIES=	filesystems
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=encfs/}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=vgough/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.arg0.net/encfs
 COMMENT=	FUSE Encrypted Filesystem
+LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-2//}
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	autoconf gmake pkg-config
+GITHUB_PROJECT=	encfs
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+
+
+USE_TOOLS+=	autoconf cmake pkg-config
+USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
-CPPFLAGS.NetBSD+=	-D_NETBSD_SOURCE
+CONFIGURE_DIRS=	${WRKDIR}/build
+CMAKE_ARG_PATH=	${WRKSRC}
+
+TEST_TARGET=	test
+
+post-extract:
+	${RUN} mkdir -p ${WRKDIR}/build
 
-.include "../../devel/librlog/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/fuse.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/filesystems/fuse-encfs/PLIST b/filesystems/fuse-encfs/PLIST
index c33e84ab69c..1053be1e728 100644
--- a/filesystems/fuse-encfs/PLIST
+++ b/filesystems/fuse-encfs/PLIST
@@ -1,5 +1,56 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/06/19 18:41:39 maya Exp $
 bin/encfs
 bin/encfsctl
-man/man1/encfs.1
-man/man1/encfsctl.1
+bin/encfssh
+share/locale/ar/LC_MESSAGES/encfs.mo
+share/locale/be/LC_MESSAGES/encfs.mo
+share/locale/bg/LC_MESSAGES/encfs.mo
+share/locale/bs/LC_MESSAGES/encfs.mo
+share/locale/ca/LC_MESSAGES/encfs.mo
+share/locale/cs/LC_MESSAGES/encfs.mo
+share/locale/da/LC_MESSAGES/encfs.mo
+share/locale/de/LC_MESSAGES/encfs.mo
+share/locale/de_AT/LC_MESSAGES/encfs.mo
+share/locale/de_CH/LC_MESSAGES/encfs.mo
+share/locale/de_DE/LC_MESSAGES/encfs.mo
+share/locale/el/LC_MESSAGES/encfs.mo
+share/locale/eo/LC_MESSAGES/encfs.mo
+share/locale/es/LC_MESSAGES/encfs.mo
+share/locale/es_ES/LC_MESSAGES/encfs.mo
+share/locale/es_PE/LC_MESSAGES/encfs.mo
+share/locale/et/LC_MESSAGES/encfs.mo
+share/locale/fi/LC_MESSAGES/encfs.mo
+share/locale/fr/LC_MESSAGES/encfs.mo
+share/locale/fr_FR/LC_MESSAGES/encfs.mo
+share/locale/gl/LC_MESSAGES/encfs.mo
+share/locale/he/LC_MESSAGES/encfs.mo
+share/locale/hr/LC_MESSAGES/encfs.mo
+share/locale/hu/LC_MESSAGES/encfs.mo
+share/locale/id/LC_MESSAGES/encfs.mo
+share/locale/it/LC_MESSAGES/encfs.mo
+share/locale/ja/LC_MESSAGES/encfs.mo
+share/locale/ko/LC_MESSAGES/encfs.mo
+share/locale/lv/LC_MESSAGES/encfs.mo
+share/locale/nb/LC_MESSAGES/encfs.mo
+share/locale/nds/LC_MESSAGES/encfs.mo
+share/locale/nl/LC_MESSAGES/encfs.mo
+share/locale/nn/LC_MESSAGES/encfs.mo
+share/locale/oc/LC_MESSAGES/encfs.mo
+share/locale/pl/LC_MESSAGES/encfs.mo
+share/locale/pt/LC_MESSAGES/encfs.mo
+share/locale/pt_BR/LC_MESSAGES/encfs.mo
+share/locale/pt_PT/LC_MESSAGES/encfs.mo
+share/locale/ro/LC_MESSAGES/encfs.mo
+share/locale/ru/LC_MESSAGES/encfs.mo
+share/locale/sk/LC_MESSAGES/encfs.mo
+share/locale/sr/LC_MESSAGES/encfs.mo
+share/locale/sv/LC_MESSAGES/encfs.mo
+share/locale/ta/LC_MESSAGES/encfs.mo
+share/locale/tr/LC_MESSAGES/encfs.mo
+share/locale/uk/LC_MESSAGES/encfs.mo
+share/locale/vi/LC_MESSAGES/encfs.mo
+share/locale/zh_CN/LC_MESSAGES/encfs.mo
+share/locale/zh_HK/LC_MESSAGES/encfs.mo
+share/locale/zh_TW/LC_MESSAGES/encfs.mo
+share/man/man1/encfs.1
+share/man/man1/encfsctl.1
diff --git a/filesystems/fuse-encfs/distinfo b/filesystems/fuse-encfs/distinfo
index beb1f924e30..d3b9fcf8dc4 100644
--- a/filesystems/fuse-encfs/distinfo
+++ b/filesystems/fuse-encfs/distinfo
@@ -1,15 +1,10 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 00:15:00 agc Exp $
+$NetBSD: distinfo,v 1.6 2017/06/19 18:41:39 maya Exp $
 
-SHA1 (encfs-1.2.0-2.tgz) = 15e0037ef123ef3967d5c101d10f3643c33bcb68
-RMD160 (encfs-1.2.0-2.tgz) = 979fd6a11137c1acdabd3349302d8cd7e3b6625b
-SHA512 (encfs-1.2.0-2.tgz) = 7513d9892f050705ab19da801253e6b9031824c831b4fb4ae828eb6bd3c132be109b40cbd9393c45be2bef2ceeb7af8c963e0e96aeb2fc8786b3468831aa13dd
-Size (encfs-1.2.0-2.tgz) = 528039 bytes
-SHA1 (patch-aa) = 2e40cf7e222bfc3def5d1aa2c431854e9f59e0e9
-SHA1 (patch-ab) = 680eac660752826503aeed48995ca93b2f280f1a
-SHA1 (patch-ac) = ab7d063f8429f794c0ea81d30e051eb48c35e000
-SHA1 (patch-ad) = 4077b9cbd1bdf1f71029183acce6a8570dbbef7a
-SHA1 (patch-ae) = 48e06c61293a3280825df151df4670db1a3fbcc0
-SHA1 (patch-encfs_Config.cpp) = a868994c763821c40f9169965c5b2a80262a3c7d
-SHA1 (patch-encfs_ConfigVar.cpp) = 9806bc49f63bedd12c598515db854e061ac43895
-SHA1 (patch-encfs_NameIO.cpp) = 1d912b0575fea6d55c19d1d3930fd47c8f538722
-SHA1 (patch-encfs_OpaqueValue.h) = 3274bf118d14a544d775830fef2af51594e9635e
+SHA1 (encfs-1.9.1.tar.gz) = 4af5a44645d0dd37fe329c3ca834b8f18e8352f5
+RMD160 (encfs-1.9.1.tar.gz) = 6d12d47e1e24e849df76ee2aa0b442a1b01ded74
+SHA512 (encfs-1.9.1.tar.gz) = 7ac0d2495d28dbca9e4c23c8c82321cdab6c37e8e37daf88dc9b3fe8d8521a4fa8889e20cdbde1f94fb4c51d3c4b5ea5b30fa6e612258285cc284d61e5d377ea
+Size (encfs-1.9.1.tar.gz) = 455910 bytes
+SHA1 (patch-cmake_FindFUSE.cmake) = 96de3fd60209f7900295beb96bb89c918faad3d1
+SHA1 (patch-encfs_DirNode.cpp) = 7c7ddc2a125e8dfb2373c700a2e5d1c5a69fab39
+SHA1 (patch-encfs_main.cpp) = a61e550a579e103a26b5c83b65604e85bb91ae84
+SHA1 (patch-internal_easylogging++.h) = ad330f9e667dda23db51332e7e94adc107f8c1e8
diff --git a/filesystems/fuse-encfs/patches/patch-aa b/filesystems/fuse-encfs/patches/patch-aa
deleted file mode 100644
index 89893e66865..00000000000
--- a/filesystems/fuse-encfs/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
-
---- encfs/FileUtils.cpp.orig	2007-03-01 01:02:48.000000000 +0100
-+++ encfs/FileUtils.cpp	2007-03-01 01:03:29.000000000 +0100
-@@ -50,10 +50,12 @@
- #include <sstream>
- 
- #include "i18n.h"
-+#include "../intl/autosprintf.h"
- 
- using namespace rel;
- using namespace rlog;
- using namespace std;
-+using gnu::autosprintf;
- 
- static const int DefaultBlockSize = 512;
- // environment variable names for values encfs stores in the environment when
diff --git a/filesystems/fuse-encfs/patches/patch-ab b/filesystems/fuse-encfs/patches/patch-ab
deleted file mode 100644
index eb347ef03a7..00000000000
--- a/filesystems/fuse-encfs/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2012/08/17 15:15:27 marino Exp $
-
---- encfs/encfs.h.orig	2007-03-01 01:04:54.000000000 +0100
-+++ encfs/encfs.h	2007-03-01 01:05:30.000000000 +0100
-@@ -48,7 +48,11 @@
- 	struct fuse_file_info *info);
- int encfs_write(const char *path, const char *buf, size_t size, off_t offset,
- 	struct fuse_file_info *info);
-+#if !defined (__NetBSD__) && !defined (__DragonFly__)
- int encfs_statfs(const char *, struct statfs *fst);
-+#else
-+int encfs_statfs(const char *, struct statvfs *fst);
-+#endif
- int encfs_fsync(const char *path, int flags, struct fuse_file_info *info);
- 
- #ifdef HAVE_XATTR
diff --git a/filesystems/fuse-encfs/patches/patch-ac b/filesystems/fuse-encfs/patches/patch-ac
deleted file mode 100644
index a5b7e64783d..00000000000
--- a/filesystems/fuse-encfs/patches/patch-ac
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2012/08/17 15:15:27 marino Exp $
-
---- encfs/encfs.cpp.orig	2007-03-01 01:05:53.000000000 +0100
-+++ encfs/encfs.cpp	2007-03-01 01:10:17.000000000 +0100
-@@ -23,7 +23,11 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <errno.h>
-+#if !defined (__NetBSD__) && !defined (__DragonFly__)
- #include <sys/statfs.h>
-+#else
-+#include <sys/statvfs.h>
-+#endif
- 
- #include <sys/types.h>
- 
-@@ -497,7 +501,11 @@
-     return res;
- }
- 
-+#if !defined (__NetBSD__) && !defined (__DragonFly__)
- int encfs_statfs(const char *path, struct statfs *st)
-+#else
-+int encfs_statfs(const char *path, struct statvfs *st)
-+#endif
- {
-     int res = -EIO;
-     try
-@@ -507,11 +515,19 @@
- 	string cyName = FSRoot->rootDirectory();
- 
- 	rLog(Info, "doing statfs of %s", cyName.c_str());
-+#if !defined (__NetBSD__) && !defined (__DragonFly__)
- 	res = statfs( cyName.c_str(), st );
-+#else
-+	res = statvfs(cyName.c_str(), st);
-+#endif
- 	if(!res) 
- 	{
-+#if !defined (__NetBSD__) && !defined (__DragonFly__)
- 	    // adjust maximum name length..
- 	    st->f_namelen     = 6 * (st->f_namelen - 2) / 8; // approx..
-+#else
-+	    st->f_namemax     = 6 * (st->f_namemax - 2) / 8;
-+#endif
- 	}
- 	if(res == -1)
- 	    res = -errno;
diff --git a/filesystems/fuse-encfs/patches/patch-ad b/filesystems/fuse-encfs/patches/patch-ad
deleted file mode 100644
index f45e5fbe523..00000000000
--- a/filesystems/fuse-encfs/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
-
---- encfs/encfs.h.orig	2007-03-01 01:13:44.000000000 +0100
-+++ encfs/encfs.h	2007-03-01 01:14:09.000000000 +0100
-@@ -22,6 +22,9 @@
- #include "config.h"
- #include <fuse.h>
- #include <unistd.h>
-+#include "../intl/autosprintf.h"
-+
-+using gnu::autosprintf;
- 
- #if defined(HAVE_SYS_XATTR_H) | defined(HAVE_ATTR_XATTR_H)
- #define HAVE_XATTR
diff --git a/filesystems/fuse-encfs/patches/patch-ae b/filesystems/fuse-encfs/patches/patch-ae
deleted file mode 100644
index a3fe0c546c0..00000000000
--- a/filesystems/fuse-encfs/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
-
---- encfs/encfsctl.cpp.orig	2007-03-01 01:23:48.000000000 +0100
-+++ encfs/encfsctl.cpp	2007-03-01 01:24:03.000000000 +0100
-@@ -31,6 +31,7 @@
- #include <string>
- 
- #include "i18n.h"
-+#include "../intl/gettext.h"
- 
- #ifdef HAVE_SSL
- #define NO_DES
diff --git a/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake b/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake
new file mode 100644
index 00000000000..9c39f1b3ffb
--- /dev/null
+++ b/filesystems/fuse-encfs/patches/patch-cmake_FindFUSE.cmake
@@ -0,0 +1,17 @@
+$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_Config.cpp b/filesystems/fuse-encfs/patches/patch-encfs_Config.cpp
deleted file mode 100644
index e76bd0f935a..00000000000
--- a/filesystems/fuse-encfs/patches/patch-encfs_Config.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-encfs_Config.cpp,v 1.1 2011/11/24 14:11:19 joerg Exp $
-
---- encfs/Config.cpp.orig	2011-11-24 00:20:46.000000000 +0000
-+++ encfs/Config.cpp
-@@ -22,6 +22,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <string.h>
- #include <unistd.h>
- 
- 
diff --git a/filesystems/fuse-encfs/patches/patch-encfs_ConfigVar.cpp b/filesystems/fuse-encfs/patches/patch-encfs_ConfigVar.cpp
deleted file mode 100644
index 89ef5c28f06..00000000000
--- a/filesystems/fuse-encfs/patches/patch-encfs_ConfigVar.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-encfs_ConfigVar.cpp,v 1.1 2011/11/24 14:11:19 joerg Exp $
-
---- encfs/ConfigVar.cpp.orig	2011-11-24 00:20:59.000000000 +0000
-+++ encfs/ConfigVar.cpp
-@@ -17,6 +17,7 @@
- 
- #include "ConfigVar.h"
- #include <rlog/rlog.h>
-+#include <string.h>
- 
- using namespace rlog;
- 
diff --git a/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp b/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp
new file mode 100644
index 00000000000..b5b65057d77
--- /dev/null
+++ b/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-encfs_DirNode.cpp,v 1.1 2017/06/19 18:41:39 maya Exp $
+
+Define _DIRENT_HAVE_D_TYPE at the top for all the OSes that support
+it. This is an untested functional change for FreeBSD and APPLE.
+
+--- encfs/DirNode.cpp.orig	2016-09-18 20:16:04.000000000 +0000
++++ encfs/DirNode.cpp
+@@ -42,6 +42,10 @@
+ #include "Error.h"
+ #include "Mutex.h"
+ 
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
++#define _DIRENT_HAVE_D_TYPE
++#endif
++
+ using namespace std;
+ 
+ namespace encfs {
+@@ -78,7 +82,7 @@ static bool _nextName(struct dirent *&de
+ 
+   if (de) {
+     if (fileType) {
+-#if defined(_DIRENT_HAVE_D_TYPE) || defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(_DIRENT_HAVE_D_TYPE)
+       *fileType = de->d_type;
+ #else
+ #warning "struct dirent.d_type not supported"
diff --git a/filesystems/fuse-encfs/patches/patch-encfs_NameIO.cpp b/filesystems/fuse-encfs/patches/patch-encfs_NameIO.cpp
deleted file mode 100644
index e9efbb27127..00000000000
--- a/filesystems/fuse-encfs/patches/patch-encfs_NameIO.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-encfs_NameIO.cpp,v 1.1 2011/11/24 14:11:19 joerg Exp $
-
---- encfs/NameIO.cpp.orig	2011-11-24 00:21:19.000000000 +0000
-+++ encfs/NameIO.cpp
-@@ -20,6 +20,7 @@
- #include <rlog/rlog.h>
- 
- #include <map>
-+#include <cstring>
- 
- using namespace std;
- using namespace rel;
diff --git a/filesystems/fuse-encfs/patches/patch-encfs_OpaqueValue.h b/filesystems/fuse-encfs/patches/patch-encfs_OpaqueValue.h
deleted file mode 100644
index 7e6fdd2569c..00000000000
--- a/filesystems/fuse-encfs/patches/patch-encfs_OpaqueValue.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-encfs_OpaqueValue.h,v 1.1 2013/02/26 10:27:37 joerg Exp $
-
---- encfs/OpaqueValue.h.orig	2013-02-25 17:46:44.000000000 +0000
-+++ encfs/OpaqueValue.h
-@@ -19,6 +19,8 @@
- #ifndef _OpaqueValue_incl_
- #define _OpaqueValue_incl_
- 
-+#include <typeinfo>
-+
- namespace rel
- {
-     class OpaqueValue;
diff --git a/filesystems/fuse-encfs/patches/patch-encfs_main.cpp b/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
new file mode 100644
index 00000000000..09d61277c92
--- /dev/null
+++ b/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-encfs_main.cpp,v 1.1 2017/06/19 18:41:39 maya Exp $
+
+--- encfs/main.cpp.orig	2016-09-18 20:16:04.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;
+ 
++#ifndef __NetBSD__ /* XXX FUSE API too old */
+   // set fuse connection options
+   conn->async_read = true;
++#endif
+ 
+   if (ctx->args->isDaemon) {
+     // Switch to using syslog.
diff --git a/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h b/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h
new file mode 100644
index 00000000000..ab68dbb8e85
--- /dev/null
+++ b/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h
@@ -0,0 +1,34 @@
+$NetBSD: patch-internal_easylogging++.h,v 1.1 2017/06/19 18:41:39 maya Exp $
+
+NetBSD support, it's a unixy OS.
+
+--- internal/easylogging++.h.orig	2016-09-18 20:16:04.000000000 +0000
++++ internal/easylogging++.h
+@@ -99,13 +99,19 @@
+ #else
+ #   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
+ #else
+ #   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
+ #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