CVS commit: pkgsrc/filesystems/fuse-s3fs

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun May 10 14:40:44 UTC 2026

Modified Files:
        pkgsrc/filesystems/fuse-s3fs: Makefile distinfo
        pkgsrc/filesystems/fuse-s3fs/patches: patch-configure.ac
            patch-src_s3fs.cpp patch-test_mknod__test.cc
Removed Files:
        pkgsrc/filesystems/fuse-s3fs/patches: patch-src_s3fs.h

Log Message:
filesystems/fuse-s3fs: update to 1.97

# changes

Version 1.97 -- 7 Dec, 2025 (major changes only)
#2765 Do not honor -o nonempty when compiled with FUSE 3

Version 1.96 -- 24 Nov, 2025 (major changes only)
#1867 - Require FUSE 3 on Linux
#2596 - Require C++14
#2623 - Improve IO concurrency
#2669 - Rename `-o endpoint` to `-o region` for clarity
#2728 - #2731 - #2736 - Avoid HeadObject calls with improved stats cache usage

Version 1.95 -- 25 Oct, 2024 (major changes only)
#2424 - Add ipresolve option to select IPv4- or IPv6-only
#2443 - Retry request on HTTP 429 error
#2448 - Changed s3fs logo
#2455 - Fix deadlock in FdManager::ChangeEntityToTempPath
#2487 - #2492 - #2493 - Enable static lock checking and fix locking errors
#2506 - #2517 - Fix Windows compilation
#2515 - Fix FreeBSD support
#2532 - Fix use-after-free in FdManager::ChangeEntityToTempPath


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/filesystems/fuse-s3fs/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/filesystems/fuse-s3fs/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/filesystems/fuse-s3fs/patches/patch-configure.ac \
    pkgsrc/filesystems/fuse-s3fs/patches/patch-src_s3fs.cpp \
    pkgsrc/filesystems/fuse-s3fs/patches/patch-test_mknod__test.cc
cvs rdiff -u -r1.1 -r0 pkgsrc/filesystems/fuse-s3fs/patches/patch-src_s3fs.h

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-s3fs/Makefile
diff -u pkgsrc/filesystems/fuse-s3fs/Makefile:1.13 pkgsrc/filesystems/fuse-s3fs/Makefile:1.14
--- pkgsrc/filesystems/fuse-s3fs/Makefile:1.13  Fri Feb  6 10:04:42 2026
+++ pkgsrc/filesystems/fuse-s3fs/Makefile       Sun May 10 14:40:43 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2026/02/06 10:04:42 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2026/05/10 14:40:43 vins Exp $
 
-DISTNAME=      fuse-s3fs-1.94
-PKGREVISION=   10
+DISTNAME=      fuse-s3fs-1.97
 CATEGORIES=    filesystems
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=s3fs-fuse/}
 GITHUB_PROJECT=        s3fs-fuse
@@ -12,18 +11,15 @@ HOMEPAGE=   https://github.com/s3fs-fuse/s
 COMMENT=       FUSE file-system and utilities for S3-compatible APIs
 LICENSE=       gnu-gpl-v2
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 100000
-# fuse-s3fs wants FUSE 2.9 API but refuse(3) in NetBSD 9 only supports 2.6
-# API.
-PKG_FAIL_REASON+=      "This package does not support NetBSD < 10."
-.endif
+# Needs FUSE 3.0 API but refuse(3) in NetBSD 9 only supports 2.6
+NOT_FOR_PLATFORM+=     NetBSD-[0-9].*-*
 
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_LANGUAGES=         c c++
 USE_CXX_FEATURES=      c++11
 USE_TOOLS+=            autoheader automake autoreconf gmake pkg-config
+USE_FUSE3=             yes
 
 # configure.ac uses a non-standard option "-r" for date(1). "stat -f" is
 # GNU-ism and "stat -t" is BSD-ism. There seems to be no portable way to do

Index: pkgsrc/filesystems/fuse-s3fs/distinfo
diff -u pkgsrc/filesystems/fuse-s3fs/distinfo:1.1 pkgsrc/filesystems/fuse-s3fs/distinfo:1.2
--- pkgsrc/filesystems/fuse-s3fs/distinfo:1.1   Thu Apr 18 04:02:26 2024
+++ pkgsrc/filesystems/fuse-s3fs/distinfo       Sun May 10 14:40:43 2026
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.1 2024/04/18 04:02:26 pho Exp $
+$NetBSD: distinfo,v 1.2 2026/05/10 14:40:43 vins Exp $
 
-BLAKE2s (fuse-s3fs-1.94.tar.gz) = ae5f3ffe65c07a16ceaeccb1658c51d332816f1da4d0eda3abb44ac4df6121ad
-SHA512 (fuse-s3fs-1.94.tar.gz) = 1a29d4f0b73f844ea1d4ad6e0b36d601fb7ab5818af0a90564b77182564c04fbef308362a9a749038b17f28f07f79b6debb661610f69c039a405b931361abe9c
-Size (fuse-s3fs-1.94.tar.gz) = 291170 bytes
-SHA1 (patch-configure.ac) = d761cf011cccfc378458a65457d22ca656244e97
-SHA1 (patch-src_s3fs.cpp) = 86a513c3e312761b2c4031196f5489f1c4e63209
-SHA1 (patch-src_s3fs.h) = 93329f55fb01a77821c7d33bd3f799972ca75c19
-SHA1 (patch-test_mknod__test.cc) = 5f03e8bd3a44c43f612cfb13a149c4322bd09035
+BLAKE2s (fuse-s3fs-1.97.tar.gz) = 41c9d055ca40cbaebcb560583ba0f12eb2f55a94f9b3fb15f9027ca1236711ee
+SHA512 (fuse-s3fs-1.97.tar.gz) = 24b70877a5c162252f08e55176a9e9fa2fd380ed3bbe8f51306f0e1489038a80cbd2a07699689431e3294661fa8d0f2434e7fc94cd14e6c9b4b8fa8be2e1f8a7
+Size (fuse-s3fs-1.97.tar.gz) = 307251 bytes
+SHA1 (patch-configure.ac) = 67480342f57efe1cdcde070db0ed3841cd4cd276
+SHA1 (patch-src_s3fs.cpp) = 0e2afb2f0e5d1f98d57b2e7ee2713e785e614f37
+SHA1 (patch-test_mknod__test.cc) = ba284eb87141b5dc5413655294856bfa5875bda9

Index: pkgsrc/filesystems/fuse-s3fs/patches/patch-configure.ac
diff -u pkgsrc/filesystems/fuse-s3fs/patches/patch-configure.ac:1.1 pkgsrc/filesystems/fuse-s3fs/patches/patch-configure.ac:1.2
--- pkgsrc/filesystems/fuse-s3fs/patches/patch-configure.ac:1.1 Thu Apr 18 04:02:26 2024
+++ pkgsrc/filesystems/fuse-s3fs/patches/patch-configure.ac     Sun May 10 14:40:43 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.1 2024/04/18 04:02:26 pho Exp $
+$NetBSD: patch-configure.ac,v 1.2 2026/05/10 14:40:43 vins Exp $
 
 Hunk #0:
     See patch-src_s3fs.cpp.
@@ -8,9 +8,9 @@ Hunk #1:
     Do not define _FORTIFY_SOURCE. pkgsrc automatically handle it.
     This is pkgsrc-specific and is not eligible for upstreaming.
 
---- configure.ac.orig  2024-02-25 04:08:43.000000000 +0000
+--- configure.ac.orig  2025-12-07 20:44:50.000000000 +0000
 +++ configure.ac
-@@ -32,9 +32,11 @@ AC_PROG_CC
+@@ -32,12 +32,14 @@ AC_PROG_CC
  AC_CHECK_HEADERS([sys/xattr.h])
  AC_CHECK_HEADERS([attr/xattr.h])
  AC_CHECK_HEADERS([sys/extattr.h])
@@ -18,8 +18,11 @@ Hunk #1:
 +AC_CHECK_HEADERS([sys/sysmacros.h])
  AC_CHECK_FUNCS([fallocate])
  
--CXXFLAGS="-Wall -fno-exceptions -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=3 -std=c++11 $CXXFLAGS"
-+CXXFLAGS="-Wall -fno-exceptions -D_FILE_OFFSET_BITS=64 -std=c++11 $CXXFLAGS"
+ CPP_VERSION=c++14
+ AC_SUBST([CPP_VERSION])
+ 
+-CXXFLAGS="-Wall -fno-exceptions -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=3 -std=$CPP_VERSION $CXXFLAGS"
++CXXFLAGS="-Wall -fno-exceptions -D_FILE_OFFSET_BITS=64 -std=$CPP_VERSION $CXXFLAGS"
  
  dnl ----------------------------------------------
  dnl For macOS
Index: pkgsrc/filesystems/fuse-s3fs/patches/patch-src_s3fs.cpp
diff -u pkgsrc/filesystems/fuse-s3fs/patches/patch-src_s3fs.cpp:1.1 pkgsrc/filesystems/fuse-s3fs/patches/patch-src_s3fs.cpp:1.2
--- pkgsrc/filesystems/fuse-s3fs/patches/patch-src_s3fs.cpp:1.1 Thu Apr 18 04:02:26 2024
+++ pkgsrc/filesystems/fuse-s3fs/patches/patch-src_s3fs.cpp     Sun May 10 14:40:43 2026
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_s3fs.cpp,v 1.1 2024/04/18 04:02:26 pho Exp $
+$NetBSD: patch-src_s3fs.cpp,v 1.2 2026/05/10 14:40:43 vins Exp $
 
 Fix build on NetBSD: <sys/wait.h> is required for WIFEXITED()
 TODO: Upstream this
 
---- src/s3fs.cpp.orig  2024-04-17 13:55:35.890317856 +0000
+--- src/s3fs.cpp.orig  2025-12-07 20:44:50.000000000 +0000
 +++ src/s3fs.cpp
 @@ -18,6 +18,8 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -14,13 +14,13 @@ TODO: Upstream this
  #include <algorithm>
  #include <atomic>
  #include <cerrno>
-@@ -28,6 +30,9 @@
- #include <unistd.h>
- #include <dirent.h>
+@@ -31,6 +33,9 @@
+ #include <utility>
+ #include <dirent.h>  // NOLINT(misc-include-cleaner)
  #include <sys/types.h>
 +#if defined(HAVE_SYS_WAIT_H)
 +#  include <sys/wait.h>
 +#endif
- #include <getopt.h>
+ #include <getopt.h>  // NOLINT(misc-include-cleaner)
  
  #include "common.h"
Index: pkgsrc/filesystems/fuse-s3fs/patches/patch-test_mknod__test.cc
diff -u pkgsrc/filesystems/fuse-s3fs/patches/patch-test_mknod__test.cc:1.1 pkgsrc/filesystems/fuse-s3fs/patches/patch-test_mknod__test.cc:1.2
--- pkgsrc/filesystems/fuse-s3fs/patches/patch-test_mknod__test.cc:1.1  Thu Apr 18 04:02:26 2024
+++ pkgsrc/filesystems/fuse-s3fs/patches/patch-test_mknod__test.cc      Sun May 10 14:40:43 2026
@@ -1,9 +1,9 @@
-$NetBSD: patch-test_mknod__test.cc,v 1.1 2024/04/18 04:02:26 pho Exp $
+$NetBSD: patch-test_mknod__test.cc,v 1.2 2026/05/10 14:40:43 vins Exp $
 
 Fix build on NetBSD: <sys/sysmacros.h> doesn't exist on this OS.
 TODO: Upstream this.
 
---- test/mknod_test.cc.orig    2024-04-17 14:07:06.018370712 +0000
+--- test/mknod_test.cc.orig    2025-12-07 20:44:50.000000000 +0000
 +++ test/mknod_test.cc
 @@ -18,6 +18,8 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -14,14 +14,12 @@ TODO: Upstream this.
  #include <cerrno>
  #include <cstdio>
  #include <cstdlib>
-@@ -26,8 +28,8 @@
+@@ -26,7 +28,7 @@
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <unistd.h>
--#ifndef __APPLE__
--#include <sys/sysmacros.h>
+-#if !defined(__APPLE__) && !defined(__FreeBSD__)
 +#if defined(HAVE_SYS_SYSMACROS_H)
-+#  include <sys/sysmacros.h>
+ #include <sys/sysmacros.h>
  #endif
  
- //---------------------------------------------------------