logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: c3408fd3b9691c7fedac47844d8be92c4d3fb125
parent dba3352af8db023bee747eedbd5f13783d15fbe2
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  9 Jul 2019 22:26:41 -0700

fuse: Update to 3.6.2

Diffstat:

Mpkg/fuse/config.h2+-
Dpkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB-425.patch34----------------------------------
Rpkg/fuse/patch/0002-Only-use-versioned-symbols-on-GNU-compatible-compile.patch -> pkg/fuse/patch/0001-Only-use-versioned-symbols-on-GNU-compatible-compile.patch0
Rpkg/fuse/patch/0003-Remove-extra-when-symbol-versions-are-disabled.patch -> pkg/fuse/patch/0002-Remove-extra-when-symbol-versions-are-disabled.patch0
Rpkg/fuse/patch/0004-Avoid-statement-expressions-in-container_of-macro.patch -> pkg/fuse/patch/0003-Avoid-statement-expressions-in-container_of-macro.patch0
Rpkg/fuse/patch/0005-Use-__typeof__-instead-of-typeof.patch -> pkg/fuse/patch/0004-Use-__typeof__-instead-of-typeof.patch0
Rpkg/fuse/patch/0006-Fix-build-without-symbol-versioning.patch -> pkg/fuse/patch/0005-Fix-build-without-symbol-versioning.patch0
Mpkg/fuse/ver2+-
8 files changed, 2 insertions(+), 36 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.6.1" +#define PACKAGE_VERSION "3.6.2" diff --git a/pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB-425.patch b/pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB-425.patch @@ -1,34 +0,0 @@ -From f0c52798b761280583379ba267b0ecc1ea34bbfc Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Sat, 15 Jun 2019 03:16:45 -0700 -Subject: [PATCH] Fix build with IGNORE_MTAB (#425) - -chdir_to_parent and check_is_mount are used by should_auto_mount, added -in fuse-3.3.0, regardless of whether IGNORE_MTAB is defined. ---- - util/fusermount.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/util/fusermount.c b/util/fusermount.c -index 5e0b104..56da6ec 100644 ---- a/util/fusermount.c -+++ b/util/fusermount.c -@@ -208,6 +208,7 @@ static int may_unmount(const char *mnt, int quiet) - - return 0; - } -+#endif - - /* - * Check whether the file specified in "fusermount3 -u" is really a -@@ -395,6 +396,7 @@ static int chdir_to_parent(char *copy, const char **lastp) - return 0; - } - -+#ifndef IGNORE_MTAB - /* Check whether the kernel supports UMOUNT_NOFOLLOW flag */ - static int umount_nofollow_support(void) - { --- -2.20.1 - diff --git a/pkg/fuse/patch/0002-Only-use-versioned-symbols-on-GNU-compatible-compile.patch b/pkg/fuse/patch/0001-Only-use-versioned-symbols-on-GNU-compatible-compile.patch diff --git a/pkg/fuse/patch/0003-Remove-extra-when-symbol-versions-are-disabled.patch b/pkg/fuse/patch/0002-Remove-extra-when-symbol-versions-are-disabled.patch diff --git a/pkg/fuse/patch/0004-Avoid-statement-expressions-in-container_of-macro.patch b/pkg/fuse/patch/0003-Avoid-statement-expressions-in-container_of-macro.patch diff --git a/pkg/fuse/patch/0005-Use-__typeof__-instead-of-typeof.patch b/pkg/fuse/patch/0004-Use-__typeof__-instead-of-typeof.patch diff --git a/pkg/fuse/patch/0006-Fix-build-without-symbol-versioning.patch b/pkg/fuse/patch/0005-Fix-build-without-symbol-versioning.patch diff --git a/pkg/fuse/ver b/pkg/fuse/ver @@ -1 +1 @@ -3.6.1 r2 +3.6.2 r0