Conditionalise workarounds for old NetBSD librefuse

4 files changed, 12 insertions, 16 deletions

diff --git a/filesystems/fuse-encfs/Makefile b/filesystems/fuse-encfs/Makefile
index 065dd4e9189..41e35aa6351 100644
--- a/filesystems/fuse-encfs/Makefile
+++ b/filesystems/fuse-encfs/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2021/12/01 04:45:51 pho Exp $
+# $NetBSD: Makefile,v 1.21 2022/01/22 18:32:47 pho Exp $
 #
 
 GITHUB_PROJECT=	encfs
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	encfs-1.9.5
+PKGREVISION=	1
 PKGNAME=	fuse-${DISTNAME}
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_GITHUB:=vgough/}
diff --git a/filesystems/fuse-encfs/distinfo b/filesystems/fuse-encfs/distinfo
index d8edba84afa..38863563aba 100644
--- a/filesystems/fuse-encfs/distinfo
+++ b/filesystems/fuse-encfs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2021/12/01 04:45:51 pho Exp $
+$NetBSD: distinfo,v 1.15 2022/01/22 18:32:47 pho Exp $
 
 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) = 527cd0ee50139a9fc8bb126dfe818a7624dac3dd
-SHA1 (patch-encfs_main.cpp) = 8c1b9f6fa819062928171802f94aac21565c2798
+SHA1 (patch-encfs_FileUtils.cpp) = 05e67084abb853d8d01f6da2079994689722a343
+SHA1 (patch-encfs_main.cpp) = d1215725edce4b6ec766e6b96f46acb441dd4088
diff --git a/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp b/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp
index 0590c8de92a..66d4c4d0bca 100644
--- a/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp
+++ b/filesystems/fuse-encfs/patches/patch-encfs_FileUtils.cpp
@@ -1,10 +1,9 @@
-$NetBSD: patch-encfs_FileUtils.cpp,v 1.3 2021/12/01 04:45:52 pho Exp $
+$NetBSD: patch-encfs_FileUtils.cpp,v 1.4 2022/01/22 18:32:47 pho Exp $
 
-NetBSD ReFUSE doesn't have the fuse_unmount from FUSE 2.2 - FUSE 2.9.
+NetBSD ReFUSE didn'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.
+Already fixed in HEAD.
 
 --- encfs/FileUtils.cpp.orig	2018-04-27 08:52:22.000000000 +0000
 +++ encfs/FileUtils.cpp
@@ -12,7 +11,7 @@ API before upstream FUSE did.
  
  void unmountFS(const char *mountPoint) {
    // fuse_unmount returns void, is assumed to succeed
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) && FUSE_H_ < 20211204
 +  fuse_unmount(fuse_get_context()->fuse);
 +#else
    fuse_unmount(mountPoint, nullptr);
diff --git a/filesystems/fuse-encfs/patches/patch-encfs_main.cpp b/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
index 62e8b5f1e61..3b8724cb7eb 100644
--- a/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
+++ b/filesystems/fuse-encfs/patches/patch-encfs_main.cpp
@@ -1,10 +1,6 @@
-$NetBSD: patch-encfs_main.cpp,v 1.5 2021/12/01 04:45:52 pho Exp $
+$NetBSD: patch-encfs_main.cpp,v 1.6 2022/01/22 18:32:47 pho Exp $
 
-Work around older FUSE API on NetBSD.
-  
-\todo Determine how to qualify this by version.
-\todo Enhance API in NetBSD.
-\todo File with encfs upstream.
+Work around older FUSE API on NetBSD. Already fixed in HEAD.
 
 --- encfs/main.cpp.orig	2018-04-27 08:52:22.000000000 +0000
 +++ encfs/main.cpp
@@ -12,7 +8,7 @@ Work around older FUSE API on NetBSD.
    auto *ctx = (EncFS_Context *)fuse_get_context()->private_data;
  
    // set fuse connection options
-+#ifndef __NetBSD__ /* XXX FUSE API too old */
++#if !defined(__NetBSD__) || FUSE_H_ >= 20211204 /* XXX FUSE API too old */
    conn->async_read = 1u;
 +#endif