Update to 2.69.2

This commit is contained in:
Kalev Lember 2021-08-21 12:13:37 +02:00
parent 7aafbaff5d
commit bce7213a56
3 changed files with 2 additions and 34 deletions

View File

@ -1,29 +0,0 @@
From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 8 Jul 2021 17:26:43 -0700
Subject: [PATCH] correctly use 3 parameters for close_range
libc implementation has 3 parameter e.g.
https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
glib/gspawn.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/glib/gspawn.c b/glib/gspawn.c
index 899647c2f..3073a10a4 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd)
*
* Handle ENOSYS in case its supported in libc but not the kernel; if so,
* fall back to safe_fdwalk(). */
- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS)
+ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS)
#endif /* HAVE_CLOSE_RANGE */
(void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd));
#endif
--
GitLab

View File

@ -1,5 +1,5 @@
Name: glib2
Version: 2.69.0
Version: 2.69.2
Release: %autorelease
Summary: A library of handy utility functions
@ -17,9 +17,6 @@ Patch0: gnutls-hmac.patch
# Proposed upstream at https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1596
Patch1: gdesktopappinfo.patch
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2180
Patch2: close-range-ftbfs.patch
BuildRequires: chrpath
BuildRequires: gcc
BuildRequires: gcc-c++

View File

@ -1 +1 @@
SHA512 (glib-2.69.0.tar.xz) = 1de7517c2dfde724a45507383c909bdaa5d2c2452449b7e091057fb8bbf1ea10dcd7fbb6c7e67735287551bd13e2bbfee910ed848a1a53209a13b43eb7046480
SHA512 (glib-2.69.2.tar.xz) = 6bcd57303ab579ce9e8acfe564dee93f1e6df371867c0cb5616f5d40dc7b8c4b54aff28b2d057e27d09a1751b023ce46d9bd4b744dd37fc36c38a5b5dd2e3fb2