CVS commit: pkgsrc/filesystems/fuse-encfs

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Wed Dec  1 04:45:52 UTC 2021

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

Log Message:
Update to encfs-1.9.5

v1.9.5 / 2018-04-27
===================
        * Correct a int/off_t buffer overflow in getSize()
        * Correct a possible write crash
        * Correct encfsctl cat and add reverse cat
        * Add -c & -u cmdline options
        * Add --noattrcache & --nodatacache cmdline options
        * Ignore .encfs6.xml file in reverse mode
        * Do not count usage on root path (to avoid resetting the --idle option)
        * Use stderr instead of stdout for error messages
        * Add the ability to disable data encryption (absolutely discouraged)
        * Add Cygwin support


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/filesystems/fuse-encfs/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/filesystems/fuse-encfs/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.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.19 pkgsrc/filesystems/fuse-encfs/Makefile:1.20
--- pkgsrc/filesystems/fuse-encfs/Makefile:1.19 Sat Jan 18 21:49:20 2020
+++ pkgsrc/filesystems/fuse-encfs/Makefile      Wed Dec  1 04:45:51 2021
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.19 2020/01/18 21:49:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2021/12/01 04:45:51 pho Exp $
 #
 
 GITHUB_PROJECT=        encfs
 GITHUB_TAG=    v${PKGVERSION_NOREV}
-DISTNAME=      encfs-1.9.4
+DISTNAME=      encfs-1.9.5
 PKGNAME=       fuse-${DISTNAME}
-PKGREVISION=   3
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vgough/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.arg0.net/encfs
+HOMEPAGE=      https://vgough.github.io/encfs/
 COMMENT=       FUSE Encrypted Filesystem
 LICENSE=       gnu-gpl-v3
 

Index: pkgsrc/filesystems/fuse-encfs/distinfo
diff -u pkgsrc/filesystems/fuse-encfs/distinfo:1.13 pkgsrc/filesystems/fuse-encfs/distinfo:1.14
--- pkgsrc/filesystems/fuse-encfs/distinfo:1.13 Tue Oct 26 10:25:27 2021
+++ pkgsrc/filesystems/fuse-encfs/distinfo      Wed Dec  1 04:45:51 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:25:27 nia Exp $
+$NetBSD: distinfo,v 1.14 2021/12/01 04:45:51 pho Exp $
 
-BLAKE2s (encfs-1.9.4.tar.gz) = eff113bc6b7894bd72f85dddd9604586a2725f3ed7a0b9c6d4ebe54d928c7d5a
-SHA512 (encfs-1.9.4.tar.gz) = 082e35e6eae4730b5e7827eed729422f9d995ebe9e441c5f9725f39cc2f46f014ac1479c7b0a7ce04e9e7228c1a93ecf5b4228e667fc48e6a7d3b68d2324cd0b
-Size (encfs-1.9.4.tar.gz) = 2794574 bytes
+BLAKE2s (encfs-1.9.5.tar.gz) = 58fea7cdf47aadffcfbf315f5881ceb77da74e07a964042d7d3a7e8587f13362
+SHA512 (encfs-1.9.5.tar.gz) = 036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46
+Size (encfs-1.9.5.tar.gz) = 2798888 bytes
 SHA1 (patch-encfs_DirNode.cpp) = 960480ee442f534357e3325c5001b6056b2338a6
-SHA1 (patch-encfs_FileUtils.cpp) = 52cfc5d4111f052f490cb64ca7bd00e70ee2e664
-SHA1 (patch-encfs_main.cpp) = b3dea40037df093183c008917690fc486e8608a9
+SHA1 (patch-encfs_FileUtils.cpp) = 527cd0ee50139a9fc8bb126dfe818a7624dac3dd
+SHA1 (patch-encfs_main.cpp) = 8c1b9f6fa819062928171802f94aac21565c2798

Index: pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp
diff -u pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp:1.2 pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp:1.3
--- pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp:1.2 Tue Apr  9 16:43:10 2019
+++ pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp     Wed Dec  1 04:45:52 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-encfs_FileUtils.cpp,v 1.2 2019/04/09 16:43:10 maya Exp $
+$NetBSD: patch-encfs_FileUtils.cpp,v 1.3 2021/12/01 04:45:52 pho Exp $
 
 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.
@@ -6,14 +6,17 @@ Workaround by using the version belongin
 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.orig   2018-04-27 08:52:22.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);
+@@ -1734,7 +1734,11 @@ RootPtr initFS(EncFS_Context *ctx, const
+ 
+ void unmountFS(const char *mountPoint) {
+   // fuse_unmount returns void, is assumed to succeed
++#if defined(__NetBSD__)
++  fuse_unmount(fuse_get_context()->fuse);
++#else
+   fuse_unmount(mountPoint, nullptr);
++#endif
+ #ifdef __APPLE__
+   // fuse_unmount does not work on Mac OS, see #428
+   // However it makes encfs to hang, so we must unmount

Index: pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
diff -u pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp:1.4 pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp:1.5
--- pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp:1.4      Wed Apr 10 12:33:02 2019
+++ pkgsrc/filesystems/fuse-encfs/patches/patch-encfs_main.cpp  Wed Dec  1 04:45:52 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-encfs_main.cpp,v 1.4 2019/04/10 12:33:02 gdt Exp $
+$NetBSD: patch-encfs_main.cpp,v 1.5 2021/12/01 04:45:52 pho Exp $
 
 Work around older FUSE API on NetBSD.
   
@@ -6,9 +6,9 @@ Work around older FUSE API on NetBSD.
 \todo Enhance API in NetBSD.
 \todo File with encfs upstream.
 
---- encfs/main.cpp.orig        2018-01-28 21:07:41.000000000 +0000
+--- encfs/main.cpp.orig        2018-04-27 08:52:22.000000000 +0000
 +++ encfs/main.cpp
-@@ -530,7 +530,9 @@ void *encfs_init(fuse_conn_info *conn) {
+@@ -619,7 +619,9 @@ void *encfs_init(fuse_conn_info *conn) {
    auto *ctx = (EncFS_Context *)fuse_get_context()->private_data;
  
    // set fuse connection options
@@ -16,5 +16,5 @@ Work around older FUSE API on NetBSD.
    conn->async_read = 1u;
 +#endif
  
-   // if an idle timeout is specified, then setup a thread to monitor the
-   // filesystem.
+ #ifdef __CYGWIN__
+   // WinFsp needs this to partially handle read-only FS