Skip to content

Commit

Permalink
update SSHFS to latest upstream version (3.2)
Browse files Browse the repository at this point in the history
  • Loading branch information
billziss-gh committed Aug 1, 2018
1 parent d351eb3 commit 93696bf
Showing 4 changed files with 12 additions and 78 deletions.
17 changes: 7 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MyProductName = "SSHFS-Win"
MyCompanyName = "Navimatics Corporation"
MyDescription = "SSHFS for Windows"
MyVersion = 2.7.$(shell date '+%y%j')
MyVersion = 3.2.$(shell date '+%y%j')
ifeq ($(shell uname -m),x86_64)
MyArch = x64
else
@@ -69,27 +69,24 @@ $(Status)/sshfs-win: $(Status)/root sshfs-win.c

$(Status)/root: $(Status)/make
mkdir -p $(RootDir)/{bin,dev/{mqueue,shm},etc}
(cygcheck $(SrcDir)/sshfs/sshfs; for f in $(BinExtra); do cygcheck /usr/bin/$$f; done) |\
(cygcheck $(SrcDir)/sshfs/build/sshfs; for f in $(BinExtra); do cygcheck /usr/bin/$$f; done) |\
tr -d '\r' | tr '\\' / | xargs cygpath -au | grep '^/usr/bin/' | sort | uniq |\
while read f; do cp $$f $(RootDir)/bin; done
cp $(SrcDir)/sshfs/sshfs $(RootDir)/bin
cp $(SrcDir)/sshfs/build/sshfs $(RootDir)/bin
strip $(RootDir)/bin/sshfs
for f in $(BinExtra); do cp /usr/bin/$$f $(RootDir)/bin; done
cp -R $(PrjDir)/etc $(RootDir)
touch $(Status)/root

$(Status)/make: $(Status)/config
cd $(SrcDir)/sshfs && make
cd $(SrcDir)/sshfs/build && ninja
touch $(Status)/make

$(Status)/config: $(Status)/reconf
cd $(SrcDir)/sshfs && ./configure
$(Status)/config: $(Status)/patch
mkdir -p $(SrcDir)/sshfs/build
cd $(SrcDir)/sshfs/build && meson ..
touch $(Status)/config

$(Status)/reconf: $(Status)/patch
cd $(SrcDir)/sshfs && autoreconf -i
touch $(Status)/reconf

$(Status)/patch: $(Status)/clone
cd $(SrcDir)/sshfs && for f in $(PrjDir)/patches/*.patch; do patch -p1 <$$f; done
touch $(Status)/patch
63 changes: 0 additions & 63 deletions patches/00-cygwin.patch

This file was deleted.

8 changes: 4 additions & 4 deletions patches/01-passwd.patch → patches/00-passwd.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/sshfs.c b/sshfs.c
index 824a103..f5491c3 100644
index 4423e07..ed333e1 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -270,7 +270,7 @@ struct sshfs {
@@ -275,7 +275,7 @@ struct sshfs {
unsigned outstanding_len;
unsigned max_outstanding_len;
pthread_cond_t outstanding_cond;
@@ -11,15 +11,15 @@ index 824a103..f5491c3 100644
char *password;
int ext_posix_rename;
int ext_statvfs;
@@ -387,6 +387,7 @@ static struct fuse_opt sshfs_opts[] = {
@@ -404,6 +404,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),
@@ -1607,6 +1608,14 @@ static int sftp_init()
@@ -1537,6 +1538,14 @@ static int sftp_init()

out:
buf_free(&buf);
2 changes: 1 addition & 1 deletion sshfs

0 comments on commit 93696bf

Please sign in to comment.