dnsdist: Improve initscript to prevent reload on config error

[people/pmueller/ipfire-2.x.git] / lfs / fuse

diff --git a/lfs/fuse b/lfs/fuse
index 2639156b2196ed11bd87a1528e2677a36d845cfe..5235348a5721f515c48f0e391d1e21ce0d2f69cf 100644 (file)
--- a/lfs/fuse
+++ b/lfs/fuse
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.9.7
+VER        = 3.10.3
 
 THISAPP    = fuse-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+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 = 9bd4ce8184745fd3d000ca2692adacdb
+$(DL_FILE)_MD5 = 75546f9070323b8ce69c2ed8ffff20c4
 
 install : $(TARGET)
 
@@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -72,10 +72,16 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/fuse-2.9.2-namespace-conflict-fix.patch
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-kernel-module
-       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 $(DIR_APP) && ninja -C builddir/
+       cd $(DIR_APP) && ninja -C builddir/ install
+
+       # Move mount.fuse3 to same location as mount.fuse was in previous version
+       mv -v /usr/sbin/mount.fuse3 /sbin
+
+       # Move 99-fuse3 rules to same udev location as in previous version of fuse
+       mv -v /lib/udev/rules.d/99-fuse3.rules /etc/udev/rules.d
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)