CVS commit: pkgsrc/filesystems/fuse-unionfs

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri May 15 16:00:55 UTC 2026

Modified Files:
        pkgsrc/filesystems/fuse-unionfs: Makefile distinfo
        pkgsrc/filesystems/fuse-unionfs/patches: patch-Makefile

Log Message:
filesystems/fuse-unionfs: update to 3.7

# changes (since 2.0)

3.7
- fix chmod on symlink itself

3.6
- fix long standing bug with directory renames in cow mode (see #91)

3.5
- fix compilation on 32bit systems

3.4
- default to fuse2 api on macos when compiling

3.3
- fixed fortified compilation
- disabled logging to file since it had some unresolved locking issues
- add support for direct_io

3.2
- various nfs fixes
- various race condition fixes

3.1
- just fixes version mess (in manual file, cmake, etc.)

3.0
- libfuse3 support (and use is as new default)
- add branch-preserving logic
- make it compile under MacOS again
- minor fixes

2.2
- fixed timestamp precision lost on cow copy

2.1
- fixed Finder fails on MacOS
- Implement access() for "cow,relaxed_permissions" use case


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/filesystems/fuse-unionfs/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/filesystems/fuse-unionfs/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile

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-unionfs/Makefile
diff -u pkgsrc/filesystems/fuse-unionfs/Makefile:1.8 pkgsrc/filesystems/fuse-unionfs/Makefile:1.9
--- pkgsrc/filesystems/fuse-unionfs/Makefile:1.8        Mon Sep 17 14:33:35 2018
+++ pkgsrc/filesystems/fuse-unionfs/Makefile    Fri May 15 16:00:55 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2018/09/17 14:33:35 leot Exp $
+# $NetBSD: Makefile,v 1.9 2026/05/15 16:00:55 vins Exp $
 
-DISTNAME=      unionfs-fuse-2.0
+DISTNAME=      unionfs-fuse-3.7
 PKGNAME=       ${DISTNAME:S/unionfs-fuse/fuse-unionfs/}
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rpodgorny/}
@@ -13,11 +13,24 @@ COMMENT=    FUSE-based union filesystem
 LICENSE=       modified-bsd
 
 BUILD_TARGET=  build
+TEST_TARGET=   test
+
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
 USE_TOOLS+=    gmake pkg-config bash:run
+USE_FUSE3=     yes
+
+PYTHON_FOR_BUILD_ONLY=         test
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 REPLACE_BASH+= mount.unionfs
+REPLACE_PYTHON=        test_all.py
 
-MAKE_ENV+=             MANDIR=${PKGMANDIR}
+MAKE_ENV+=     PREFIX=${PREFIX} \
+               MANDIR=${PKGMANDIR} \
+               PYTHON=${PYTHONBIN:Q}
 
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/fuse.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/filesystems/fuse-unionfs/distinfo
diff -u pkgsrc/filesystems/fuse-unionfs/distinfo:1.9 pkgsrc/filesystems/fuse-unionfs/distinfo:1.10
--- pkgsrc/filesystems/fuse-unionfs/distinfo:1.9        Tue Oct 26 10:25:29 2021
+++ pkgsrc/filesystems/fuse-unionfs/distinfo    Fri May 15 16:00:55 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:25:29 nia Exp $
+$NetBSD: distinfo,v 1.10 2026/05/15 16:00:55 vins Exp $
 
-BLAKE2s (unionfs-fuse-2.0.tar.gz) = 8224c1865da4b003e803dd568a06034b4808732392fefe4c9e80b03f7eabb147
-SHA512 (unionfs-fuse-2.0.tar.gz) = 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
-Size (unionfs-fuse-2.0.tar.gz) = 46537 bytes
-SHA1 (patch-Makefile) = b4eceef7cd6131e8f6446fea98ec367e83202497
+BLAKE2s (unionfs-fuse-3.7.tar.gz) = 01779c99466a6dc05a2a849ebd1af2c5ec5d47c3fbc2cf228ebc19c879484d60
+SHA512 (unionfs-fuse-3.7.tar.gz) = 51f5c4854af5d826ab3ddbf7e106f3bbd48f3af63dff667ea47f35a171b7d683ec13c61776a8280766e1e21382a576831f73ce4575c538f05c5e1648bf7376f3
+Size (unionfs-fuse-3.7.tar.gz) = 56444 bytes
+SHA1 (patch-Makefile) = 3a084632bc506cbb9800578478fa6752a16dcb51

Index: pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile
diff -u pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile:1.2 pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile:1.3
--- pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile:1.2  Mon Sep 17 14:33:35 2018
+++ pkgsrc/filesystems/fuse-unionfs/patches/patch-Makefile      Fri May 15 16:00:55 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.2 2018/09/17 14:33:35 leot Exp $
+$NetBSD: patch-Makefile,v 1.3 2026/05/15 16:00:55 vins Exp $
 
-Allow overriding PREFIX.
+Do not override pkgsrc defaults.
 
---- Makefile.orig      2016-11-22 00:57:34.000000000 +0000
+--- Makefile.orig      2025-09-14 17:29:51.000000000 +0000
 +++ Makefile
-@@ -1,6 +1,7 @@
+@@ -1,19 +1,20 @@
 -PREFIX=/usr/local
 -BINDIR=/bin
 -SBINDIR=/sbin
@@ -15,7 +15,23 @@ Allow overriding PREFIX.
  
  build:
        $(MAKE) -C src/
-@@ -26,10 +27,10 @@ coverage:
+ 
+ build_coverage:
+-      CFLAGS="-g -O0 -fprofile-arcs -ftest-coverage" \
+-             LDFLAGS="-lgcov -coverage" $(MAKE) -C src/
++      CFLAGS="$(CFLAGS) -fprofile-arcs -ftest-coverage" \
++      LDFLAGS="$(LDFLAGS) -lgcov -coverage" $(MAKE) -C src/
+ 
+ clean: clean_coverage
+       $(MAKE) -C src/ clean
+ 
+ test: clean build
+-      python3 -m pytest
++      ${PYTHON} -m pytest
+ 
+ test_coverage: clean build_coverage coverage
+       python3 -m pytest
+@@ -29,10 +30,10 @@ coverage:
        mkdir $@
  
  install: build