- Add closefrom.patch [boo#1189086]
OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=83
This commit is contained in:
parent
ae95f4059c
commit
9115b2249e
32
closefrom.patch
Normal file
32
closefrom.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2021-08-23 14:47:30.341142824 +0200
|
||||
References: https://bugzilla.opensuse.org/show_bug.cgi?id=1189086
|
||||
References: https://bugzilla.redhat.com/show_bug.cgi?id=1984776
|
||||
|
||||
glibc-2.34 added closefrom. Rename fuse functions to work around the collision.
|
||||
---
|
||||
util/ulockmgr_server.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: fuse-2.9.9/util/ulockmgr_server.c
|
||||
===================================================================
|
||||
--- fuse-2.9.9.orig/util/ulockmgr_server.c
|
||||
+++ fuse-2.9.9/util/ulockmgr_server.c
|
||||
@@ -124,7 +124,7 @@ static int receive_message(int sock, voi
|
||||
return res;
|
||||
}
|
||||
|
||||
-static int closefrom(int minfd)
|
||||
+static int fuse_closefrom(int minfd)
|
||||
{
|
||||
DIR *dir = opendir("/proc/self/fd");
|
||||
if (dir) {
|
||||
@@ -384,7 +384,7 @@ int main(int argc, char *argv[])
|
||||
dup2(nullfd, 1);
|
||||
}
|
||||
close(3);
|
||||
- closefrom(5);
|
||||
+ fuse_closefrom(5);
|
||||
while (1) {
|
||||
char c;
|
||||
int sock;
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 23 12:48:31 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Add closefrom.patch [boo#1189086]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 15 11:00:03 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package fuse
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -29,9 +29,10 @@ Source3: baselibs.conf
|
||||
Source4: fuse.conf
|
||||
Source5: https://github.com/libfuse/libfuse/releases/download/fuse-%{version}/fuse-%{version}.tar.gz.asc
|
||||
Source6: fuse.keyring
|
||||
Patch0: fuse-install-fix.diff
|
||||
Patch3: fusermount-compile-as-pie.patch
|
||||
Patch4: aarch64-build-fix.patch
|
||||
Patch1: fuse-install-fix.diff
|
||||
Patch2: fusermount-compile-as-pie.patch
|
||||
Patch3: aarch64-build-fix.patch
|
||||
Patch4: closefrom.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
|
Loading…
x
Reference in New Issue
Block a user