From: Adolf Belka <ahb.ipfire@gmail.com>
Date: Tue, 5 Jan 2021 14:20:57 +0000 (+0100)
Subject: sshfs: Update to 3.7.1
X-Git-Tag: v2.25-core155~281
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=02037c964fade3d58b0e4d9a05d3034955e8f5bc

sshfs: Update to 3.7.1

- Update sshfs from 2.2 to 3.7.1
- Changelog is available at https://github.com/libfuse/sshfs/releases
- Build had to be changed from autotools to meson/ninja
- Change in rootfiles

Signed-off-by: Adolf Belka <ahb.ipfire@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/sshfs b/config/rootfiles/common/sshfs
index 2cafa3e24c..579b938f56 100644
--- a/config/rootfiles/common/sshfs
+++ b/config/rootfiles/common/sshfs
@@ -1,2 +1,4 @@
 usr/bin/sshfs
+#usr/sbin/mount.fuse.sshfs
+#usr/sbin/mount.sshfs
 #usr/share/man/man1/sshfs.1
diff --git a/lfs/sshfs b/lfs/sshfs
index 23fbd18ca8..1e77061945 100644
--- a/lfs/sshfs
+++ b/lfs/sshfs
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.2
+VER        = 3.7.1
 
-THISAPP    = sshfs-fuse-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = sshfs-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 26e9206eb5169e87e6f95f54bc005a4f
+$(DL_FILE)_MD5 = 22ac23d05ca7c56fb568627f086374d0
 
 install : $(TARGET)
 
@@ -72,9 +72,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && meson --prefix=/usr builddir && cd builddir && ninja && ninja install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)