diff --git a/Makefile b/Makefile index a503cfc..fe7ab2a 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ MyProductName = "SSHFS-Win" MyCompanyName = "Navimatics LLC" MyDescription = "SSHFS for Windows" -MyProductVersion = "2021.1 Beta" -MyVersion = 3.5.$(shell date '+%y%j') +MyProductVersion = "2021.1 Beta2" +MyVersion = 3.7.$(shell date '+%y%j') ifeq ($(shell uname -m),x86_64) MyArch = x64 else diff --git a/patches/00-passwd.patch b/patches/00-passwd.patch index 3e1197c..4ed95ba 100644 --- a/patches/00-passwd.patch +++ b/patches/00-passwd.patch @@ -1,8 +1,8 @@ diff --git a/sshfs.c b/sshfs.c -index 06a1ef3..e1e39e2 100644 +index ff40c81..5c8d4b8 100644 --- a/sshfs.c +++ b/sshfs.c -@@ -273,7 +273,7 @@ struct sshfs { +@@ -365,7 +365,7 @@ struct sshfs { unsigned outstanding_len; unsigned max_outstanding_len; pthread_cond_t outstanding_cond; @@ -11,15 +11,15 @@ index 06a1ef3..e1e39e2 100644 char *password; int ext_posix_rename; int ext_statvfs; -@@ -403,6 +403,7 @@ static struct fuse_opt sshfs_opts[] = { +@@ -496,6 +496,7 @@ static struct fuse_opt sshfs_opts[] = { SSHFS_OPT("follow_symlinks", follow_symlinks, 1), SSHFS_OPT("no_check_root", no_check_root, 1), SSHFS_OPT("password_stdin", password_stdin, 1), + SSHFS_OPT("password_stdout", password_stdout, 1), SSHFS_OPT("delay_connect", delay_connect, 1), - SSHFS_OPT("slave", slave, 1), - SSHFS_OPT("disable_hardlink", disable_hardlink, 1), -@@ -1532,6 +1533,14 @@ static int sftp_init() + SSHFS_OPT("slave", passive, 1), + SSHFS_OPT("passive", passive, 1), +@@ -1691,6 +1692,14 @@ static int sftp_init(struct conn *conn) out: buf_free(&buf); diff --git a/patches/10-mountpoint.patch b/patches/10-mountpoint.patch index 91b9cd7..479980b 100644 --- a/patches/10-mountpoint.patch +++ b/patches/10-mountpoint.patch @@ -1,8 +1,8 @@ diff --git a/sshfs.c b/sshfs.c -index 06a1ef3..dc772c7 100644 +index 5c8d4b8..e253291 100644 --- a/sshfs.c +++ b/sshfs.c -@@ -3446,6 +3446,9 @@ static int sshfs_opt_proc(void *data, const char *arg, int key, +@@ -3703,6 +3703,9 @@ static int sshfs_opt_proc(void *data, const char *arg, int key, * Furthermore the mountpoint must NOT exist prior to mounting. * So we cannot use realpath(3). */ diff --git a/patches/20-mountmgr.patch b/patches/20-mountmgr.patch index 54a163b..57af95d 100755 --- a/patches/20-mountmgr.patch +++ b/patches/20-mountmgr.patch @@ -1,6 +1,8 @@ +diff --git a/sshfs.c b/sshfs.c +index e253291..ae4955a 100644 --- a/sshfs.c +++ b/sshfs.c -@@ -3462,6 +3462,15 @@ +@@ -3710,6 +3710,15 @@ static int sshfs_opt_proc(void *data, const char *arg, int key, && ':' == arg[1] && '\0' == arg[2]) { /* drive: make a copy */ sshfs.mountpoint = strdup(arg); diff --git a/sshfs b/sshfs index 695cd89..8059e2c 160000 --- a/sshfs +++ b/sshfs @@ -1 +1 @@ -Subproject commit 695cd8916f0e78d28009de3ffe112b9d1a1c9e5e +Subproject commit 8059e2ce630dd2b984f7a6c44a2b5291b0fe2abc diff --git a/sshfs-win.c b/sshfs-win.c index 4350cb4..60a30ef 100644 --- a/sshfs-win.c +++ b/sshfs-win.c @@ -1,7 +1,7 @@ /** * sshfs-win.c * - * Copyright 2015-2019 Bill Zissimopoulos + * Copyright 2015-2021 Bill Zissimopoulos */ /* * This file is part of SSHFS-Win.