diff --git a/fuse3.spec b/fuse3.spec index 2b31dfb..26afb86 100644 --- a/fuse3.spec +++ b/fuse3.spec @@ -10,7 +10,7 @@ Name: fuse3 Version: %{xyz_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: File System in Userspace (FUSE) v3 utilities License: GPL-1.0-or-later URL: http://fuse.sf.net @@ -18,7 +18,8 @@ Source0: https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fu Source1: https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.gz.sig Source2: https://raw.githubusercontent.com/libfuse/libfuse/master/signify/fuse-%{xy_version}.pub Source3: fuse.conf -Patch0: fuse3-gcc11.patch +Patch0: fuse3-gcc11.patch +Patch1: master-Fix-missing-fuse_loop_cfg_destroy-in-fuse_session_lo.patch %if %{undefined rhel} BuildRequires: signify @@ -94,6 +95,7 @@ signify -V -m '%{SOURCE0}' -p '%{SOURCE2}' %setup -n fuse-%{version} %patch -P0 -p1 +%patch -P1 -p1 %build export LC_ALL=en_US.UTF-8 @@ -192,6 +194,9 @@ rm -f %{buildroot}%{_udevrulesdir}/99-fuse3.rules %endif %changelog +* Thu Jun 13 2024 Pavel Reichl - 3.16.2-4 +- Fix missing fuse_loop_cfg_destroy() + * Wed Jan 24 2024 Fedora Release Engineering - 3.16.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/master-Fix-missing-fuse_loop_cfg_destroy-in-fuse_session_lo.patch b/master-Fix-missing-fuse_loop_cfg_destroy-in-fuse_session_lo.patch new file mode 100644 index 0000000..c399f17 --- /dev/null +++ b/master-Fix-missing-fuse_loop_cfg_destroy-in-fuse_session_lo.patch @@ -0,0 +1,39 @@ +From b701673e7429336248c307c93c2c26f443719255 Mon Sep 17 00:00:00 2001 +From: Bernd Schubert +Date: Sun, 5 May 2024 13:09:56 +0200 +Subject: [PATCH] Fix missing fuse_loop_cfg_destroy() in + fuse_session_loop_mt_31 (#944) + +All credits to Miklos Szeredi for spotting +this. + +Signed-off-by: Bernd Schubert +Signed-off-by: Pavel Reichl +--- + lib/fuse_loop_mt.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c +index 70ff8f8..ecf8af8 100644 +--- a/lib/fuse_loop_mt.c ++++ b/lib/fuse_loop_mt.c +@@ -440,10 +440,15 @@ int fuse_session_loop_mt_31(struct fuse_session *se, int clone_fd); + FUSE_SYMVER("fuse_session_loop_mt_31", "fuse_session_loop_mt@FUSE_3.0") + int fuse_session_loop_mt_31(struct fuse_session *se, int clone_fd) + { ++ int err; + struct fuse_loop_config *config = fuse_loop_cfg_create(); + if (clone_fd > 0) + fuse_loop_cfg_set_clone_fd(config, clone_fd); +- return fuse_session_loop_mt_312(se, config); ++ err = fuse_session_loop_mt_312(se, config); ++ ++ fuse_loop_cfg_destroy(config); ++ ++ return err; + } + + struct fuse_loop_config *fuse_loop_cfg_create(void) +-- +2.45.2 +