logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 41f92f0bb14d3549f230f4979eb88b03edce92de
parent 2c0160aab63d6da6ae030b49d6e42e32b131eeef
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 13 Jun 2019 13:05:07 -0700

fuse: Update to 3.6.1

Diffstat:

Mpkg/fuse/config.h3++-
Dpkg/fuse/patch/0002-Fix-prototype-of-cuse_fll_ioctl.patch31-------------------------------
Mpkg/fuse/ver2+-
3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/pkg/fuse/config.h b/pkg/fuse/config.h @@ -4,6 +4,7 @@ #define IGNORE_MTAB #undef HAVE_COPY_FILE_RANGE +#define HAVE_FALLOCATE #define HAVE_FDATASYNC #define HAVE_FORK #define HAVE_FSTATAT @@ -18,4 +19,4 @@ #undef HAVE_STRUCT_STAT_ST_ATIMESPEC #define HAVE_UTIMENSAT #define HAVE_VMSPLICE -#define PACKAGE_VERSION "3.5.0" +#define PACKAGE_VERSION "3.6.1" diff --git a/pkg/fuse/patch/0002-Fix-prototype-of-cuse_fll_ioctl.patch b/pkg/fuse/patch/0002-Fix-prototype-of-cuse_fll_ioctl.patch @@ -1,31 +0,0 @@ -From e3f3b5690d6eeed23745ac1d966d4b51f0b5e270 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Mon, 22 Apr 2019 20:28:01 -0700 -Subject: [PATCH] Fix prototype of cuse_fll_ioctl - -The type of cmd was changed to unsigned int. ---- - lib/cuse_lowlevel.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/lib/cuse_lowlevel.c b/lib/cuse_lowlevel.c -index 56e6aa9..7c146ba 100644 ---- a/lib/cuse_lowlevel.c -+++ b/lib/cuse_lowlevel.c -@@ -77,9 +77,10 @@ static void cuse_fll_fsync(fuse_req_t req, fuse_ino_t ino, int datasync, - req_clop(req)->fsync(req, datasync, fi); - } - --static void cuse_fll_ioctl(fuse_req_t req, fuse_ino_t ino, int cmd, void *arg, -- struct fuse_file_info *fi, unsigned int flags, -- const void *in_buf, size_t in_bufsz, size_t out_bufsz) -+static void cuse_fll_ioctl(fuse_req_t req, fuse_ino_t ino, unsigned int cmd, -+ void *arg, struct fuse_file_info *fi, -+ unsigned int flags, const void *in_buf, -+ size_t in_bufsz, size_t out_bufsz) - { - (void)ino; - req_clop(req)->ioctl(req, cmd, arg, fi, flags, in_buf, in_bufsz, --- -2.21.0 - diff --git a/pkg/fuse/ver b/pkg/fuse/ver @@ -1 +1 @@ -3.5.0 r0 +3.6.1 r0