Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b8d28e6c5e9417310bf8fb9fdbca60599be63ee5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b8d28e6c5e9417310bf8fb9fdbca60599be63ee5)
  • Date: Mon, 22 Aug 2022 19:36:17 +0000

GIT changes to master grimoire by Florian Franzmann <bwlf AT bandrate.org>:

disk/fuse/DEPENDS | 4 +
disk/fuse/HISTORY | 4 +
disk/fuse/PRE_BUILD | 6 +
disk/fuse/patches/fuse-2.9.9-closefrom-glibc-2-34.patch | 60
++++++++++++++++
4 files changed, 74 insertions(+)

New commits:
commit b8d28e6c5e9417310bf8fb9fdbca60599be63ee5
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/fuse: fix compile error

diff --git a/disk/fuse/DEPENDS b/disk/fuse/DEPENDS
index 18a390f..fc215f9 100755
--- a/disk/fuse/DEPENDS
+++ b/disk/fuse/DEPENDS
@@ -1,4 +1,8 @@
if [ "$FUSE_BRANCH" = "scm" ]; then
depends git
fi &&
+
+depends autoconf &&
+depends automake &&
+
runtime_depends util-linux
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 85a5a78..cea3ff0 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,7 @@
+2022-08-22 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS, PRE_BUILD, patches/fuse-2.9.9-closefrom-glibc-2-34.patch:
+ apply patch from Gentoo to fix compile error
+
2020-08-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: add gpg checking
upstream tarball now fixed
diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
new file mode 100755
index 0000000..7a267d1
--- /dev/null
+++ b/disk/fuse/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+apply_patch_dir patches &&
+
+autoreconf -fiv
diff --git a/disk/fuse/patches/fuse-2.9.9-closefrom-glibc-2-34.patch
b/disk/fuse/patches/fuse-2.9.9-closefrom-glibc-2-34.patch
new file mode 100644
index 0000000..beb8d51
--- /dev/null
+++ b/disk/fuse/patches/fuse-2.9.9-closefrom-glibc-2-34.patch
@@ -0,0 +1,60 @@
+From ae2352bca9b4e607538412da0cc2a9625cd8b692 Mon Sep 17 00:00:00 2001
+From: Sam James <sam AT 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 AT gentoo.org>
+---
+ 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 <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)
+ {



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b8d28e6c5e9417310bf8fb9fdbca60599be63ee5), Florian Franzmann, 08/22/2022

Archive powered by MHonArc 2.6.24.

Top of Page