Switch to libfuse 3.1.0

libfuse 3.0.0 is rather new and not widely used yet, so requiring
libfuse 3.1.0 right away shouldn't be a problem.

ChangeLog.rst

@@ -1,7 +1,7 @@
 Unreleased Changes
 ------------------
 
-* sshfs now requires libfuse 3.0.0 or newer.
+* sshfs now requires libfuse 3.1.0 or newer.
 * When supported by the kernel, sshfs now uses writeback caching.
 * The `cache` option has been renamed to `dir_cache` for clarity.  
 * Added unit tests

Makefile.am

@@ -12,7 +12,7 @@ endif
 
 sshfs_LDADD = $(SSHFS_LIBS)
 sshfs_CFLAGS = $(SSHFS_CFLAGS)
-sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=30 -DLIBDIR=\"$(libdir)\" \
+sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=31 -DLIBDIR=\"$(libdir)\" \
                  -DIDMAP_DEFAULT="\"$(IDMAP_DEFAULT)\""
 
 EXTRA_DIST = sshfs.1.in meson.build

README.rst

@@ -42,7 +42,7 @@ Installation
 
 First, download the latest SSHFS release from
 https://github.com/libfuse/sshfs/releases. On Linux and BSD, you will
-also need to install libfuse_ 3.0.0 or newer. On OS-X, you need
+also need to install libfuse_ 3.1.0 or newer. On OS-X, you need
 OSXFUSE_ instead. Finally, you need the Glib_ library with development
 headers (which should be available from your operating system's
 package manager).

configure.ac

@@ -17,7 +17,7 @@ case "$target_os" in
 esac
 
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
-PKG_CHECK_MODULES([SSHFS], [fuse >= 3.0 glib-2.0 gthread-2.0])
+PKG_CHECK_MODULES([SSHFS], [fuse >= 3.1 glib-2.0 gthread-2.0])
 have_fuse_opt_parse=no
 oldlibs="$LIBS"
 LIBS="$LIBS $SSHFS_LIBS"

meson.build

@@ -45,14 +45,14 @@ configure_file(input: 'sshfs.1.in',
 configure_file(output: 'config.h',
                configuration : cfg)
 
-sshfs_deps = [ dependency('fuse3', version: '>= 3.0.0'),
+sshfs_deps = [ dependency('fuse3', version: '>= 3.1.0'),
                dependency('glib-2.0'),
                dependency('gthread-2.0') ]
 
 executable('sshfs', sshfs_sources,
            include_directories: include_dirs,
            dependencies: sshfs_deps,
-           c_args: ['-DFUSE_USE_VERSION=30'],
+           c_args: ['-DFUSE_USE_VERSION=31'],
            install: true,
            install_dir: get_option('bindir'))
 

sshfs.c

@@ -3884,11 +3884,7 @@ int main(int argc, char *argv[])
 
 	if (sshfs.show_help) {
 		usage(args.argv[0]);
-		/* Re-add --help */
-		if (fuse_opt_add_arg(&args, "--help") == -1)
-			exit(1);
-		/* Print FUSE help text */
-		assert(fuse_new(&args, NULL, 0, NULL) == NULL);
+		fuse_lib_help(&args);
 		exit(0);
 	} else if (!sshfs.host) {
 		fprintf(stderr, "missing host\n");