diff options
Diffstat (limited to 'filesystems')
-rw-r--r-- | filesystems/fuse-encfs/Makefile | 4 | ||||
-rw-r--r-- | filesystems/fuse-encfs/PLIST | 3 | ||||
-rw-r--r-- | filesystems/fuse-encfs/distinfo | 15 | ||||
-rw-r--r-- | filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp | 17 | ||||
-rw-r--r-- | filesystems/fuse-encfs/patches/patch-encfs_main.cpp | 13 | ||||
-rw-r--r-- | filesystems/fuse-encfs/patches/patch-internal_easylogging++.h | 26 |
6 files changed, 21 insertions, 57 deletions
diff --git a/filesystems/fuse-encfs/Makefile b/filesystems/fuse-encfs/Makefile index caa77844b75..a7bc1fa02f1 100644 --- a/filesystems/fuse-encfs/Makefile +++ b/filesystems/fuse-encfs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2017/11/11 03:18:16 gdt Exp $ +# $NetBSD: Makefile,v 1.15 2018/03/21 22:38:57 gdt Exp $ # -DISTNAME= encfs-1.9.2 +DISTNAME= encfs-1.9.4 PKGNAME= fuse-${DISTNAME} CATEGORIES= filesystems MASTER_SITES= ${MASTER_SITE_GITHUB:=vgough/} diff --git a/filesystems/fuse-encfs/PLIST b/filesystems/fuse-encfs/PLIST index 1053be1e728..66085061533 100644 --- a/filesystems/fuse-encfs/PLIST +++ b/filesystems/fuse-encfs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2017/06/19 18:41:39 maya Exp $ +@comment $NetBSD: PLIST,v 1.3 2018/03/21 22:38:57 gdt Exp $ bin/encfs bin/encfsctl bin/encfssh @@ -54,3 +54,4 @@ 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 +share/man/man1/encfssh.1 diff --git a/filesystems/fuse-encfs/distinfo b/filesystems/fuse-encfs/distinfo index a54855839f5..1e3a152eaf9 100644 --- a/filesystems/fuse-encfs/distinfo +++ b/filesystems/fuse-encfs/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.7 2017/11/11 03:18:16 gdt Exp $ +$NetBSD: distinfo,v 1.8 2018/03/21 22:38:57 gdt Exp $ -SHA1 (encfs-1.9.2.tar.gz) = 63b065bfd1eedc4ac0dba48573df4f7ca2aa8d5b -RMD160 (encfs-1.9.2.tar.gz) = b0829b32ca6e78a748ba292cb61ee9e8a29319da -SHA512 (encfs-1.9.2.tar.gz) = 7664a2f48dddde77cae005aba70962704b002f60afb2da35c4661f7e4e22ce5c003d3b674ce125fcc72e9f0588164c1f7dbf22f2b9061d0736b8c164c1ec70a5 -Size (encfs-1.9.2.tar.gz) = 11043181 bytes -SHA1 (patch-encfs_DirNode.cpp) = 7c7ddc2a125e8dfb2373c700a2e5d1c5a69fab39 -SHA1 (patch-encfs_main.cpp) = b0d19b93f821b1c6147f59163cc7dad4eec8efb0 -SHA1 (patch-internal_easylogging++.h) = fa13f1fd0b3f6c88356b5ca7af334d701cf9a4cd +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_main.cpp) = f7f1d9aa6d953aee98b534428e111f38b012d70f diff --git a/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp b/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp index b5b65057d77..df7e3d7bf43 100644 --- a/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp +++ b/filesystems/fuse-encfs/patches/patch-encfs_DirNode.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-encfs_DirNode.cpp,v 1.1 2017/06/19 18:41:39 maya Exp $ +$NetBSD: patch-encfs_DirNode.cpp,v 1.2 2018/03/21 22:38:57 gdt 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.orig 2018-01-28 21:07:41.000000000 +0000 +++ encfs/DirNode.cpp @@ -42,6 +42,10 @@ - #include "Error.h" - #include "Mutex.h" + #include "NameIO.h" + #include "easylogging++.h" +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) +#define _DIRENT_HAVE_D_TYPE @@ -16,12 +16,3 @@ it. This is an untested functional change for FreeBSD and APPLE. 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_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 diff --git a/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h b/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h deleted file mode 100644 index f426e7c95d5..00000000000 --- a/filesystems/fuse-encfs/patches/patch-internal_easylogging++.h +++ /dev/null @@ -1,26 +0,0 @@ -$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 2017-07-25 18:26:45.000000000 +0000 -+++ internal/easylogging++.h -@@ -98,13 +98,18 @@ - #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 |