From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 2 Oct 2016 17:52:50 +0000 (-0400)
Subject: fuse: Update to 2.9.7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67d4db430a8d821e2139010ef0f99cfb76a43941;p=ipfire-3.x.git

fuse: Update to 2.9.7

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/fuse/fuse.nm b/fuse/fuse.nm
index 4974a398c..8db44473d 100644
--- a/fuse/fuse.nm
+++ b/fuse/fuse.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = fuse
-version    = 2.8.6
+version    = 2.9.7
 release    = 1
 
 groups     = System/Filesystems
@@ -18,15 +18,13 @@ description
 	FUSE userspace tools to mount a FUSE filesystem.
 end
 
-source_dl  = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp}
+source_dl  = https://github.com/libfuse/libfuse/releases/download/%{thisapp}/
 
 build
 	requires
 		libselinux-devel
 	end
 
-	CFLAGS += -D_GNU_SOURCE
-
 	configure_options += \
 		--disable-static \
 		--disable-rpath
@@ -42,7 +40,6 @@ end
 
 packages
 	package %{name}
-	end
 
 	package %{name}-devel
 		template DEVEL
diff --git a/fuse/patches/fuse-2.7.4-openfix.patch b/fuse/patches/fuse-2.7.4-openfix.patch
deleted file mode 100644
index e5b9eae07..000000000
--- a/fuse/patches/fuse-2.7.4-openfix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up fuse-2.7.2/lib/fuse.c.BAD fuse-2.7.2/lib/fuse.c
---- a/lib/fuse.c	2008-01-21 09:55:42.000000000 -0500
-+++ b/lib/fuse.c	2008-01-21 09:57:20.000000000 -0500
-@@ -633,17 +633,15 @@ static int fuse_compat_open(struct fuse_
- {
- 	int err;
- 	if (!fs->compat || fs->compat >= 25)
--		err = fs->op.open(path, fi);
-+		err = (fs->op.open)(path, fi);
- 	else if (fs->compat == 22) {
- 		struct fuse_file_info_compat tmp;
- 		memcpy(&tmp, fi, sizeof(tmp));
--		err = ((struct fuse_operations_compat22 *) &fs->op)->open(path,
--									  &tmp);
-+		err = (((struct fuse_operations_compat22 *) &fs->op)->open)(path, &tmp);
- 		memcpy(fi, &tmp, sizeof(tmp));
- 		fi->fh = tmp.fh;
- 	} else
--		err = ((struct fuse_operations_compat2 *) &fs->op)
--			->open(path, fi->flags);
-+		err = (((struct fuse_operations_compat2 *) &fs->op)->open)(path, fi->flags);
- 	return err;
- }
- 
-diff -up fuse-2.7.2/lib/fuse_lowlevel.c.BAD fuse-2.7.2/lib/fuse_lowlevel.c
---- a/lib/fuse_lowlevel.c	2008-01-21 09:57:52.000000000 -0500
-+++ b/lib/fuse_lowlevel.c	2008-01-21 09:58:15.000000000 -0500
-@@ -605,7 +605,7 @@ static void do_open(fuse_req_t req, fuse
- 	fi.flags = arg->flags;
- 
- 	if (req->f->op.open)
--		req->f->op.open(req, nodeid, &fi);
-+		(req->f->op.open)(req, nodeid, &fi);
- 	else
- 		fuse_reply_open(req, &fi);
- }
diff --git a/fuse/patches/fuse-2.7.4-udev_rules.patch b/fuse/patches/fuse-2.7.4-udev_rules.patch
deleted file mode 100644
index d52fc32a6..000000000
--- a/fuse/patches/fuse-2.7.4-udev_rules.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/util/udev.rules	2005-11-03 19:38:05.000000000 +0100
-+++ b/util/udev.rules	2005-11-03 19:38:13.000000000 +0100
-@@ -1 +1 @@
--KERNEL=="fuse", MODE="0666"
-+KERNEL=="fuse", NAME="%k", MODE="0666",OWNER="root",GROUP="root"
diff --git a/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch b/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch
new file mode 100644
index 000000000..ae67e7d45
--- /dev/null
+++ b/fuse/patches/fuse-2.9.2-namespace-conflict-fix.patch
@@ -0,0 +1,21 @@
+diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h
+--- fuse-2.9.2/include/fuse_kernel.h.conflictfix	2013-06-26 09:31:57.862198038 -0400
++++ fuse-2.9.2/include/fuse_kernel.h	2013-06-26 09:32:19.679198365 -0400
+@@ -88,12 +88,16 @@
+ #ifndef _LINUX_FUSE_H
+ #define _LINUX_FUSE_H
+ 
+-#include <sys/types.h>
++#ifdef __linux__
++#include <linux/types.h>
++#else
++#include <stdint.h>
+ #define __u64 uint64_t
+ #define __s64 int64_t
+ #define __u32 uint32_t
+ #define __s32 int32_t
+ #define __u16 uint16_t
++#endif
+ 
+ /*
+  * Version negotiation: