From 8a132d0340947dda2d7b8f3e8a0955f0f1efa24d Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 30 Dec 2024 11:53:40 +0000 Subject: [PATCH] fuse: update to githash 5a43d0f (2.9.9+) Includes following patches (post 2.9.9 - https://github.com/libfuse/libfuse/commits/fuse_2_9_bugfix/) util/ulockmgr_server.c: conditionally define closefrom (fix glibc-2.34+) - https://github.com/libfuse/libfuse/commit/6d55007027dfe7b75a74899f497f075046cc5404 Correct errno comparison - https://github.com/libfuse/libfuse/commit/5d38afc8a5b4a2a6e27aad7a1840046e99cd826d Whitelist UFSD (backport to 2.9 branch) - https://github.com/libfuse/libfuse/commit/5a43d0f724c56f8836f3f92411e0de1b5f82db32 configure.ac needs to include GETTEXT to generate config.rpath --- packages/sysutils/fuse/package.mk | 6 +- .../fuse-0002-dont-run-update-rc.d.patch | 6 +- .../fuse-0003-build-with-glibc-2.34.patch | 60 ------------------- .../patches/fuse-0003-fix-configure-ac.patch | 11 ++++ 4 files changed, 17 insertions(+), 66 deletions(-) delete mode 100644 packages/sysutils/fuse/patches/fuse-0003-build-with-glibc-2.34.patch create mode 100644 packages/sysutils/fuse/patches/fuse-0003-fix-configure-ac.patch diff --git a/packages/sysutils/fuse/package.mk b/packages/sysutils/fuse/package.mk index a557f7fdfd..9b0ea4c685 100644 --- a/packages/sysutils/fuse/package.mk +++ b/packages/sysutils/fuse/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="fuse" -PKG_VERSION="2.9.9" -PKG_SHA256="d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5" +PKG_VERSION="5a43d0f724c56f8836f3f92411e0de1b5f82db32" # 2.9.9+ +PKG_SHA256="1df88a204e1673e29112f1ee4efe6b3cd4de2ae78945838e406ead0fe24ec5f1" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libfuse/libfuse/" -PKG_URL="https://github.com/libfuse/libfuse/releases/download/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" +PKG_URL="https://github.com/libfuse/libfuse/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="FUSE provides a simple interface for userspace programs to export a virtual filesystem to the Linux kernel." PKG_TOOLCHAIN="autotools" diff --git a/packages/sysutils/fuse/patches/fuse-0002-dont-run-update-rc.d.patch b/packages/sysutils/fuse/patches/fuse-0002-dont-run-update-rc.d.patch index d89103eca0..66eabe3a25 100644 --- a/packages/sysutils/fuse/patches/fuse-0002-dont-run-update-rc.d.patch +++ b/packages/sysutils/fuse/patches/fuse-0002-dont-run-update-rc.d.patch @@ -1,6 +1,6 @@ ---- a/util/Makefile.in 2017-06-23 22:47:36.762827097 +0200 -+++ b/util/Makefile.in 2017-06-23 22:47:47.358852950 +0200 -@@ -734,10 +734,6 @@ +--- a/util/Makefile.am 2017-06-23 22:47:36.762827097 +0200 ++++ b/util/Makefile.am 2017-06-23 22:47:47.358852950 +0200 +@@ -39,10 +39,6 @@ $(INSTALL_PROGRAM) $(builddir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse $(MKDIR_P) $(DESTDIR)$(INIT_D_PATH) $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse diff --git a/packages/sysutils/fuse/patches/fuse-0003-build-with-glibc-2.34.patch b/packages/sysutils/fuse/patches/fuse-0003-build-with-glibc-2.34.patch deleted file mode 100644 index beb8d51da1..0000000000 --- a/packages/sysutils/fuse/patches/fuse-0003-build-with-glibc-2.34.patch +++ /dev/null @@ -1,60 +0,0 @@ -From ae2352bca9b4e607538412da0cc2a9625cd8b692 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 24 Jul 2021 22:02:45 +0100 -Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix - glibc-2.34+) - -closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since -it's available in glibc 2.34+, we want to detect it and only define our -fallback if the libc doesn't provide it. - -Bug: https://bugs.gentoo.org/803923 -Signed-off-by: Sam James ---- - 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 ---- a/configure.ac -+++ b/configure.ac -@@ -55,6 +55,7 @@ fi - - AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat]) - AC_CHECK_FUNCS([posix_fallocate]) -+AC_CHECK_FUNCS([closefrom]) - AC_CHECK_MEMBERS([struct stat.st_atim]) - AC_CHECK_MEMBERS([struct stat.st_atimespec]) - -diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c -index 273c7d923..a04dac5c6 100644 ---- a/util/ulockmgr_server.c -+++ b/util/ulockmgr_server.c -@@ -22,6 +22,10 @@ - #include - #include - -+#ifdef HAVE_CONFIG_H -+ #include "config.h" -+#endif -+ - struct message { - unsigned intr : 1; - unsigned nofd : 1; -@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp, - return res; - } - -+#if !defined(HAVE_CLOSEFROM) - static int closefrom(int minfd) - { - DIR *dir = opendir("/proc/self/fd"); -@@ -141,6 +146,7 @@ static int closefrom(int minfd) - } - return 0; - } -+#endif - - static void send_reply(int cfd, struct message *msg) - { diff --git a/packages/sysutils/fuse/patches/fuse-0003-fix-configure-ac.patch b/packages/sysutils/fuse/patches/fuse-0003-fix-configure-ac.patch new file mode 100644 index 0000000000..f562c9c9fd --- /dev/null +++ b/packages/sysutils/fuse/patches/fuse-0003-fix-configure-ac.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2021-07-25 10:21:45.000000000 +0000 ++++ b/configure.ac 2024-12-30 12:29:55.969242866 +0000 +@@ -72,6 +72,8 @@ + done + ]) + AM_ICONV ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.14.4]) + libfuse_libs="$libfuse_libs $LTLIBICONV" + AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes) + AC_SUBST(libfuse_libs)