network/sshfs-fuse: Updated for version 3.6.0, new maintainer.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

5 files changed, 78 insertions, 34 deletions

diff --git a/network/sshfs-fuse/README b/network/sshfs-fuse/README
index 300d34090dc1e..4b484d5915426 100644
--- a/network/sshfs-fuse/README
+++ b/network/sshfs-fuse/README
@@ -1,3 +1,5 @@
+sshfs-fuse (ssh file system module for FUSE)
+
 SSHFS (Secure SHell FileSystem) is a file system for Linux capable of 
 operating on files on a remote computer using just a secure shell login 
 on the remote computer. On the local computer where the SSHFS is mounted, 
diff --git a/network/sshfs-fuse/fixrst.diff b/network/sshfs-fuse/fixrst.diff
new file mode 100644
index 0000000000000..4bf148f5d57bb
--- /dev/null
+++ b/network/sshfs-fuse/fixrst.diff
@@ -0,0 +1,22 @@
+diff -Naur sshfs-3.6.0/sshfs.rst sshfs-3.6.0.patched/sshfs.rst
+--- sshfs-3.6.0/sshfs.rst	2019-11-03 04:34:29.000000000 -0500
++++ sshfs-3.6.0.patched/sshfs.rst	2020-01-01 03:49:22.746410220 -0500
+@@ -205,13 +205,11 @@
+ -o direct_io
+    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 
+-      for example if the file size is not known in advance (before reading it).
+-      e.g. /proc filesystem 
++   This has several effects:
++
++   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 for example if the file size is not known in advance (before reading it).  e.g. /proc filesystem 
+ 
+ In addition, SSHFS accepts several options common to all FUSE file
+ systems. These are described in the `mount.fuse` manpage (look
diff --git a/network/sshfs-fuse/sshfs-fuse.SlackBuild b/network/sshfs-fuse/sshfs-fuse.SlackBuild
index 1e439418785b5..1a4e9412a0092 100644
--- a/network/sshfs-fuse/sshfs-fuse.SlackBuild
+++ b/network/sshfs-fuse/sshfs-fuse.SlackBuild
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-# Copyright 2012, Michiel van Wessem, Leicester, United Kingdom
 # Copyright 2006-2009  Alan Hicks, Lizella, GA
+# Copyright 2012, Michiel van Wessem, Leicester, United Kingdom
+# Copyright 2020, B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +22,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# Note: I'm aware the fixrst.diff isn't being applied. Please leave
+# it in the repo, it's the source for the sshfs.1.gz, which *is*
+# installed. Need the diff to comply with the GPL.
+
+# 20200101 bkw:
+# - take over maintenance
+# - update for v3.6.0. too many changes to build old versions.
+
 PRGNAM=sshfs-fuse
 SRCNAM=sshfs
-VERSION=${VERSION:-2.8}
+VERSION=${VERSION:-3.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,36 +71,45 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
 cd $SRCNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+mkdir build
+cd build
+  CFLAGS="-Wl,-s $SLKCFLAGS" \
+  CXXFLAGS="-Wl,-s $SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc
+  ninja
+  DESTDIR=$PKG ninja install
+cd ..
+
+# Use prebuilt man page, so this build doesn't depend on docutils.
+# Also, the supplied sshfs.rst is slightly broken, this man page was
+# made from a slightly fixed version (see fixrst.diff).
+# Don't use the one installed by ninja, if there was one.
+MANDIR=$PKG/usr/man/man1
+rm -f $MANDIR/$SRCNAM.1
+mkdir -p $MANDIR
+cat $CWD/$SRCNAM.1.gz > $MANDIR/$SRCNAM.1.gz
+
+# We got symlinks for commands, so link the man pages too. Slightly
+# wrong, as the linked commands are in /usr/sbin, but the man page
+# is section 1 (not 8). I can live with it.
+ln -s $SRCNAM.1.gz $MANDIR/mount.fuse.sshfs.1.gz
+ln -s $SRCNAM.1.gz $MANDIR/mount.sshfs.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog* README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/sshfs-fuse/sshfs-fuse.info b/network/sshfs-fuse/sshfs-fuse.info
index ec97eeb668468..8503f7fa0c10d 100644
--- a/network/sshfs-fuse/sshfs-fuse.info
+++ b/network/sshfs-fuse/sshfs-fuse.info
@@ -1,10 +1,10 @@
 PRGNAM="sshfs-fuse"
-VERSION="2.8"
+VERSION="3.6.0"
 HOMEPAGE="https://github.com/libfuse/sshfs"
-DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs_2.8/sshfs-2.8.tar.gz"
-MD5SUM="0ba25e848ee59e2595d6576c8f6284b6"
+DOWNLOAD="https://github.com/libfuse/sshfs/releases/download/sshfs-3.6.0/sshfs-3.6.0.tar.xz"
+MD5SUM="7f7685ebefdea10c5fc44a54e9500e36"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
+REQUIRES="meson fuse3"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/network/sshfs-fuse/sshfs.1.gz b/network/sshfs-fuse/sshfs.1.gz
new file mode 100644
index 0000000000000..fb079bef57062
--- /dev/null
+++ b/network/sshfs-fuse/sshfs.1.gz