Merge branch 'libfuse:master' into persistent-dcache

.git-blame-ignore-revs

@@ -0,0 +1 @@
+d54c7ecbd618afb4df524e0d96dec7fe7cc2935d

.github/ISSUE_TEMPLATE/issue-report.md

@@ -11,7 +11,7 @@ PLEASE READ BEFORE REPORTING AN ISSUE
 
 SSHFS does not have any active, regular contributors or developers. The current maintainer continues to apply pull requests and tries to make regular releases, but unfortunately has no capacity to do any development beyond addressing high-impact issues. When reporting bugs, please understand that unless you are including a pull request or are reporting a critical issue, you will probably not get a response.
 
-To prevent the issue tracker from being flooded with issues that no-one is intending to work on, and to give more visibilty to critical issues that users should be aware of and that most urgently need attention, I will also close most bug reports once they've been inactive for a while.
+To prevent the issue tracker from being flooded with issues that no-one is intending to work on, and to give more visibility to critical issues that users should be aware of and that most urgently need attention, I will also close most bug reports once they've been inactive for a while.
 
 Please note that this isn't meant to imply that you haven't found a bug - you most likely have and I'm grateful that you took the time to report it. Unfortunately, SSHFS is a purely volunteer driven project,
 and at the moment there simply aren't any volunteers.

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.0.1
+ hooks:
+ - id: trailing-whitespace
+ - id: end-of-file-fixer
+ - id: check-yaml
+ - id: check-added-large-files
+- repo: https://github.com/jumanjihouse/pre-commit-hooks
+ rev: 2.1.5
+ hooks:
+ - id: shellcheck

.travis.yml

@@ -1,21 +1,31 @@
-sudo: required
-dist: xenial
+dist: focal
+
+language: c
+
+cache:
+ - pip
 
-language:
- - c
 addons:
  apt:
- sources:
- - ubuntu-toolchain-r-test
  packages:
+ - shellcheck
  - valgrind
- - clang
  - gcc
- - gcc-6
+ - clang
  - python-docutils
  - python3-pip
  - python3-setuptools
  - ninja-build
+ - meson
+ - python3-pytest
+ - libglib2.0-dev
+
 install: test/travis-install.sh
-script: test/travis-build.sh
 
+jobs:
+ include:
+ - name: Lint
+ script: ./test/lint.sh
+ install: skip
+ - name: Build + Test
+ script: test/travis-build.sh

AUTHORS

@@ -1,27 +1,31 @@
 Current Maintainer
 ------------------
 
-Nikolaus Rath <[email protected]>
+None.
 
 
 Past Maintainers
 ----------------
 
+Nikolaus Rath <[email protected]> (until 05/2022)
 Miklos Szeredi <[email protected]> (until 12/2015)
 
 
 Contributors (autogenerated list)
 ---------------------------------
 
-
+a1346054 <[email protected]>
 Alan Jenkins <[email protected]>
 Alexander Neumann <[email protected]>
 Anatol Pomozov <[email protected]>
+Andrew Stone <[email protected]>
+Antonio Rojas <[email protected]>
 Benjamin Fleischer <[email protected]>
 Berserker <[email protected]>
 Bill Zissimopoulos <[email protected]>
 bjoe2k4 <[email protected]>
 Brandon Carter <[email protected]>
+Cam Cope <[email protected]>
 Chris Wolfe <[email protected]>
 Clayton G. Hobbs <[email protected]>
 Daniel Lublin <[email protected]>
@@ -41,6 +45,8 @@ Julio Merino <[email protected]>
 Junichi Uekawa <[email protected]>
 Junichi Uekawa <[email protected]>
 kalvdans <[email protected]>
+Kim Brose <[email protected]>
+Matthew Berginski <[email protected]>
 Michael Forney <[email protected]>
 Mike Kelly <[email protected]>
 Mike Salvatore <[email protected]>
@@ -49,6 +55,8 @@ Miklos Szeredi <[email protected]>
 mssalvatore <[email protected]>
 Nikolaus Rath <[email protected]>
 Percy Jahn <[email protected]>
+Peter Belm <[email protected]>
+Peter Wienemann <[email protected]>
 Qais Patankar <[email protected]>
 Quentin Rameau <[email protected]>
 Reid Wagner <[email protected]>

ChangeLog.rst

@@ -1,3 +1,26 @@
+Release 3.7.3 (2022-05-26)
+--------------------------
+
+* Minor bugfixes.
+
+* This is the last release from the current maintainer. SSHFS is now no longer maintained
+ or developed. Github issue tracking and pull requests have therefore been disabled. The
+ mailing list (see below) is still available for use.
+
+ If you would like to take over this project, you are welcome to do so. Please fork it
+ and develop the fork for a while. Once there has been 6 months of reasonable activity,
+ please contact [email protected] and I'll be happy to give you ownership of this
+ repository or replace with a pointer to the fork.
+
+
+Release 3.7.2 (2021-06-08)
+--------------------------
+
+* Added a secondary check so if a mkdir request fails with EPERM an access request will be
+ tried - returning EEXIST if the access was successful.
+ Fixes: https://github.com/libfuse/sshfs/issues/243
+
+
 Release 3.7.1 (2020-11-09)
 --------------------------
 
@@ -17,7 +40,7 @@ Release 3.7.0 (2020-01-03)
  needed anymore. If you depend on this workaround, please let the SSHFS maintainers know,
  otherwise support for the workaround will be removed completely in a future version.
 
- 
+
 Release 3.6.0 (2019-11-03)
 --------------------------
 
@@ -100,13 +123,13 @@ Release 3.1.0 (2017-08-04)
 
 * For improved backwards compatibility, SSHFS now also silently
  accepts the old ``-o cache_*`` options.
- 
+
 Release 3.0.0 (2017-07-08)
 --------------------------
 
 * 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. 
+* The `cache` option has been renamed to `dir_cache` for clarity.
 * Added unit tests
 * --debug now behaves like -o debug_sshfs, i.e. it enables sshfs
  debugging messages rather than libfuse debugging messages.
@@ -121,7 +144,7 @@ Release 3.0.0 (2017-07-08)
 * Removed support for `-o workaround=all`. Workarounds should always
  enabled explicitly and only when needed. There is no point in always
  enabling a potentially changing set of workarounds.
- 
+
 Release 2.9 (2017-04-17)
 ------------------------
 
@@ -160,14 +183,14 @@ Release 2.4 (2012-03-08)
 ------------------------
 
 * New `slave` option.
-* New `idmap`, `uidmap` and `gidmap` options. 
+* New `idmap`, `uidmap` and `gidmap` options.
 * Various small bugfixes.
 
 Release 2.3 (2011-07-01)
 ------------------------
 
 * Support hard link creation if server is OpenSSH 5.7 or later
-* Small improvements and bug fixes 
+* Small improvements and bug fixes
 * Check mount point and options before connecting to ssh server
 * New 'delay_connect' option
 
@@ -180,7 +203,7 @@ Release 2.2 (2008-10-20)
 Release 2.1 (2008-07-11)
 ------------------------
 
-* Small improvements and bug fixes 
+* Small improvements and bug fixes
 
 Release 2.0 (2008-04-23)
 ------------------------

README.rst

@@ -1,3 +1,15 @@
+This Project is Orphaned
+========================
+
+This project is no longer maintained or developed. Github issue tracking and pull requests have
+therefore been disabled. The mailing list (see below) is still available for use.
+
+If you would like to take over this project, you are welcome to do so. Please fork it and
+develop the fork for a while. Once there has been 6 months of reasonable activity, please
+contact [email protected] and I'll be happy to give you ownership of this repository or
+replace with a pointer to the fork.
+
+
 SSHFS
 =====
 
@@ -36,7 +48,7 @@ this to work the mountpoint must be owned by the user. If username is
 omitted SSHFS will use the local username. If the directory is
 omitted, SSHFS will mount the (remote) home directory. If you need to
 enter a password sshfs will ask for it (actually it just runs ssh
-which ask for the password if needed).
+which asks for the password if needed).
 
 Also many ssh options can be specified (see the manual pages for
 *sftp(1)* and *ssh_config(5)*), including the remote port number
@@ -55,11 +67,10 @@ 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.1.0 or newer. On macOS, you need
-OSXFUSE_ instead. Finally, you need the Glib_ library with development
-headers (which should be available from your operating system's
-package manager).
+https://github.com/libfuse/sshfs/releases. You also need libfuse_ 3.1.0 or newer (or a
+similar library that provides a libfuse3 compatible interface for your operating
+system). Finally, you need the Glib_ library with development headers (which should be
+available from your operating system's package manager).
 
 To build and install, we recommend to use Meson_ (version 0.38 or
 newer) and Ninja_. After extracting the sshfs tarball, create a
@@ -72,7 +83,7 @@ Normally, the default build options will work fine. If you
 nevertheless want to adjust them, you can do so with the *mesonconf*
 command::
 
- $ mesonconf # list options 
+ $ mesonconf # list options
  $ mesonconf -D strip=true # set an option
 
 To build, test and install SSHFS, you then use Ninja (running the
@@ -83,7 +94,6 @@ tests requires the `py.test`_ Python module)::
  $ sudo ninja install
 
 .. _libfuse: http:https://github.com/libfuse/libfuse
-.. _OSXFUSE: https://osxfuse.github.io/
 .. _Glib: https://developer.gnome.org/glib/stable/
 .. _Meson: http:https://mesonbuild.com/
 .. _Ninja: https://ninja-build.org/

cache.c

@@ -259,7 +259,7 @@ static void *cache_init(struct fuse_conn_info *conn,
 {
  void *res;
  res = cache.next_oper->init(conn, cfg);
- 
+
  // Cache requires a path for each request
  cfg->nullpath_ok = 0;
 
@@ -321,9 +321,9 @@ static int cache_releasedir(const char *path, struct fuse_file_info *fi)
 {
  int err;
  struct file_handle *cfi;
- 
+
  cfi = (struct file_handle*) fi->fh;
- 
+
  if(cfi->is_open) {
  fi->fh = cfi->fs_fh;
  err = cache.next_oper->releasedir(path, fi);
@@ -368,7 +368,7 @@ static int cache_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
  struct node *node;
 
  assert(offset == 0);
- 
+
  pthread_mutex_lock(&cache.lock);
  node = cache_lookup(path);
  if (node != NULL && node->dir != NULL) {
@@ -394,8 +394,8 @@ static int cache_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
  }
  cfi->is_open = 1;
  cfi->fs_fh = fi->fh;
- } 
- 
+ }
+
  ch.path = path;
  ch.buf = buf;
  ch.filler = filler;

compat/fuse_opt.h

@@ -18,7 +18,7 @@ extern "C" {
 /**
  * Option description
  *
- * This structure describes a single option, and and action associated
+ * This structure describes a single option, and an action associated
  * with it, in case it matches.
  *
  * More than one such match may occur, in which case the action for

make_release_tarball.sh

@@ -27,4 +27,3 @@ gpg --armor --detach-sign "${TAG}.tar.xz"
 PREV_TAG="$(git tag --list 'sshfs-3*' --sort=-taggerdate --merged "${TAG}^"| head -1)"
 echo "Contributors from ${PREV_TAG} to ${TAG}:"
 git log --pretty="format:%an <%aE>" "${PREV_TAG}..${TAG}" | sort -u
-

meson.build

@@ -1,4 +1,4 @@
-project('sshfs', 'c', version: '3.7.1',
+project('sshfs', 'c', version: '3.7.3',
  meson_version: '>= 0.40',
  default_options: [ 'buildtype=debugoptimized' ])
 
@@ -26,7 +26,7 @@ endif
 
 
 rst2man = find_program('rst2man', 'rst2man.py', required: false)
- 
+
 cfg = configuration_data()
 
 cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
@@ -79,4 +79,3 @@ meson.add_install_script('utils/install_helper.sh',
 
 
 subdir('test')
-