mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
d8d4b81147
* gnu/packages/patches/fuse-glibc-2.34.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/linux.scm (fuse)[source](patches): Add the patch. [arguments]: Add force-bootstrap phase. [native-inputs]: Add AUTOCONF, AUTOMAKE, GETTEXT-MINIMAL, and LIBTOOL.
49 lines
1.2 KiB
Diff
49 lines
1.2 KiB
Diff
Don't redefine 'closefrom' if available through glibc.
|
|
|
|
Shamelessly stolen from Gentoo:
|
|
|
|
https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch
|
|
|
|
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 <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)
|
|
{
|