diff --git a/.fuse.metadata b/.fuse.metadata index 7e2683c..5f8ad51 100644 --- a/.fuse.metadata +++ b/.fuse.metadata @@ -1,2 +1,2 @@ fcb3641d5297938f4e183296eccaf0ccc1a0f892 SOURCES/fuse-2.9.7.tar.gz -68e973217f79e98c6f1fff7dffa2ce68e0687d0d SOURCES/fuse-3.2.1.tar.gz +413a2dcb4d274483893166c7894e1920ee61ab53 SOURCES/fuse-3.3.0.tar.gz diff --git a/.gitignore b/.gitignore index 77eb721..7aff6fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/fuse-2.9.7.tar.gz -SOURCES/fuse-3.2.1.tar.gz +SOURCES/fuse-3.3.0.tar.gz diff --git a/SOURCES/fuse-3.10.4-fix-test-failure.patch b/SOURCES/fuse-3.10.4-fix-test-failure.patch new file mode 100644 index 0000000..cc8cbcb --- /dev/null +++ b/SOURCES/fuse-3.10.4-fix-test-failure.patch @@ -0,0 +1,11 @@ +--- libfuse-fuse-3.3.0/test/test_syscalls.c.orig 2018-11-06 19:57:47.000000000 +0100 ++++ libfuse-fuse-3.3.0/test/test_syscalls.c 2022-02-07 17:17:47.512515240 +0100 +@@ -1511,7 +1511,7 @@ + + errno = 0; + res = rename(PATH("a/b"), PATH2("a/d")); +- if (res == 0 || errno != ENOTEMPTY) { ++ if (res == 0 || (errno != ENOTEMPTY && errno != EEXIST)) { + PERROR("rename"); + goto fail; + } diff --git a/SOURCES/fuse-3.2.1-no-dev.patch b/SOURCES/fuse-3.2.1-no-dev.patch index 371fc24..8871a39 100644 --- a/SOURCES/fuse-3.2.1-no-dev.patch +++ b/SOURCES/fuse-3.2.1-no-dev.patch @@ -1,19 +1,22 @@ -diff -up libfuse-fuse-3.2.1/util/install_helper.sh.nodev libfuse-fuse-3.2.1/util/install_helper.sh ---- libfuse-fuse-3.2.1/util/install_helper.sh.nodev 2017-11-14 15:48:15.000000000 -0500 -+++ libfuse-fuse-3.2.1/util/install_helper.sh 2017-11-16 15:23:20.552413938 -0500 -@@ -11,14 +11,9 @@ bindir="$2" - udevrulesdir="$3" - prefix="${MESON_INSTALL_DESTDIR_PREFIX}" +--- libfuse-fuse-3.3.0/util/install_helper.orig 2022-01-31 20:17:39.461137935 +0100 ++++ libfuse-fuse-3.3.0/util/install_helper.sh 2022-01-31 20:18:46.093188655 +0100 +@@ -22,18 +22,12 @@ + DESTDIR="${DESTDIR%/}" + fi --chown root:root "${prefix}/${bindir}/fusermount3" -+# chown root:root "${prefix}/${bindir}/fusermount3" - chmod u+s "${prefix}/${bindir}/fusermount3" +-chown root:root "${DESTDIR}${bindir}/fusermount3" ++#chown root:root "${DESTDIR}${bindir}/fusermount3" + chmod u+s "${DESTDIR}${bindir}/fusermount3" + install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \ + "${DESTDIR}${sysconfdir}/fuse.conf" + +- -if test ! -e "${DESTDIR}/dev/fuse"; then - mkdir -p "${DESTDIR}/dev" - mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229 -fi - install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \ - "${DESTDIR}/${udevrulesdir}/99-fuse3.rules" + "${DESTDIR}${udevrulesdir}/99-fuse3.rules" diff --git a/SPECS/fuse.spec b/SPECS/fuse.spec index d44bef0..fc7fed9 100644 --- a/SPECS/fuse.spec +++ b/SPECS/fuse.spec @@ -1,10 +1,10 @@ %global fuse2ver 2.9.7 %global fuse2sver 2 -%global fuse3ver 3.2.1 +%global fuse3ver 3.3.0 Name: fuse Version: %{fuse2ver} -Release: 12%{?dist} +Release: 15%{?dist} Summary: File System in Userspace (FUSE) v2 utilities License: GPL+ URL: http://fuse.sf.net @@ -21,6 +21,7 @@ Patch3: fuse-2.9.2-namespace-conflict-fix.patch Patch4: fuse-3.2.1-no-dev.patch Patch5: fusermount-don-t-feed-escaped-commas-into-mount-opti.patch Patch6: buffer_size.patch +Patch7: fuse-3.10.4-fix-test-failure.patch Requires: which Conflicts: filesystem < 3 @@ -38,6 +39,7 @@ mount a FUSE filesystem. Version: %{fuse3ver} Summary: File System in Userspace (FUSE) v3 utilitie Requires: fuse-common = %{fuse3ver} +Requires: fuse3-libs = %{fuse3ver}-%{release} %description -n fuse3 With FUSE it is possible to implement a fully functional filesystem in a @@ -109,7 +111,7 @@ Common files for FUSE v2 and FUSE v3. pushd lib%{name}-%{name}-%{fuse3ver} %patch1 -p1 -b .add_parentheses %patch4 -p1 -b .nodev -%patch5 -p1 -b .escaped_commas +%patch7 -p1 -b .test_fail popd # fuse 2 @@ -175,6 +177,9 @@ ln -s libfuse.so.%{fuse2ver} libfuse.so ln -s libulockmgr.so.1.0.1 libulockmgr.so.1 ln -s libulockmgr.so.1.0.1 libulockmgr.so popd +pushd %{buildroot}/%{_mandir}/man8 +ln -s mount.fuse3.8 mount.fuse.8 +popd # Get rid of static libs rm -f %{buildroot}/%{_libdir}/*.a @@ -203,7 +208,8 @@ rm -f %{buildroot}/usr/lib/udev/rules.d/99-fuse3.rules %{_bindir}/ulockmgr_server %files -n fuse3 -%license libfuse-fuse-%{fuse3ver}/COPYING +%license libfuse-fuse-%{fuse3ver}/GPL2.txt libfuse-fuse-%{fuse3ver}/LICENSE + %doc libfuse-fuse-%{fuse3ver}/AUTHORS libfuse-fuse-%{fuse3ver}/ChangeLog.rst libfuse-fuse-%{fuse3ver}/README.md %{_sbindir}/mount.fuse3 %attr(4755,root,root) %{_bindir}/fusermount3 @@ -219,7 +225,7 @@ rm -f %{buildroot}/usr/lib/udev/rules.d/99-fuse3.rules %{_libdir}/libulockmgr.so.* %files -n fuse3-libs -%license libfuse-fuse-%{fuse3ver}/COPYING.LIB +%license libfuse-fuse-%{fuse3ver}/LGPL2.txt %{_libdir}/libfuse3.so.* %files devel @@ -236,6 +242,17 @@ rm -f %{buildroot}/usr/lib/udev/rules.d/99-fuse3.rules %{_includedir}/fuse3/ %changelog +* Wed Feb 23 2022 Pavel Reichl - 2.9.7-15 +- Fix missing dependency of fuse3 on fuse3-libs +- Make symlink for mount.fuse to mount.fuse3 + +* Mon Feb 07 2022 Pavel Reichl - 2.9.7-14 +- Fix failing test for fuse-3 + +* Mon Jan 31 2022 Pavel Reichl - 2.9.7-13 +- update to 3.3.0 +- patch #5 is part of fuse-3 upstream now + * Thu Nov 08 2018 Miklos Szeredi - 2.9.7-12 - Fixed CVE-2018-10906 (rhbz#1607855) - Fix regression from RHEL7 (rhbz#1648280)