Upgrade to version SSHFS version 3.3.0.

Approved by:	bofh

3 files changed, 32 insertions, 2 deletions

diff --git a/sysutils/fusefs-sshfs/files/patch-meson.build b/sysutils/fusefs-sshfs/files/patch-meson.build
new file mode 100644
index 000000000000..54d1b672f374
--- /dev/null
+++ b/sysutils/fusefs-sshfs/files/patch-meson.build
@@ -0,0 +1,19 @@
+--- meson.build.orig	2017-09-20 17:08:27 UTC
++++ meson.build
+@@ -58,15 +58,10 @@ executable('sshfs', sshfs_sources,
+ if rst2man.found()
+     custom_target('manpages', input: [ 'sshfs.rst' ], output: [ 'sshfs.1' ],
+                   command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true,
+-                  install_dir: join_paths(get_option('mandir'), '1'))
++                  install_dir: join_paths(get_option('mandir'), 'man1'))
+ else
+     message('rst2man not found, not building manual page.')
+ endif
+-
+-meson.add_install_script('utils/install_helper.sh',
+-                         get_option('sbindir'),
+-                         get_option('bindir'))
+-
+ 
+ subdir('test')
+ 
diff --git a/sysutils/fusefs-sshfs/files/patch-sshfs.c b/sysutils/fusefs-sshfs/files/patch-sshfs.c
index d89f099f08b9..dd4e469ac2b7 100644
--- a/sysutils/fusefs-sshfs/files/patch-sshfs.c
+++ b/sysutils/fusefs-sshfs/files/patch-sshfs.c
@@ -1,6 +1,6 @@
---- sshfs.c.orig	2017-03-17 21:07:50 UTC
+--- sshfs.c.orig	2017-09-20 17:08:27 UTC
 +++ sshfs.c
-@@ -1027,7 +1027,7 @@ static int pty_master(char **name)
+@@ -965,7 +965,7 @@ static int pty_master(char **name)
  {
  	int mfd;
  
diff --git a/sysutils/fusefs-sshfs/files/patch-test_meson.build b/sysutils/fusefs-sshfs/files/patch-test_meson.build
new file mode 100644
index 000000000000..994ceaabc377
--- /dev/null
+++ b/sysutils/fusefs-sshfs/files/patch-test_meson.build
@@ -0,0 +1,11 @@
+--- test/meson.build.orig	2017-09-20 17:08:27 UTC
++++ test/meson.build
+@@ -2,7 +2,7 @@ test_scripts = [ 'conftest.py', 'pytest.ini', 'test_ss
+                  'util.py' ]
+ custom_target('test_scripts', input: test_scripts,
+               output: test_scripts, build_by_default: true,
+-              command: ['cp', '-fP', '--preserve=mode',
++              command: ['cp', '-fPp',
+                         '@INPUT@', meson.current_build_dir() ])
+ 
+ # Provide something helpful when running 'ninja test'