Hello community, here is the log from the commit of package sshfs for openSUSE:Factory checked in at 2020-11-12 22:37:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sshfs (Old) and /work/SRC/openSUSE:Factory/.sshfs.new.24930 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sshfs" Thu Nov 12 22:37:30 2020 rev:35 rq:847104 version:3.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/sshfs/sshfs.changes 2020-01-03 17:39:53.987385460 +0100 +++ /work/SRC/openSUSE:Factory/.sshfs.new.24930/sshfs.changes 2020-11-12 22:37:49.674043844 +0100 @@ -1,0 +2,6 @@ +Mon Nov 9 10:39:19 UTC 2020 - Ismail Dönmez <idon...@suse.com> + +- Update to version 3.7.1 + * Minor bugfixes + +------------------------------------------------------------------- Old: ---- sshfs-3.7.0.tar.xz sshfs-3.7.0.tar.xz.asc New: ---- sshfs-3.7.1.tar.xz sshfs-3.7.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sshfs.spec ++++++ --- /var/tmp/diff_new_pack.Spk4TU/_old 2020-11-12 22:37:50.518044725 +0100 +++ /var/tmp/diff_new_pack.Spk4TU/_new 2020-11-12 22:37:50.522044729 +0100 @@ -17,7 +17,7 @@ Name: sshfs -Version: 3.7.0 +Version: 3.7.1 Release: 0 Summary: Filesystem client based on SSH file transfer protocol License: GPL-2.0-or-later ++++++ sshfs-3.7.0.tar.xz -> sshfs-3.7.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.0/AUTHORS new/sshfs-3.7.1/AUTHORS --- old/sshfs-3.7.0/AUTHORS 2020-01-03 12:04:02.000000000 +0100 +++ new/sshfs-3.7.1/AUTHORS 2020-11-09 10:52:00.000000000 +0100 @@ -13,18 +13,21 @@ Contributors (autogenerated list) --------------------------------- + Alan Jenkins <alan.christopher.jenk...@gmail.com> Alexander Neumann <alexan...@bumpern.de> Anatol Pomozov <anatol.pomo...@gmail.com> 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> Chris Wolfe <cwo...@chromium.org> Clayton G. Hobbs <c...@lakeserv.net> Daniel Lublin <dan...@lublin.se> Dominique Martinet <asmad...@codewreck.org> DrDaveD <2129743+drda...@users.noreply.github.com> +Fabrice Fontaine <fontaine.fabr...@gmail.com> gala <gala...@users.noreply.github.com> Galen Getsov <4815620+gget...@users.noreply.github.com> George Vlahavas <vlaha...@gmail.com> @@ -35,6 +38,8 @@ Josh Triplett <j...@joshtriplett.org> Julio Merino <j...@google.com> Julio Merino <j...@meroh.net> +Junichi Uekawa <danc...@gmail.com> +Junichi Uekawa <dan...@netfort.gr.jp> kalvdans <git...@kalvdans.no-ip.org> Michael Forney <mfor...@mforney.org> Mike Kelly <m...@pair.com> @@ -51,6 +56,7 @@ Rian Hunter <rianhun...@users.noreply.github.com> Samuel Murray <samuel.mur...@outlook.com> S. D. Cloudt <s.d.clo...@student.tue.nl> +Simon Arlott <70171+no...@users.noreply.github.com> smheidrich <smheidr...@weltenfunktion.de> sunwire <50745572+sunw...@users.noreply.github.com> Tim Harder <radher...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.0/ChangeLog.rst new/sshfs-3.7.1/ChangeLog.rst --- old/sshfs-3.7.0/ChangeLog.rst 2020-01-03 12:04:02.000000000 +0100 +++ new/sshfs-3.7.1/ChangeLog.rst 2020-11-09 10:52:00.000000000 +0100 @@ -1,3 +1,9 @@ +Release 3.7.1 (2020-11-09) +-------------------------- + +* Minor bugfixes. + + Release 3.7.0 (2020-01-03) -------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.0/README.rst new/sshfs-3.7.1/README.rst --- old/sshfs-3.7.0/README.rst 2020-01-03 12:04:02.000000000 +0100 +++ new/sshfs-3.7.1/README.rst 2020-11-09 10:52:00.000000000 +0100 @@ -98,11 +98,3 @@ Please report any bugs on the GitHub issue tracker at https://github.com/libfuse/libfuse/issues. - - -Professional Support --------------------- - -Professional support is offered via `Rath Consulting`_. - -.. _`Rath Consulting`: http://www.rath-consulting.biz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.0/meson.build new/sshfs-3.7.1/meson.build --- old/sshfs-3.7.0/meson.build 2020-01-03 12:04:02.000000000 +0100 +++ new/sshfs-3.7.1/meson.build 2020-11-09 10:52:00.000000000 +0100 @@ -1,4 +1,4 @@ -project('sshfs', 'c', version: '3.7.0', +project('sshfs', 'c', version: '3.7.1', meson_version: '>= 0.40', default_options: [ 'buildtype=debugoptimized' ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.0/sshfs.c new/sshfs-3.7.1/sshfs.c --- old/sshfs-3.7.0/sshfs.c 2020-01-03 12:04:02.000000000 +0100 +++ new/sshfs-3.7.1/sshfs.c 2020-11-09 10:52:00.000000000 +0100 @@ -341,7 +341,7 @@ int foreground; int reconnect; int delay_connect; - int slave; + int passive; char *host; char *base_path; GHashTable *reqtab; @@ -351,7 +351,7 @@ int max_conns; struct conn *conns; int ptyfd; - int ptyslavefd; + int ptypassivefd; int connvers; int server_version; unsigned remote_uid; @@ -497,7 +497,8 @@ SSHFS_OPT("no_check_root", no_check_root, 1), SSHFS_OPT("password_stdin", password_stdin, 1), SSHFS_OPT("delay_connect", delay_connect, 1), - SSHFS_OPT("slave", slave, 1), + SSHFS_OPT("slave", passive, 1), + SSHFS_OPT("passive", passive, 1), SSHFS_OPT("disable_hardlink", disable_hardlink, 1), SSHFS_OPT("dir_cache=yes", dir_cache, 1), SSHFS_OPT("dir_cache=no", dir_cache, 0), @@ -1068,6 +1069,7 @@ const char *path) { struct conntab_entry *ce; + int i; if (sshfs.max_conns == 1) return &sshfs.conns[0]; @@ -1089,7 +1091,7 @@ int best_index = 0; uint64_t best_score = ~0ULL; /* smaller is better */ - for (int i = 0; i < sshfs.max_conns; i++) { + for (i = 0; i < sshfs.max_conns; i++) { uint64_t score = ((uint64_t) sshfs.conns[i].req_count << 43) + ((uint64_t) sshfs.conns[i].dir_count << 22) + ((uint64_t) sshfs.conns[i].file_count << 1) + @@ -1146,8 +1148,8 @@ if (sshfs.ptyfd == -1) return -1; - sshfs.ptyslavefd = open(ptyname, O_RDWR | O_NOCTTY); - if (sshfs.ptyslavefd == -1) + sshfs.ptypassivefd = open(ptyname, O_RDWR | O_NOCTTY); + if (sshfs.ptypassivefd == -1) return -1; } @@ -1189,6 +1191,12 @@ _exit(0); } chdir("/"); + /* + * Avoid processes hanging trying to stat() OLDPWD if it is in + * the mount point. This can be removed if sshfs opens the + * mount point after establishing the ssh connection. + */ + unsetenv("OLDPWD"); if (sshfs.password_stdin) { int sfd; @@ -1200,7 +1208,7 @@ _exit(1); } close(sfd); - close(sshfs.ptyslavefd); + close(sshfs.ptypassivefd); close(sshfs.ptyfd); } @@ -1224,7 +1232,7 @@ return 0; } -static int connect_slave(struct conn *conn) +static int connect_passive(struct conn *conn) { conn->rfd = STDIN_FILENO; conn->wfd = STDOUT_FILENO; @@ -1531,9 +1539,9 @@ close(sshfs.ptyfd); sshfs.ptyfd = -1; } - if (sshfs.ptyslavefd != -1) { - close(sshfs.ptyslavefd); - sshfs.ptyslavefd = -1; + if (sshfs.ptypassivefd != -1) { + close(sshfs.ptypassivefd); + sshfs.ptypassivefd = -1; } } @@ -1824,8 +1832,8 @@ { int err; - if (sshfs.slave) - err = connect_slave(conn); + if (sshfs.passive) + err = connect_passive(conn); else if (sshfs.directport) err = connect_to(conn, sshfs.host, sshfs.directport); else @@ -3629,7 +3637,7 @@ " -o ssh_protocol=N ssh protocol to use (default: 2)\n" " -o sftp_server=SERV path to sftp server or subsystem (default: sftp)\n" " -o directport=PORT directly connect to PORT bypassing ssh\n" -" -o slave communicate over stdin and stdout bypassing network\n" +" -o passive communicate over stdin and stdout bypassing network\n" " -o disable_hardlink link(2) will return with errno set to ENOSYS\n" " -o transform_symlinks transform absolute symlinks to relative\n" " -o follow_symlinks follow symlinks on the server\n" @@ -4182,9 +4190,9 @@ sshfs.show_version = 0; sshfs.singlethread = 0; sshfs.foreground = 0; - sshfs.ptyslavefd = -1; + sshfs.ptypassivefd = -1; sshfs.delay_connect = 0; - sshfs.slave = 0; + sshfs.passive = 0; sshfs.detect_uid = 0; if (strcmp(IDMAP_DEFAULT, "none") == 0) { sshfs.idmap = IDMAP_NONE; @@ -4250,12 +4258,12 @@ DEBUG("SSHFS version %s\n", PACKAGE_VERSION); /* Force sshfs to the foreground when using stdin+stdout */ - if (sshfs.slave) + if (sshfs.passive) sshfs.foreground = 1; - if (sshfs.slave && sshfs.password_stdin) { - fprintf(stderr, "the password_stdin and slave options cannot both be specified\n"); + if (sshfs.passive && sshfs.password_stdin) { + fprintf(stderr, "the password_stdin and passive options cannot both be specified\n"); exit(1); } @@ -4287,8 +4295,8 @@ exit(1); } - if (sshfs.slave) { - fprintf(stderr, "slave option cannot be specified with parallel connections\n"); + if (sshfs.passive) { + fprintf(stderr, "passive option cannot be specified with parallel connections\n"); exit(1); } } else if (sshfs.max_conns <= 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sshfs-3.7.0/sshfs.rst new/sshfs-3.7.1/sshfs.rst --- old/sshfs-3.7.0/sshfs.rst 2020-01-03 12:04:02.000000000 +0100 +++ new/sshfs-3.7.1/sshfs.rst 2020-11-09 10:52:00.000000000 +0100 @@ -37,7 +37,7 @@ permission checking can be enabled with ``-o default_permissions``. By default, only the mounting user will be able to access the filesystem. Access for other -users can be enabled by passing ``-o allow_others``. In this case you most likely also +users can be enabled by passing ``-o allow_other``. In this case you most likely also want to use ``-o default_permissions``. It is recommended to run SSHFS as regular user (not as root). For this to work the @@ -156,8 +156,11 @@ -o directport=PORT directly connect to PORT bypassing ssh --o slave - communicate over stdin and stdout bypassing network +-o passive + communicate over stdin and stdout bypassing network. Useful for + mounting local filesystem on the remote side. An example using + dpipe command would be ``dpipe /usr/lib/openssh/sftp-server = ssh + RemoteHostname sshfs :/directory/to/be/shared ~/mnt/src -o passive`` -o disable_hardlink With this option set, attempts to call `link(2)` will fail with @@ -223,8 +226,8 @@ to use. Each connection is established with a separate SSH process. The primary purpose of this feature is to improve the responsiveness of the file system during large file transfers. When using more than once - connection, the *password_stdin* and *slave* options can not be - used, and the *buflimit* workaround is not supported/ + connection, the *password_stdin* and *passive* options can not be + used, and the *buflimit* workaround is not supported. In addition, SSHFS accepts several options common to all FUSE file systems. These are described in the `mount.fuse` manpage (look _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
