Revert "glib2: update to 2.64.2"

It is not ready and there are some issues described in https://github.com/openwrt/packages/pull/11442 This reverts commit b465ac3002. Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2026-04-30 15:38:40 +01:00 · 2020-04-20 12:04:03 +02:00
parent ad798995ee
commit 111865439b
6 changed files with 121 additions and 81 deletions
@@ -0,0 +1,53 @@
+From d8f8f4d637ce43f8699ba94c9b7648beda0ca174 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Thu, 23 May 2019 10:41:53 +0200
+Subject: [PATCH] gfile: Limit access to files when copying
+
+file_copy_fallback creates new files with default permissions and
+set the correct permissions after the operation is finished. This
+might cause that the files can be accessible by more users during
+the operation than expected. Use G_FILE_CREATE_PRIVATE for the new
+files to limit access to those files.
+---
+ gio/gfile.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/gio/gfile.c b/gio/gfile.c
+index 24b136d80..74b58047c 100644
+--- a/gio/gfile.c
+++ b/gio/gfile.c
+@@ -3284,12 +3284,12 @@ file_copy_fallback (GFile                  *source,
+         out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
+                                                                    FALSE, NULL,
+                                                                    flags & G_FILE_COPY_BACKUP,
+-                                                                   G_FILE_CREATE_REPLACE_DESTINATION,
+-                                                                   info,
+                                                                   G_FILE_CREATE_REPLACE_DESTINATION |
+                                                                   G_FILE_CREATE_PRIVATE, info,
+                                                                    cancellable, error);
+       else
+         out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
+-                                                                  FALSE, 0, info,
+                                                                  FALSE, G_FILE_CREATE_PRIVATE, info,
+                                                                   cancellable, error);
+     }
+   else if (flags & G_FILE_COPY_OVERWRITE)
+@@ -3297,12 +3297,13 @@ file_copy_fallback (GFile                  *source,
+       out = (GOutputStream *)g_file_replace (destination,
+                                              NULL,
+                                              flags & G_FILE_COPY_BACKUP,
+-                                             G_FILE_CREATE_REPLACE_DESTINATION,
+                                             G_FILE_CREATE_REPLACE_DESTINATION |
+                                             G_FILE_CREATE_PRIVATE,
+                                              cancellable, error);
+     }
+   else
+     {
+-      out = (GOutputStream *)g_file_create (destination, 0, cancellable, error);
+      out = (GOutputStream *)g_file_create (destination, G_FILE_CREATE_PRIVATE, cancellable, error);
+     }
+ 
+   if (!out)
+-- 
+2.21.0
+
@@ -0,0 +1,5 @@
+--- /dev/null
+++ b/gtk-doc.make
+@@ -0,0 +1,2 @@
+EXTRA_DIST =
+CLEANFILES =
@@ -1,23 +0,0 @@
--- a/gio/meson.build
-+++ b/gio/meson.build
-@@ -870,20 +870,6 @@ endif
- 
- # Dependencies used by executables below
- have_libelf = false
-libelf = dependency('libelf', version : '>= 0.8.12', required : false)
-if libelf.found()
-  have_libelf = true
-else
-  # This fallback is necessary on *BSD. elfutils isn't the only libelf
-  # implementation, and *BSD usually includes their own libelf as a system
-  # library which doesn't have a corresponding .pc file.
-  libelf = cc.find_library('elf', required : false)
-  have_libelf = libelf.found()
-  have_libelf = have_libelf and cc.has_function('elf_begin', dependencies : libelf)
-  have_libelf = have_libelf and cc.has_function('elf_getshdrstrndx', dependencies : libelf)
-  have_libelf = have_libelf and cc.has_function('elf_getshdrnum', dependencies : libelf)
-  have_libelf = have_libelf and cc.has_header('libelf.h')
-endif
- 
- if have_libelf
-   glib_conf.set('HAVE_LIBELF', 1)
@@ -0,0 +1,20 @@
+--- a/gio/gthreadedresolver.c
+++ b/gio/gthreadedresolver.c
+@@ -873,6 +873,8 @@ do_lookup_records (GTask         *task,
+ 
+ #ifdef HAVE_RES_NQUERY
+ 
+#ifdef HAVE_RES_NQUERY
+
+ #if defined(HAVE_RES_NDESTROY)
+   res_ndestroy (&res);
+ #elif defined(HAVE_RES_NCLOSE)
+@@ -883,6 +885,8 @@ do_lookup_records (GTask         *task,
+ 
+ #endif  /* HAVE_RES_NQUERY */
+ 
+#endif
+
+ #else
+ 
+   DNS_STATUS status;
@@ -1,11 +0,0 @@
--- a/meson.build
-+++ b/meson.build
-@@ -84,7 +84,7 @@ installed_tests_template = files('template.test.in')
- installed_tests_template_tap = files('template-tap.test.in')
- 
- # Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use)
-build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) or installed_tests_enabled
-+build_tests = false
- 
- add_project_arguments('-D_GNU_SOURCE', language: 'c')
-