oasis

commit: b1c40f5ba1902a9524966cd6de9709486d895039
parent c7e1ec67964e1b083bb1ccc0be92bf3c7fe9684a
Author: Michael Forney <mforney@mforney.org>
Date:   Mon,  4 Nov 2019 13:23:37 -0800

fuse: Update to 3.8.0

Diffstat:
M
pkg/fuse/config.h
2
+-
M
pkg/fuse/patch/0002-Remove-extra-when-symbol-versions-are-disabled.patch
14
+++++++-------
M
pkg/fuse/patch/0005-Fix-build-without-symbol-versioning.patch
8
++++----
M
pkg/fuse/ver
2
+-

4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/pkg/fuse/config.h b/pkg/fuse/config.h
@@ -19,4 +19,4 @@
 #undef HAVE_STRUCT_STAT_ST_ATIMESPEC
 #define HAVE_UTIMENSAT
 #define HAVE_VMSPLICE
-#define PACKAGE_VERSION "3.7.0"
+#define PACKAGE_VERSION "3.8.0"
diff --git a/pkg/fuse/patch/0002-Remove-extra-when-symbol-versions-are-disabled.patch b/pkg/fuse/patch/0002-Remove-extra-when-symbol-versions-are-disabled.patch
@@ -1,4 +1,4 @@
-From 7bd30736765189bac13c4de5f9376c24bf5a3b33 Mon Sep 17 00:00:00 2001
+From 11cb1a9823885dbf8b3393d0480cac1762a9f37c Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 17 Jun 2019 23:17:13 -0700
 Subject: [PATCH] Remove extra ';' when symbol versions are disabled
@@ -10,10 +10,10 @@ Subject: [PATCH] Remove extra ';' when symbol versions are disabled
  3 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/lib/fuse.c b/lib/fuse.c
-index 229e139..a22fab1 100755
+index b0f5b30..f496fc1 100755
 --- a/lib/fuse.c
 +++ b/lib/fuse.c
-@@ -4526,7 +4526,7 @@ int fuse_loop(struct fuse *f)
+@@ -4569,7 +4569,7 @@ int fuse_loop(struct fuse *f)
  	return fuse_session_loop(f->se);
  }
  
@@ -22,7 +22,7 @@ index 229e139..a22fab1 100755
  int fuse_loop_mt_32(struct fuse *f, struct fuse_loop_config *config)
  {
  	if (f == NULL)
-@@ -4542,7 +4542,7 @@ int fuse_loop_mt_32(struct fuse *f, struct fuse_loop_config *config)
+@@ -4585,7 +4585,7 @@ int fuse_loop_mt_32(struct fuse *f, struct fuse_loop_config *config)
  }
  
  int fuse_loop_mt_31(struct fuse *f, int clone_fd);
@@ -31,7 +31,7 @@ index 229e139..a22fab1 100755
  int fuse_loop_mt_31(struct fuse *f, int clone_fd)
  {
  	struct fuse_loop_config config;
-@@ -4827,7 +4827,7 @@ void fuse_stop_cleanup_thread(struct fuse *f)
+@@ -4870,7 +4870,7 @@ void fuse_stop_cleanup_thread(struct fuse *f)
  }
  
  
@@ -40,7 +40,7 @@ index 229e139..a22fab1 100755
  struct fuse *fuse_new_31(struct fuse_args *args,
  		      const struct fuse_operations *op,
  		      size_t op_size, void *user_data)
-@@ -4981,7 +4981,7 @@ out:
+@@ -5024,7 +5024,7 @@ out:
  /* Emulates 3.0-style fuse_new(), which processes --help */
  struct fuse *fuse_new_30(struct fuse_args *args, const struct fuse_operations *op,
  			 size_t op_size, void *private_data);
@@ -85,5 +85,5 @@ index d4b82e6..cdb1850 100644
  #define FUSE_SYMVER(x)
  #endif
 -- 
-2.23.0
+2.24.0
 
diff --git a/pkg/fuse/patch/0005-Fix-build-without-symbol-versioning.patch b/pkg/fuse/patch/0005-Fix-build-without-symbol-versioning.patch
@@ -1,4 +1,4 @@
-From 549e21e31f4fa482d5e5db244848bb1ae7b69549 Mon Sep 17 00:00:00 2001
+From 538003675a63f2bcf3caeff368cca1b46ba38013 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Wed, 3 Jul 2019 00:52:16 -0700
 Subject: [PATCH] Fix build without symbol versioning
@@ -8,10 +8,10 @@ Subject: [PATCH] Fix build without symbol versioning
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/include/fuse.h b/include/fuse.h
-index 2d2291c..7fd0348 100644
+index 883f6e5..a5324cc 100644
 --- a/include/fuse.h
 +++ b/include/fuse.h
-@@ -908,7 +908,11 @@ void fuse_lib_help(struct fuse_args *args);
+@@ -913,7 +913,11 @@ void fuse_lib_help(struct fuse_args *args);
   *            `struct fuse_operations.init` handler.
   * @return the created FUSE handle
   */
@@ -25,5 +25,5 @@ index 2d2291c..7fd0348 100644
  			 size_t op_size, void *private_data);
  #define fuse_new(args, op, size, data) fuse_new_30(args, op, size, data)
 -- 
-2.22.0
+2.24.0
 
diff --git a/pkg/fuse/ver b/pkg/fuse/ver
@@ -1 +1 @@
-3.7.0 r0
+3.8.0 r0