SOURCES/fuse2-0005-Whitelist-UFSD-backport-to-2.9-branch-452.patch

@@ -0,0 +1,31 @@
+From: tenzap <46226844+tenzap@users.noreply.github.com>
+Date: Sun, 15 Sep 2019 17:57:08 +0200
+Subject: [PATCH] Whitelist UFSD (backport to 2.9 branch) (#452)
+
+
+diff --git a/ChangeLog b/ChangeLog
+index 13a369f..5574f20 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,9 @@
++Unreleased Changes
++==================
++
++* Added UFSD to whitelist (so users can now mount FUSE filesystems
++  on mountpoints within UFSD filesystems).
++
+ FUSE 2.9.9 (2019-01-04)
+ =======================
+ 
+diff --git a/util/fusermount.c b/util/fusermount.c
+index ef9d1ed..63a69dc 100644
+--- a/util/fusermount.c
++++ b/util/fusermount.c
+@@ -1050,6 +1050,7 @@ static int check_perm(const char **mntp, struct stat *stbuf, int *mountpoint_fd)
+ 		0x73717368 /* SQUASHFS_MAGIC */,
+ 		0x01021994 /* TMPFS_MAGIC */,
+ 		0x24051905 /* UBIFS_SUPER_MAGIC */,
++		0x736675005346544e /* UFSD */,
+ 		0x58465342 /* XFS_SB_MAGIC */,
+ 		0x2FC12FC1 /* ZFS_SUPER_MAGIC */,
+ 	};

SOURCES/fuse2-0006-Correct-errno-comparison-571.patch

@@ -0,0 +1,18 @@
+From: Andrew Gaul <gaul@google.com>
+Date: Mon, 14 Dec 2020 19:16:05 +0900
+Subject: [PATCH] Correct errno comparison (#571)
+
+
+diff --git a/lib/fuse.c b/lib/fuse.c
+index ca1709c..896aa24 100644
+--- a/lib/fuse.c
++++ b/lib/fuse.c
+@@ -4348,7 +4348,7 @@ static int fuse_session_loop_remember(struct fuse *f)
+ 
+ 		res = poll(&fds, 1, timeout * 1000);
+ 		if (res == -1) {
+-			if (errno == -EINTR)
++			if (errno == EINTR)
+ 				continue;
+ 			else
+ 				break;

SOURCES/fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch

@@ -1,4 +1,3 @@
-From ae2352bca9b4e607538412da0cc2a9625cd8b692 Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Sat, 24 Jul 2021 22:02:45 +0100
 Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix
@@ -10,13 +9,9 @@ fallback if the libc doesn't provide it.
 
 Bug: https://bugs.gentoo.org/803923
 Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.ac           | 1 +
- util/ulockmgr_server.c | 6 ++++++
- 2 files changed, 7 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 9946a0efa..a2d481aa9 100644
+index 9946a0e..a2d481a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -55,6 +55,7 @@ fi
@@ -28,7 +23,7 @@ index 9946a0efa..a2d481aa9 100644
  AC_CHECK_MEMBERS([struct stat.st_atimespec])
  
 diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
-index 273c7d923..a04dac5c6 100644
+index 273c7d9..a04dac5 100644
 --- a/util/ulockmgr_server.c
 +++ b/util/ulockmgr_server.c
 @@ -22,6 +22,10 @@

SPECS/fuse.spec

@@ -1,10 +1,10 @@
 Name:		fuse
 Version:	2.9.9
-Release:	15%{?dist}
+Release:	22%{?dist}.gating_test1
 Summary:	File System in Userspace (FUSE) v2 utilities
-License:	GPL+
+License:	GPL-1.0-or-later
 URL:		http://fuse.sf.net
-Source0:	https://github.com/libfuse/libfuse/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0:	https://github.com/libfuse/libfuse/releases/download/%{name}-%{version}.tar.gz
 
 Patch1: fuse2-0001-More-parentheses.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=970768
@@ -16,22 +16,21 @@ Patch3: fuse2-0003-make-buffer-size-match-kernel-max-transfer-size.patch
 # https://github.com/libfuse/libfuse/pull/392
 # backported for fuse2
 Patch4: fuse2-0004-Whitelist-SMB2-found-on-some-NAS-devices.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1984778
+# cherry-picked from upstream
-# https://github.com/libfuse/libfuse/pull/619
+Patch5:	fuse2-0005-Whitelist-UFSD-backport-to-2.9-branch-452.patch
-# https://github.com/libfuse/libfuse/commit/ae2352bca9b4e607538412da0cc2a9625cd8b692.patch
+# cherry-picked from upstream
-Patch5: fuse2-0005-remove-closefrom-function.patch
+Patch6: fuse2-0006-Correct-errno-comparison-571.patch
-
+# cherry-picked from upstream
-# Default to *do* run autoreconf, because in case any downstream patch touched
+# https://bugzilla.redhat.com/show_bug.cgi?id=1984776
-# configure.ac or Makefile.am it may be necessary to do so - e.g Patch #5.
+Patch7: fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch
-%{!?enable_autotools: %global enable_autotools 1}
 
 Requires:	which
 Conflicts:	filesystem < 3
 BuildRequires:	libselinux-devel
 BuildRequires:	autoconf, automake, libtool, gettext-devel, make
-BuildRequires:	systemd-udev
+BuildRequires:  systemd-udev
 # fuse-common 3.4.2-3 and earlier included man pages
-Requires:	fuse-common >= 3.4.2-4
+Requires:       fuse-common >= 3.4.2-4
 
 %description
 With FUSE it is possible to implement a fully functional filesystem in a
@@ -40,7 +39,7 @@ mount a FUSE filesystem.
 
 %package libs
 Summary:	File System in Userspace (FUSE) v2 libraries
-License:	LGPLv2+
+License:	LGPL-2.1-or-later
 Conflicts:	filesystem < 3
 
 %description libs
@@ -51,7 +50,7 @@ userspace program. This package contains the FUSE v2 libraries.
 Summary:	File System in Userspace (FUSE) v2 devel files
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	pkgconfig
-License:	LGPLv2+
+License:	LGPL-2.1-or-later
 Conflicts:	filesystem < 3
 
 %description devel
@@ -60,21 +59,14 @@ userspace program. This package contains development files (headers,
 pgk-config) to develop FUSE v2 based applications/filesystems.
 
 %prep
-%setup
+%autosetup -p 1
 
 # ./makeconf.sh
 #disable device creation during build/install
 sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
-%patch1 -p1 -b .add_parentheses
+autoreconf -ivf
-%patch2 -p1 -b .conflictfix
-%patch3 -p1 -b .buffer_size
-%patch4 -p1 -b .smb2_whitelist
-%patch5 -p1 -b .remove_closefrom
 
 %build
-%if 0%{?enable_autotools}
-autoreconf -if
-%endif
 # Can't pass --disable-static here, or else the utils don't build
 export MOUNT_FUSE_PATH="%{_sbindir}"
 CFLAGS="%{optflags} -D_GNU_SOURCE" %configure
@@ -135,19 +127,42 @@ rm -f %{buildroot}/%{_libdir}/*.a
 %{_includedir}/fuse
 
 %changelog
-* Tue Dec 07 2021 Pavel Reichl <preichl@redhat.com> - 2.9.9-15
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.9.9-22.gating_test1
-- Add gating.yaml file
+- Bump release for June 2024 mass rebuild
+
+* Tue May 14 2024 Pavel Reichl <preichl@redhat.com> - 2.9.9-21.gating_test1
+- Build to test gating
+- Related: RHELMISC-3921
+
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Oct 03 2023 Pavel Reichl <preichl@redhat.com> - 2.9.9-18
+- Convert License tag to SPDX format
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Thu Oct 07 2021 Pavel Reichl <preichl@redhat.com> - 2.9.9-14
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-14
-- Fix failure to build from source, fix wrong URL in Source0
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-  Related: rhbz#1984778
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.9.9-13
+* Tue Jul 27 2021 Peter Lemenkov <lemenkov@gmail.com> - 2.9.9-13
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Fix FTBFS in Rawhide (rhbz#1984776)
-  Related: rhbz#1991688
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.9.9-12
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-12
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.9-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild