From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] fuse: update to 2.9.5
Date: Fri, 11 Mar 2016 07:51:21 +0100
Message-ID: <1457679081-2934-1-git-send-email-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0655296065747832867=="
List-Id: <development.lists.ipfire.org>

--===============0655296065747832867==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>

---
 config/rootfiles/common/fuse |  8 +++++---
 lfs/fuse                     | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse
index 1ab1d48..efa5332 100644
--- a/config/rootfiles/common/fuse
+++ b/config/rootfiles/common/fuse
@@ -1,6 +1,5 @@
 #etc/init.d
 #etc/init.d/fuse
-#etc/rc.d/init.d/fuse
 etc/udev/rules.d/99-fuse.rules
 sbin/mount.fuse
 usr/bin/fusermount
@@ -19,8 +18,9 @@ usr/bin/ulockmgr_server
 #usr/lib/libfuse.a
 #usr/lib/libfuse.la
 usr/lib/libfuse.so
-usr/lib/libfuse.so.2
-usr/lib/libfuse.so.2.9.3
+lib/libfuse.so.2
+#lib/libfuse.so.2.9.3
+lib/libfuse.so.2.9.5
 #usr/lib/libulockmgr.a
 #usr/lib/libulockmgr.la
 usr/lib/libulockmgr.so
@@ -30,3 +30,5 @@ usr/lib/libulockmgr.so.1.0.1
 #usr/share/man/man1/fusermount.1
 #usr/share/man/man1/ulockmgr_server.1
 #usr/share/man/man8/mount.fuse.8
+
+
diff --git a/lfs/fuse b/lfs/fuse
index a875fb3..6e2db82 100644
--- 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-2016  IPFire Team  <info(a)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,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 2.9.3
+VER        =3D 2.9.5
=20
 THISAPP    =3D fuse-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 33cae22ca50311446400daf8a6255c6a
+$(DL_FILE)_MD5 =3D c901b77a1c4584c7ac6c2b67c0713f2b
=20
 install : $(TARGET)
=20
@@ -73,8 +73,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) && ./configure --prefix=3D/usr --disable-kernel-module
+	# This sed fixes libfuse so version
+	cd $(DIR_APP) && sed -i 's/2:9:4/2:9:5/' lib/Makefile.in=20
+
+	cd $(DIR_APP) && ./configure --prefix=3D/usr --disable-kernel-module --disa=
ble-static INIT_D_PATH=3D/tmp/init.d
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	mv -v /usr/lib/libfuse.so.* /lib
+	ln -sfv ../../lib/libfuse.so.2.9.5 /usr/lib/libfuse.so
+
+	# This removes the unneeded bootscript
+	rm -rf  /tmp/init.d
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--=20
1.9.1


--===============0655296065747832867==--