head	1.4;
access;
symbols
	pkgsrc-2026Q1:1.4.0.34
	pkgsrc-2026Q1-base:1.4
	pkgsrc-2025Q4:1.4.0.32
	pkgsrc-2025Q4-base:1.4
	pkgsrc-2025Q3:1.4.0.30
	pkgsrc-2025Q3-base:1.4
	pkgsrc-2025Q2:1.4.0.28
	pkgsrc-2025Q2-base:1.4
	pkgsrc-2025Q1:1.4.0.26
	pkgsrc-2025Q1-base:1.4
	pkgsrc-2024Q4:1.4.0.24
	pkgsrc-2024Q4-base:1.4
	pkgsrc-2024Q3:1.4.0.22
	pkgsrc-2024Q3-base:1.4
	pkgsrc-2024Q2:1.4.0.20
	pkgsrc-2024Q2-base:1.4
	pkgsrc-2024Q1:1.4.0.18
	pkgsrc-2024Q1-base:1.4
	pkgsrc-2023Q4:1.4.0.16
	pkgsrc-2023Q4-base:1.4
	pkgsrc-2023Q3:1.4.0.14
	pkgsrc-2023Q3-base:1.4
	pkgsrc-2023Q2:1.4.0.12
	pkgsrc-2023Q2-base:1.4
	pkgsrc-2023Q1:1.4.0.10
	pkgsrc-2023Q1-base:1.4
	pkgsrc-2022Q4:1.4.0.8
	pkgsrc-2022Q4-base:1.4
	pkgsrc-2022Q3:1.4.0.6
	pkgsrc-2022Q3-base:1.4
	pkgsrc-2022Q2:1.4.0.4
	pkgsrc-2022Q2-base:1.4
	pkgsrc-2022Q1:1.4.0.2
	pkgsrc-2022Q1-base:1.4
	pkgsrc-2021Q4:1.3.0.2
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.2.0.20
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.18
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.16
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.14
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.12
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.10
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.6
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.8
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.4
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.2
	pkgsrc-2019Q2-base:1.2;
locks; strict;
comment	@// @;


1.4
date	2022.01.22.18.32.47;	author pho;	state Exp;
branches;
next	1.3;
commitid	JkqP32UgiyzKYEpD;

1.3
date	2021.12.01.04.45.52;	author pho;	state Exp;
branches;
next	1.2;
commitid	4eyDgMgR7jlH4UiD;

1.2
date	2019.04.09.16.43.10;	author maya;	state Exp;
branches;
next	1.1;
commitid	LCbODc8iVC3E7HiB;

1.1
date	2019.04.09.16.32.28;	author maya;	state Exp;
branches;
next	;
commitid	wdRmesXDzvWW3HiB;


desc
@@


1.4
log
@Conditionalise workarounds for old NetBSD librefuse
@
text
@$NetBSD: patch-encfs_FileUtils.cpp,v 1.3 2021/12/01 04:45:52 pho Exp $

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.

Already fixed in HEAD.

--- encfs/FileUtils.cpp.orig	2018-04-27 08:52:22.000000000 +0000
+++ encfs/FileUtils.cpp
@@@@ -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_H_ < 20211204
+  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
@


1.3
log
@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
@
text
@d1 1
a1 1
$NetBSD: patch-encfs_FileUtils.cpp,v 1.2 2019/04/09 16:43:10 maya Exp $
d3 1
a3 1
NetBSD ReFUSE doesn't have the fuse_unmount from FUSE 2.2 - FUSE 2.9.
d6 1
a6 2
This might be a temporal aberration: NetBSD ReFUSE had the newer FUSE
API before upstream FUSE did.
d14 1
a14 1
+#if defined(__NetBSD__)
@


1.2
log
@fuse-encfs: update comment.

It's unclear what is happening here, but apparently netbsd knew future FUSE
API before upstream FUSE did. And it didn't do the in-between version
used here.
@
text
@d1 1
a1 1
$NetBSD: patch-encfs_FileUtils.cpp,v 1.1 2019/04/09 16:32:28 maya Exp $
d9 1
a9 1
--- encfs/FileUtils.cpp.orig	2018-01-28 21:07:41.000000000 +0000
d11 12
a22 9
@@@@ -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);
@


1.1
log
@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!
@
text
@d1 1
a1 1
$NetBSD$
d3 5
a7 2
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.
@