!41 修复主线编译失败

From: @lixiaokeng
Reviewed-by: @wubo009
Signed-off-by: @wubo009

0002-util-ulockmgr_server.c-conditionally-define-closefro.patch

@@ -0,0 +1,63 @@
+From 5a43d0f724c56f8836f3f92411e0de1b5f82db32 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 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)
+ {
+-- 
+1.8.3.1
+

fuse.spec

@@ -2,7 +2,7 @@
 
 Name:    fuse
 Version: %{fuse2ver}
-Release: 8
+Release: 9
 Summary: User space File System of fuse2
 License: GPL+ and LGPLv2+
 URL:     http://fuse.sf.net
@@ -10,6 +10,7 @@ Source0: https://github.com/libfuse/libfuse/archive/%{name}-%{fuse2ver}.tar.gz
 
 Patch0:        0000-fix-compile-error-because-of-ns-colliding.patch
 Patch1:        0001-libfuse-Assign-NULL-to-old-to-avoid-free-it-twice-52.patch
+Patch2:        0002-util-ulockmgr_server.c-conditionally-define-closefro.patch
 
 BuildRequires: libselinux-devel, pkgconfig, systemd-udev, meson, fdupes
 BuildRequires: autoconf, automake, libtool, gettext-devel, ninja-build
@@ -49,6 +50,9 @@ This contains man files for the using of fuse
 %prep
 %autosetup -n %{name}-%{fuse2ver} -p1
 
+#if change configure.ac, should autoreconf
+autoreconf -ivf 
+
 %build
 export MOUNT_FUSE_PATH="%{_sbindir}"
 export CFLAGS="%{optflags} -D_GNU_SOURCE"
@@ -90,6 +94,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 
 %changelog
+- Wed Aug 11 2021 lixiaokeng <lixiaokeng@huawei.com> -2.9.9-9
+- fix double define closefrom
+
 - Mon Jul 26 2021 lixiaokeng <lixiaokeng@huawei.com> -2.9.9-8
 - autosetup patch