Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sshfs for openSUSE:Factory checked in at 2022-05-30 12:42:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sshfs (Old) and /work/SRC/openSUSE:Factory/.sshfs.new.2254 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sshfs" Mon May 30 12:42:15 2022 rev:38 rq:979715 version:3.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/sshfs/sshfs.changes 2021-11-23 22:12:27.090504648 +0100 +++ /work/SRC/openSUSE:Factory/.sshfs.new.2254/sshfs.changes 2022-05-30 12:42:29.240273701 +0200 @@ -1,0 +2,9 @@ +Thu May 26 13:53:15 UTC 2022 - Michael Str??der <mich...@stroeder.com> + +- sshfs 3.7.3: + * Minor bugfixes. + * This is the last release from the current maintainer. + SSHFS is now no longer maintained. +- removed obsolete fix-typo-in-ssh_opts.patch + +------------------------------------------------------------------- Old: ---- fix-typo-in-ssh_opts.patch sshfs-3.7.2.tar.xz sshfs-3.7.2.tar.xz.asc New: ---- sshfs-3.7.3.tar.xz sshfs-3.7.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sshfs.spec ++++++ --- /var/tmp/diff_new_pack.eCAv8E/_old 2022-05-30 12:42:29.944274638 +0200 +++ /var/tmp/diff_new_pack.eCAv8E/_new 2022-05-30 12:42:29.960274659 +0200 @@ -1,7 +1,7 @@ # # spec file for package sshfs # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: sshfs -Version: 3.7.2 +Version: 3.7.3 Release: 0 Summary: Filesystem client based on SSH file transfer protocol License: GPL-2.0-or-later @@ -26,8 +26,6 @@ Source: https://github.com/libfuse/sshfs/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz Source2: https://github.com/libfuse/sshfs/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz.asc Source3: %{name}.keyring -# PATCH-FIX-UPSTREAM fix-typo-in-ssh_opts.patch -- based on PR 269, boo#1191886 -Patch0: fix-typo-in-ssh_opts.patch BuildRequires: fuse3-devel >= 3.1.0 BuildRequires: meson BuildRequires: pkgconfig >= 0.9.0 ++++++ sshfs-3.7.2.tar.xz -> sshfs-3.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/.git-blame-ignore-revs new/sshfs-3.7.3/.git-blame-ignore-revs --- old/sshfs-3.7.2/.git-blame-ignore-revs 1970-01-01 01:00:00.000000000 +0100 +++ new/sshfs-3.7.3/.git-blame-ignore-revs 2022-05-26 15:23:35.000000000 +0200 @@ -0,0 +1 @@ +d54c7ecbd618afb4df524e0d96dec7fe7cc2935d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/.github/ISSUE_TEMPLATE/issue-report.md new/sshfs-3.7.3/.github/ISSUE_TEMPLATE/issue-report.md --- old/sshfs-3.7.2/.github/ISSUE_TEMPLATE/issue-report.md 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/.github/ISSUE_TEMPLATE/issue-report.md 2022-05-26 15:23:35.000000000 +0200 @@ -11,7 +11,7 @@ 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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/.pre-commit-config.yaml new/sshfs-3.7.3/.pre-commit-config.yaml --- old/sshfs-3.7.2/.pre-commit-config.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/sshfs-3.7.3/.pre-commit-config.yaml 2022-05-26 15:23:35.000000000 +0200 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/AUTHORS new/sshfs-3.7.3/AUTHORS --- old/sshfs-3.7.2/AUTHORS 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/AUTHORS 2022-05-26 15:23:35.000000000 +0200 @@ -1,28 +1,31 @@ Current Maintainer ------------------ -Nikolaus Rath <nikol...@rath.org> +None. Past Maintainers ---------------- +Nikolaus Rath <nikol...@rath.org> (until 05/2022) Miklos Szeredi <mik...@szeredi.hu> (until 12/2015) Contributors (autogenerated list) --------------------------------- - +a1346054 <36859588+a1346...@users.noreply.github.com> Alan Jenkins <alan.christopher.jenk...@gmail.com> Alexander Neumann <alexan...@bumpern.de> Anatol Pomozov <anatol.pomo...@gmail.com> Andrew Stone <a...@stne.dev> +Antonio Rojas <aro...@archlinux.org> Benjamin Fleischer <flei...@gmail.com> Berserker <berserker.tr...@yandex.com> Bill Zissimopoulos <billz...@navimatics.com> bjoe2k4 <bjoe...@users.noreply.github.com> Brandon Carter <b-car...@users.noreply.github.com> +Cam Cope <git...@camcope.me> Chris Wolfe <cwo...@chromium.org> Clayton G. Hobbs <c...@lakeserv.net> Daniel Lublin <dan...@lublin.se> @@ -42,6 +45,8 @@ Junichi Uekawa <danc...@gmail.com> Junichi Uekawa <dan...@netfort.gr.jp> kalvdans <git...@kalvdans.no-ip.org> +Kim Brose <kim.br...@rwth-aachen.de> +Matthew Berginski <matthew.bergin...@gmail.com> Michael Forney <mfor...@mforney.org> Mike Kelly <m...@pair.com> Mike Salvatore <mike.s.salvat...@gmail.com> @@ -51,6 +56,7 @@ Nikolaus Rath <nikol...@rath.org> Percy Jahn <em...@percyjahn.de> Peter Belm <peterb...@gmail.com> +Peter Wienemann <peter.wienem...@uni-bonn.de> Qais Patankar <qai...@gmail.com> Quentin Rameau <quinq@fifth.space> Reid Wagner <wagnerr...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/ChangeLog.rst new/sshfs-3.7.3/ChangeLog.rst --- old/sshfs-3.7.2/ChangeLog.rst 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/ChangeLog.rst 2022-05-26 15:23:35.000000000 +0200 @@ -1,3 +1,18 @@ +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 nikol...@rath.org 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) -------------------------- @@ -25,7 +40,7 @@ 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) -------------------------- @@ -108,13 +123,13 @@ * 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. @@ -129,7 +144,7 @@ * 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) ------------------------ @@ -168,14 +183,14 @@ ------------------------ * 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 @@ -188,7 +203,7 @@ Release 2.1 (2008-07-11) ------------------------ -* Small improvements and bug fixes +* Small improvements and bug fixes Release 2.0 (2008-04-23) ------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/README.rst new/sshfs-3.7.3/README.rst --- old/sshfs-3.7.2/README.rst 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/README.rst 2022-05-26 15:23:35.000000000 +0200 @@ -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 nikol...@rath.org 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 @@ 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 @@ ------------ 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 @@ 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 @@ $ sudo ninja install .. _libfuse: http://github.com/libfuse/libfuse -.. _OSXFUSE: https://osxfuse.github.io/ .. _Glib: https://developer.gnome.org/glib/stable/ .. _Meson: http://mesonbuild.com/ .. _Ninja: https://ninja-build.org/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/cache.c new/sshfs-3.7.3/cache.c --- old/sshfs-3.7.2/cache.c 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/cache.c 2022-05-26 15:23:35.000000000 +0200 @@ -256,7 +256,7 @@ { void *res; res = cache.next_oper->init(conn, cfg); - + // Cache requires a path for each request cfg->nullpath_ok = 0; @@ -318,9 +318,9 @@ { 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); @@ -365,7 +365,7 @@ struct node *node; assert(offset == 0); - + pthread_mutex_lock(&cache.lock); node = cache_lookup(path); if (node != NULL && node->dir != NULL) { @@ -391,8 +391,8 @@ } cfi->is_open = 1; cfi->fs_fh = fi->fh; - } - + } + ch.path = path; ch.buf = buf; ch.filler = filler; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/compat/fuse_opt.h new/sshfs-3.7.3/compat/fuse_opt.h --- old/sshfs-3.7.2/compat/fuse_opt.h 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/compat/fuse_opt.h 2022-05-26 15:23:35.000000000 +0200 @@ -18,7 +18,7 @@ /** * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/meson.build new/sshfs-3.7.3/meson.build --- old/sshfs-3.7.2/meson.build 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/meson.build 2022-05-26 15:23:35.000000000 +0200 @@ -1,4 +1,4 @@ -project('sshfs', 'c', version: '3.7.2', +project('sshfs', 'c', version: '3.7.3', meson_version: '>= 0.40', default_options: [ 'buildtype=debugoptimized' ]) @@ -26,7 +26,7 @@ rst2man = find_program('rst2man', 'rst2man.py', required: false) - + cfg = configuration_data() cfg.set_quoted('PACKAGE_VERSION', meson.project_version()) @@ -69,4 +69,3 @@ subdir('test') - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/sshfs.c new/sshfs-3.7.3/sshfs.c --- old/sshfs-3.7.2/sshfs.c 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/sshfs.c 2022-05-26 15:23:35.000000000 +0200 @@ -141,7 +141,7 @@ /* Handling of multiple SFTP connections -------------------------------------- - + An SFTP server is free to return responses to outstanding requests in arbitrary order. However, execution of requests may only be re-ordered and parallelized as long as "the results in the responses will be the same as if [the client] had sent the @@ -158,11 +158,11 @@ involved) wait for the other requests to complete. This means that e.g. a readdir request would have to block on most other activity in the same directory, eliminating a major advantage of using multiple connections. - + In practice, we can luckily take advantage of the knowledge that most FUSE requests are the result of (synchronous) syscalls from userspace that will block until the corresponding FUSE response has been sent. - + If -o sshfs_sync is used, SSHFS always waits for the SFTP server response before returning a FUSE response to userspace. If userspace makes concurrent system calls, there is no ordering guarantee in the first place, so we do not have to worry about @@ -432,7 +432,7 @@ "ProxyCommand", "ProxyJump", "ProxyUseFdpass", - "PubkeyAcceptedKeyTypes" + "PubkeyAcceptedKeyTypes", "PubkeyAuthentication", "RekeyLimit", "RevokedHostKeys", @@ -523,7 +523,7 @@ /* For backwards compatibility */ SSHFS_OPT("cache=yes", dir_cache, 1), SSHFS_OPT("cache=no", dir_cache, 0), - + FUSE_OPT_KEY("writeback_cache=no", FUSE_OPT_KEY_DISCARD), FUSE_OPT_KEY("unreliable_append", FUSE_OPT_KEY_DISCARD), @@ -1073,7 +1073,7 @@ if (sshfs.max_conns == 1) return &sshfs.conns[0]; - + if (sf != NULL) return sf->conn; @@ -1906,7 +1906,7 @@ // SFTP only supports 1-second time resolution conn->time_gran = 1000000000; - + return NULL; } @@ -2371,13 +2371,13 @@ // Commutes with pending write(), so we can use any connection err = sftp_request(get_conn(NULL, NULL), SSH_FXP_MKDIR, &buf, SSH_FXP_STATUS, NULL); buf_free(&buf); - + if (err == -EPERM) { if (sshfs.op->access(path, R_OK) == 0) { return -EEXIST; } } - + return err; } @@ -2394,7 +2394,7 @@ // Commutes with pending write(), so we can use any connection conn = get_conn(NULL, NULL); - + buf_init(&buf, 0); buf_add_path(&buf, path); buf_add_uint32(&buf, SSH_FXF_WRITE | SSH_FXF_CREAT | SSH_FXF_EXCL); @@ -2532,7 +2532,7 @@ } pthread_mutex_unlock(&sshfs.lock); } - + return err; } @@ -2589,12 +2589,12 @@ buf_init(&buf, 0); if (sf == NULL) buf_add_path(&buf, path); - else + else buf_add_buf(&buf, &sf->handle); - + buf_add_uint32(&buf, SSH_FILEXFER_ATTR_PERMISSIONS); buf_add_uint32(&buf, mode); - + /* FIXME: really needs LSETSTAT extension (debian Bug#640038) */ // Commutes with pending write(), so we can use any connection // if the file is not open. @@ -2618,7 +2618,7 @@ if (!sshfs_file_is_conn(sf)) return -EIO; } - + if (sshfs.remote_uid_detected) { if (uid == sshfs.local_uid) uid = sshfs.remote_uid; @@ -2635,7 +2635,7 @@ buf_init(&buf, 0); if (sf == NULL) buf_add_path(&buf, path); - else + else buf_add_buf(&buf, &sf->handle); buf_add_uint32(&buf, SSH_FILEXFER_ATTR_UIDGID); buf_add_uint32(&buf, uid); @@ -2685,7 +2685,7 @@ buf_init(&buf, 0); if (sf == NULL) buf_add_path(&buf, path); - else + else buf_add_buf(&buf, &sf->handle); buf_add_uint32(&buf, SSH_FILEXFER_ATTR_ACMODTIME); buf_add_uint32(&buf, asec); @@ -2740,7 +2740,7 @@ if (fi->flags & O_APPEND) pflags |= SSH_FXF_APPEND; - + sf = g_new0(struct sshfs_file, 1); list_init(&sf->write_reqs); pthread_cond_init(&sf->write_finished, NULL); @@ -2750,7 +2750,7 @@ pthread_mutex_lock(&sshfs.lock); sf->modifver= sshfs.modifver; if (sshfs.max_conns > 1) { - ce = g_hash_table_lookup(sshfs.conntab, path); + ce = g_hash_table_lookup(sshfs.conntab, path); if (!ce) { ce = g_malloc(sizeof(struct conntab_entry)); ce->refcount = 0; @@ -3354,7 +3354,7 @@ sshfs_inc_modifver(); if (sshfs.truncate_workaround) return sshfs_truncate_workaround(path, size, fi); - + buf_init(&buf, 0); if (sf != NULL) @@ -3397,7 +3397,7 @@ buf_add_buf(&buf, &sf->handle); err = sftp_request(sf->conn, SSH_FXP_FSTAT, &buf, SSH_FXP_ATTRS, &outbuf); - } + } if (!err) { err = buf_get_attrs(&outbuf, stbuf, NULL); #ifdef __APPLE__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/sshfs.rst new/sshfs-3.7.3/sshfs.rst --- old/sshfs-3.7.2/sshfs.rst 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/sshfs.rst 2022-05-26 15:23:35.000000000 +0200 @@ -190,17 +190,17 @@ directory cache holds the names of directory entries. Enabling it allows `readdir(3)` system calls to be processed without network access. - + -o dcache_max_size=N sets the maximum size of the directory cache. - + -o dcache_timeout=N sets timeout for directory cache in seconds. - + -o dcache_{stat,link,dir}_timeout=N sets separate timeout for {attributes, symlinks, names} in the directory cache. - + -o dcache_clean_interval=N sets the interval for automatic cleaning of the directory cache. @@ -209,17 +209,17 @@ when full. -o direct_io - This option disables the use of page cache (file content cache) in + This option disables the use of page cache (file content cache) in the kernel for this filesystem. This has several affects: 1. Each read() or write() system call will initiate one or more read or write operations, data will not be cached in the kernel. - 2. The return value of the read() and write() system calls will correspond - to the return values of the read and write operations. This is useful + 2. The return value of the read() and write() system calls will correspond + to the return values of the read and write operations. This is useful for example if the file size is not known in advance (before reading it). - e.g. /proc filesystem + e.g. /proc filesystem -o max_conns=N sets the maximum number of simultaneous SSH connections @@ -274,7 +274,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In some cases, attempts to access the SSHFS mountpoint may freeze if -no filesystem activity has occured for some time. This is typically +no filesystem activity has occurred for some time. This is typically caused by the SSH connection being dropped because of inactivity without SSHFS being informed about that. As a workaround, you can try to mount with ``-o ServerAliveInterval=15``. This will force the SSH @@ -311,7 +311,7 @@ Mounting from /etc/fstab ======================== -To mount an SSHFS filesystem from ``/etc/fstab``, simply use ``sshfs` +To mount an SSHFS filesystem from ``/etc/fstab``, simply use ``sshfs`` as the file system type. (For backwards compatibility, you may also use ``fuse.sshfs``). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/test/appveyor-build.sh new/sshfs-3.7.3/test/appveyor-build.sh --- old/sshfs-3.7.2/test/appveyor-build.sh 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/test/appveyor-build.sh 2022-05-26 15:23:35.000000000 +0200 @@ -1,7 +1,8 @@ #!/bin/bash +set -e machine=$(uname -m) -mkdir build-$machine -cd build-$machine +mkdir "build-$machine" +cd "build-$machine" meson .. ninja diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/test/lint.sh new/sshfs-3.7.3/test/lint.sh --- old/sshfs-3.7.2/test/lint.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/sshfs-3.7.3/test/lint.sh 2022-05-26 15:23:35.000000000 +0200 @@ -0,0 +1,4 @@ +#!/bin/bash +set -e +pip3 install --user pre-commit +pre-commit run --all-files --show-diff-on-failure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/test/meson.build new/sshfs-3.7.3/test/meson.build --- old/sshfs-3.7.2/test/meson.build 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/test/meson.build 2022-05-26 15:23:35.000000000 +0200 @@ -2,7 +2,7 @@ 'util.py' ] custom_target('test_scripts', input: test_scripts, output: test_scripts, build_by_default: true, - command: ['cp', '-fPp', + command: ['cp', '-fPp', '@INPUT@', meson.current_build_dir() ]) # Provide something helpful when running 'ninja test' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/test/test_sshfs.py new/sshfs-3.7.3/test/test_sshfs.py --- old/sshfs-3.7.2/test/test_sshfs.py 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/test/test_sshfs.py 2022-05-26 15:23:35.000000000 +0200 @@ -35,15 +35,15 @@ @pytest.mark.parametrize("sync_rd", (True, False)) @pytest.mark.parametrize("multiconn", (True,False)) def test_sshfs(tmpdir, debug, cache_timeout, sync_rd, multiconn, capfd): - + # Avoid false positives from debug messages #if debug: # capfd.register_output(r'^ unique: [0-9]+, error: -[0-9]+ .+$', # count=0) - # Avoid false positives from storing key for localhost + # Avoid false positives from storing key for localhost capfd.register_output(r"^Warning: Permanently added 'localhost' .+", count=0) - + # Test if we can ssh into localhost without password try: res = subprocess.call(['ssh', '-o', 'KbdInteractiveAuthentication=no', @@ -80,12 +80,12 @@ if multiconn: cmdline += [ '-o', 'max_conns=3' ] - + new_env = dict(os.environ) # copy, don't modify # Abort on warnings from glib new_env['G_DEBUG'] = 'fatal-warnings' - + mount_process = subprocess.Popen(cmdline, env=new_env) try: wait_for_mount(mount_process, mnt_dir) @@ -299,7 +299,7 @@ # we need to wait until the cached value has expired. if cache_timeout: safe_sleep(cache_timeout) - + fstat1 = os.lstat(name1) fstat2 = os.lstat(name2) for attr in ('st_mode', 'st_dev', 'st_uid', 'st_gid', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.2/test/util.py new/sshfs-3.7.3/test/util.py --- old/sshfs-3.7.2/test/util.py 2021-06-08 10:52:08.000000000 +0200 +++ new/sshfs-3.7.3/test/util.py 2022-05-26 15:23:35.000000000 +0200 @@ -29,7 +29,7 @@ mount_process.wait(1) except subprocess.TimeoutExpired: mount_process.kill() - + def umount(mount_process, mnt_dir): subprocess.check_call(['fusermount3', '-z', '-u', mnt_dir ])
