[gnome-builder] build-aux: rename closefrom as patch ontop of 2.9.2



commit 86dacd1decb2bc5c3de610556377cf57d86c121e
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jul 12 13:04:08 2022 -0700

    build-aux: rename closefrom as patch ontop of 2.9.2

 build-aux/flatpak/fuse-2.9.2-closefrom.patch   | 20 ++++++++++++++++++++
 build-aux/flatpak/org.gnome.Builder.Devel.json |  4 ++++
 2 files changed, 24 insertions(+)
---
diff --git a/build-aux/flatpak/fuse-2.9.2-closefrom.patch b/build-aux/flatpak/fuse-2.9.2-closefrom.patch
new file mode 100644
index 000000000..64867c4cc
--- /dev/null
+++ b/build-aux/flatpak/fuse-2.9.2-closefrom.patch
@@ -0,0 +1,20 @@
+--- fuse-2.9.2/util/ulockmgr_server.c.closefromfix     2019-01-04 05:33:33.000000000 -0800
++++ fuse-2.9.2/util/ulockmgr_server.c  2022-07-12 12:29:56.445402244 -0700
+@@ -124,7 +124,7 @@
+       return res;
+ }
+ 
+-static int closefrom(int minfd)
++static int _closefrom(int minfd)
+ {
+       DIR *dir = opendir("/proc/self/fd");
+       if (dir) {
+@@ -384,7 +384,7 @@
+               dup2(nullfd, 1);
+       }
+       close(3);
+-      closefrom(5);
++      _closefrom(5);
+       while (1) {
+               char c;
+               int sock;
diff --git a/build-aux/flatpak/org.gnome.Builder.Devel.json b/build-aux/flatpak/org.gnome.Builder.Devel.json
index b692ede95..6e80a6c53 100644
--- a/build-aux/flatpak/org.gnome.Builder.Devel.json
+++ b/build-aux/flatpak/org.gnome.Builder.Devel.json
@@ -151,6 +151,10 @@
                     "type" : "patch",
                     "path" : "fuse-disable-sys-mount-under-flatpak.patch"
                 },
+                {
+                    "type" : "patch",
+                    "path" : "fuse-2.9.2-closefrom.patch"
+                },
                 {
                     "type" : "file",
                     "path" : "fusermount-wrapper.sh"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]