From ddfd2d44a6eab79c722f4b5785efdbcccb9c4d35 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Thu, 20 Jun 2013 11:43:02 +0200
Subject: libfuse: fix multiple close of device fd

- fuse_kern_unmount closes handle (e.g. 19)
- a thread in my process opens a file - the OS assigns newly freed
handle (i.e. 19)
- fuse_kern_chan_destroy closes the same handle (i.e. 19)
- a thread in my process opens another file - the OS assigns newly
freed handle (i.e. 19)
- * MAYHEM *

Reported by Dan Greenfield
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 3afa404..2e902f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-20  Miklos Szeredi <miklos@szeredi.hu>
+
+	* libfuse: fix multiple close of device fd.  Reported by Dan
+	Greenfield
+
 2013-03-19  Miklos Szeredi <miklos@szeredi.hu>
 
 	* libfuse: fix thread cancel race.  Exiting a worker my race with
-- 
cgit v1.2.3


From d44bf3a4ac1ce1b56672ac9ae4a5caa3a8ee6844 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Mon, 1 Jul 2013 10:48:51 +0200
Subject: Released 2.9.3

---
 ChangeLog       | 4 ++++
 configure.ac    | 2 +-
 lib/Makefile.am | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 2e902f5..0da1bf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-01  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Released 2.9.3
+
 2013-06-20  Miklos Szeredi <miklos@szeredi.hu>
 
 	* libfuse: fix multiple close of device fd.  Reported by Dan
diff --git a/configure.ac b/configure.ac
index 0737bad..8963f2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.9.2)
+AC_INIT(fuse, 2.9.3)
 
 AC_PREREQ(2.59d)
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3ec2401..87c0522 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -36,7 +36,7 @@ libfuse_la_SOURCES = 		\
 	$(iconv_source)		\
 	$(mount_source)
 
-libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 2:9:2 \
+libfuse_la_LDFLAGS = -pthread @libfuse_libs@ -version-number 2:9:3 \
 	-Wl,--version-script,$(srcdir)/fuse_versionscript
 
 if NETBSD
-- 
cgit v1.2.3


From 78bc1108d5537400f7df7f79f1dc27084b53323c Mon Sep 17 00:00:00 2001
From: Daniel Thau <danthau@bedrocklinux.org>
Date: Mon, 26 Aug 2013 11:57:16 +0200
Subject: Add missing includes

This allows compiling fuse with musl.
---
 ChangeLog           | 5 +++++
 lib/fuse.c          | 1 +
 lib/fuse_lowlevel.c | 1 +
 lib/mount_util.c    | 1 +
 util/fusermount.c   | 1 +
 5 files changed, 9 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 0da1bf7..1b71fd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-26  Miklos Szeredi <miklos@szeredi.hu>
+
+	* libfuse: Add missing includes.  This allows compiling fuse with
+	musl.  Patch by Daniel Thau
+
 2013-07-01  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Released 2.9.3
diff --git a/lib/fuse.c b/lib/fuse.c
index 067d0dc..cfac238 100644
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -37,6 +37,7 @@
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/mman.h>
+#include <sys/file.h>
 
 #define FUSE_NODE_SLAB 1
 
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 01efc6a..8853346 100644
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -24,6 +24,7 @@
 #include <limits.h>
 #include <errno.h>
 #include <assert.h>
+#include <sys/file.h>
 
 #ifndef F_LINUX_SPECIFIC_BASE
 #define F_LINUX_SPECIFIC_BASE       1024
diff --git a/lib/mount_util.c b/lib/mount_util.c
index 3d2f4cd..3cad2e6 100644
--- a/lib/mount_util.c
+++ b/lib/mount_util.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <paths.h>
 #ifndef __NetBSD__
 #include <mntent.h>
 #endif
diff --git a/util/fusermount.c b/util/fusermount.c
index b2e87d9..4fc72ed 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
+#include <paths.h>
 #include <mntent.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-- 
cgit v1.2.3