5 files changed, 107 insertions, 0 deletions
diff --git a/repos/extra/fuse2/.checksum b/repos/extra/fuse2/.checksum
new file mode 100644
index 00000000..385cb254
--- /dev/null
+++ b/repos/extra/fuse2/.checksum
@@ -0,0 +1,2 @@
+dce24203777414bfbca1750d48834ee2b2d8e2422e449d21163e2771ae04bf77  fuse-2.9.9.tar.gz
+fb7de62cd9845406221c225df9d2d7c54384cf29e6fbd4f2d85fcb52eab75762  fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch
diff --git a/repos/extra/fuse2/.files b/repos/extra/fuse2/.files
new file mode 100644
index 00000000..c89cddf7
--- /dev/null
+++ b/repos/extra/fuse2/.files
@@ -0,0 +1,34 @@
+drwxr-xr-x root/root    sbin/
+-rwxr-xr-x root/root    sbin/mount.fuse
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/bin/
+-rwsr-xr-x root/root    usr/bin/fusermount
+-rwxr-xr-x root/root    usr/bin/ulockmgr_server
+drwxr-xr-x root/root    usr/include/
+-rw-r--r-- root/root    usr/include/fuse.h
+drwxr-xr-x root/root    usr/include/fuse/
+-rw-r--r-- root/root    usr/include/fuse/cuse_lowlevel.h
+-rw-r--r-- root/root    usr/include/fuse/fuse.h
+-rw-r--r-- root/root    usr/include/fuse/fuse_common.h
+-rw-r--r-- root/root    usr/include/fuse/fuse_common_compat.h
+-rw-r--r-- root/root    usr/include/fuse/fuse_compat.h
+-rw-r--r-- root/root    usr/include/fuse/fuse_lowlevel.h
+-rw-r--r-- root/root    usr/include/fuse/fuse_lowlevel_compat.h
+-rw-r--r-- root/root    usr/include/fuse/fuse_opt.h
+-rw-r--r-- root/root    usr/include/ulockmgr.h
+drwxr-xr-x root/root    usr/lib/
+lrwxrwxrwx root/root    usr/lib/libfuse.so -> libfuse.so.2.9.9
+lrwxrwxrwx root/root    usr/lib/libfuse.so.2 -> libfuse.so.2.9.9
+-rwxr-xr-x root/root    usr/lib/libfuse.so.2.9.9
+lrwxrwxrwx root/root    usr/lib/libulockmgr.so -> libulockmgr.so.1.0.1
+lrwxrwxrwx root/root    usr/lib/libulockmgr.so.1 -> libulockmgr.so.1.0.1
+-rwxr-xr-x root/root    usr/lib/libulockmgr.so.1.0.1
+drwxr-xr-x root/root    usr/lib/pkgconfig/
+-rw-r--r-- root/root    usr/lib/pkgconfig/fuse.pc
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/man/
+drwxr-xr-x root/root    usr/share/man/man1/
+-rw-r--r-- root/root    usr/share/man/man1/fusermount.1.gz
+-rw-r--r-- root/root    usr/share/man/man1/ulockmgr_server.1.gz
+drwxr-xr-x root/root    usr/share/man/man8/
+-rw-r--r-- root/root    usr/share/man/man8/mount.fuse.8.gz
diff --git a/repos/extra/fuse2/abuild b/repos/extra/fuse2/abuild
new file mode 100644
index 00000000..c9449d79
--- /dev/null
+++ b/repos/extra/fuse2/abuild
@@ -0,0 +1,15 @@
+name=fuse2
+version=2.9.9
+release=1
+source="https://github.com/libfuse/libfuse/releases/download/fuse-$version/fuse-$version.tar.gz
+	fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch"
+build_opt="--enable-lib --enable-util --disable-example"
+export UDEV_RULES_PATH=/usr/lib/udev/rules.d
+
+prebuild() {
+	autoreconf -fiv
+}
+
+postbuild() {
+	rm -rf $PKG/dev $PKG/etc $PKG/usr/lib/udev
+}
diff --git a/repos/extra/fuse2/depends b/repos/extra/fuse2/depends
new file mode 100644
index 00000000..d5e1be3b
--- /dev/null
+++ b/repos/extra/fuse2/depends
@@ -0,0 +1 @@
+gettext-tiny
diff --git a/repos/extra/fuse2/fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch b/repos/extra/fuse2/fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch
new file mode 100644
index 00000000..4cc2f8f6
--- /dev/null
+++ b/repos/extra/fuse2/fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch
@@ -0,0 +1,55 @@
+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
+ 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 <sam@gentoo.org>
+
+diff --git a/configure.ac b/configure.ac
+index 9946a0e..a2d481a 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 273c7d9..a04dac5 100644
+--- a/util/ulockmgr_server.c
++++ b/util/ulockmgr_server.c
+@@ -22,6 +22,10 @@
+ #include <sys/socket.h>
+ #include <sys/wait.h>
+ 
++#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)
+ {