From 6538136fdee5d939e4a42c6702a1343d384f0132 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Mon, 22 Aug 2022 00:16:34 -0700 Subject: [PATCH] fuse: fix build for glibc 2.34 --- .../fuse/patches/fix-compat-glibc-2.34.patch | 60 +++++++++++++++++++ srcpkgs/fuse/template | 4 ++ 2 files changed, 64 insertions(+) create mode 100644 srcpkgs/fuse/patches/fix-compat-glibc-2.34.patch diff --git a/srcpkgs/fuse/patches/fix-compat-glibc-2.34.patch b/srcpkgs/fuse/patches/fix-compat-glibc-2.34.patch new file mode 100644 index 000000000000..eb7737cfc6b9 --- /dev/null +++ b/srcpkgs/fuse/patches/fix-compat-glibc-2.34.patch @@ -0,0 +1,60 @@ +From 5a43d0f724c56f8836f3f92411e0de1b5f82db32 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/srcpkgs/fuse/template b/srcpkgs/fuse/template index 10061307b416..b4fe1571f575 100644 --- a/srcpkgs/fuse/template +++ b/srcpkgs/fuse/template @@ -12,6 +12,10 @@ homepage="https://github.com/libfuse/libfuse" distfiles="${homepage}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz" checksum=d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5 +pre_configure() { + autoreconf -fi +} + post_install() { # remove obsolete rules file provided by udev. rm -rf ${DESTDIR}/{dev,etc}