From 034629499ae81e82f8b4cd49cf23da9ae7257298 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 23 Jan 2023 08:08:16 -0500 Subject: [PATCH] fuse3: update to 3.13.0. --- srcpkgs/fuse3/patches/use_off_t.patch | 51 +++++++++++++++++++++++++++ srcpkgs/fuse3/template | 4 +-- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/fuse3/patches/use_off_t.patch diff --git a/srcpkgs/fuse3/patches/use_off_t.patch b/srcpkgs/fuse3/patches/use_off_t.patch new file mode 100644 index 00000000000..c8c986358a0 --- /dev/null +++ b/srcpkgs/fuse3/patches/use_off_t.patch @@ -0,0 +1,51 @@ +From 19d95c0e701076407dc1f3cfd39e12e28b332927 Mon Sep 17 00:00:00 2001 +From: psykose +Date: Sat, 14 Jan 2023 21:31:56 +0000 +Subject: [PATCH] use off_t over __off64_t + +when -D_FILE_OFFSET_BITS=64 is defined, the off_t type is 64 bits wide +already. the fuse_common.h header already checks for this, and errors +when it is not, so be consistent with all the other uses of off_t. + +some libcs like musl do not have a 32-bit off_t type, and don't define +__off64_t. +--- + example/hello_ll_uds.c | 4 ++-- + include/fuse_lowlevel.h | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/example/hello_ll_uds.c b/example/hello_ll_uds.c +index c1f64d7b..f291fed9 100644 +--- a/example/hello_ll_uds.c ++++ b/example/hello_ll_uds.c +@@ -277,8 +277,8 @@ static ssize_t stream_read(int fd, void *buf, size_t buf_len, void *userdata) { + return (res == -1) ? res : (res + prev_res); + } + +-static ssize_t stream_splice_send(int fdin, __off64_t *offin, int fdout, +- __off64_t *offout, size_t len, ++static ssize_t stream_splice_send(int fdin, off_t *offin, int fdout, ++ off_t *offout, size_t len, + unsigned int flags, void *userdata) { + (void)userdata; + +diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h +index ff0d966e..96088d7a 100644 +--- a/include/fuse_lowlevel.h ++++ b/include/fuse_lowlevel.h +@@ -130,11 +130,11 @@ struct fuse_forget_data { + struct fuse_custom_io { + ssize_t (*writev)(int fd, struct iovec *iov, int count, void *userdata); + ssize_t (*read)(int fd, void *buf, size_t buf_len, void *userdata); +- ssize_t (*splice_receive)(int fdin, __off64_t *offin, int fdout, +- __off64_t *offout, size_t len, ++ ssize_t (*splice_receive)(int fdin, off_t *offin, int fdout, ++ off_t *offout, size_t len, + unsigned int flags, void *userdata); +- ssize_t (*splice_send)(int fdin, __off64_t *offin, int fdout, +- __off64_t *offout, size_t len, ++ ssize_t (*splice_send)(int fdin, off_t *offin, int fdout, ++ off_t *offout, size_t len, + unsigned int flags, void *userdata); + }; + diff --git a/srcpkgs/fuse3/template b/srcpkgs/fuse3/template index 82e0f90fe4d..f0f36a13a40 100644 --- a/srcpkgs/fuse3/template +++ b/srcpkgs/fuse3/template @@ -1,6 +1,6 @@ # Template file for 'fuse3' pkgname=fuse3 -version=3.11.0 +version=3.13.0 revision=1 build_style=meson configure_args="--sbindir=bin -Db_lto=false -Dexamples=false -Duseroot=false" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/libfuse/libfuse" changelog="https://raw.githubusercontent.com/libfuse/libfuse/master/ChangeLog.rst" distfiles="https://github.com/libfuse/libfuse/releases/download/fuse-${version}/fuse-${version}.tar.xz" -checksum=8982c4c521daf3974dda8a5d55d575c988da13a571970f00aea149eb54fdf14c +checksum=1e54d3ee1d7d04f41e77617c4f7514f611b94332215dd88394bd82803032752a conf_files="/etc/fuse.conf" # Tests require root make_check=no