diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
commit | d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch) | |
tree | 24cd2cf57f3932a24b96e4a0f6666489447e43ba /sys-fs/fuse/files | |
parent | 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff) |
gentoo resync : 07.08.2021
Diffstat (limited to 'sys-fs/fuse/files')
-rw-r--r-- | sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch | 38 | ||||
-rw-r--r-- | sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch | 60 |
2 files changed, 98 insertions, 0 deletions
diff --git a/sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch b/sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch new file mode 100644 index 000000000000..b5c141d29ed0 --- /dev/null +++ b/sys-fs/fuse/files/fuse-2.9.9-avoid-calling-umount.patch @@ -0,0 +1,38 @@ +From acb69eca6c25db44523efb4cb1e7088ae66d093d Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 3 Aug 2021 23:14:12 +0100 +Subject: [PATCH] Avoid calling umount + +Converting a sed into a patch. + +Ebuild had: + # sandbox violation with mtab writability wrt #438250 + # don't sed configure.in without eautoreconf because of maintainer mode + sed -i 's:umount --fake:true --fake:' configure || die + +Bug: https://bugs.gentoo.org/438250 +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9946a0e..de433cb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,11 +101,11 @@ util_linux_ok=yes + if test "$arch" = linux -a "$cross_compiling" != "yes"; then + AC_MSG_CHECKING([if umount supports --fake --no-canonicalize]) + # exit code of umount is 1 if option is unrecognised, 2 otherwise +- umount --fake --no-canonicalize > /dev/null 2>&1 ++ true --fake --no-canonicalize > /dev/null 2>&1 + if test $? != 1; then + AC_MSG_RESULT([yes]) + else +- firstline=`umount --fake --no-canonicalize 2>&1 | head -1` ++ firstline=`true --fake --no-canonicalize 2>&1 | head -1` + if test "$firstline" = 'umount: only root can use "--fake" option'; then + AC_MSG_RESULT([yes]) + else +-- +2.32.0 + diff --git a/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch b/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch new file mode 100644 index 000000000000..beb8d51da1ee --- /dev/null +++ b/sys-fs/fuse/files/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@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> +--- + 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) + { |