pool/glib2
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 910437 from GNOME:Factory

Browse Source 
- Add 63e7864.patch: Fix build with glibc 2.34: use 3 parameters
  for close_range (boo#1189088). (forwarded request 910172 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/910437
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=241
This commit is contained in:
Richard Brown
2021-08-11 09:47:03 +00:00
committed by Git OBS Bridge
parent 097fbe1b71 03838610f2
commit df40aeb0ad
3 changed files with 75 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
63e7864.patch Normal file
View File

@@ -0,0 +1,29 @@
From 6e59d21b273f026e82adc56fecbec67d1ffa72a4 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 95f5b868e..a15fb1ca1 100644
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -1494,7 +1494,7 @@ safe_closefrom (int lowfd)
*
* Handle ENOSYS in case it’s 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

76
glib2.changes
View File

@@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Aug 4 15:17:41 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Add 63e7864.patch: Fix build with glibc 2.34: use 3 parameters
for close_range (boo#1189088).
-------------------------------------------------------------------
Fri Jul 30 08:33:40 UTC 2021 - Yifan Jiang <yfjiang@suse.com>
- Drop patches fixed upstream on SLE and Leap 15.4:
+ glib2-add-support-for-slim-timezone-format.patch
+ glib2-fix-6-days-until-the-end-of-the-month.patch
+ glib2-CVE-2021-27218.patch
+ glib2-CVE-2021-27219-add-g_memdup2.patch
-------------------------------------------------------------------
Thu Jul 15 15:02:20 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
@@ -78,6 +93,24 @@ Mon Mar 8 09:58:03 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
`wrap_mode=forcefallback`.
+ Updated translations.
-------------------------------------------------------------------
Thu Mar 4 00:49:58 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
- Add glib2-CVE-2021-27218.patch: g_byte_array_new_take takes a
gsize as length but stores in a guint, this patch will refuse if
the length is larger than guint. (bsc#1182328,
glgo#GNOME/glib!1944)
-------------------------------------------------------------------
Wed Mar 3 01:17:16 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
- Add glib2-CVE-2021-27219-add-g_memdup2.patch: g_memdup takes a
guint as parameter and sometimes leads into an integer overflow,
so add a g_memdup2 function which uses gsize to replace it.
(bsc#1182362, glgo#GNOME/glib!1927, glgo#GNOME/glib!1933,
glgo#GNOME/glib!1943)
-------------------------------------------------------------------
Wed Feb 17 09:38:03 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
@@ -158,8 +191,6 @@ Thu Feb 11 13:33:21 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
glib2-fate300461-gettext-gkeyfile-suse.patch,
glib2-dbus-socket-path.patch and
glib2-gdbus-codegen-version.patch.
- Drop glib2-fix-6-days-until-the-end-of-the-month.patch: fixed
upstream.
-------------------------------------------------------------------
Thu Feb 11 13:33:20 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
@@ -175,8 +206,6 @@ Thu Feb 11 13:33:20 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
security-sensitive flags likely to be released in GLib 2.68.
+ Bugs fixed: glgo#GNOME/GLib!1933, glgo#GNOME/GLib!1943,
glgo#GNOME/GLib!1944, glgo#GNOME/GLib!1945.
- Drop glib2-CVE-2021-27218.patch: fixed upstream.
- Drop glib2-CVE-2021-27219-add-g_memdup2.patch: fixed upstream.
-------------------------------------------------------------------
Thu Feb 11 11:06:17 UTC 2021 - Christopher Yeleighton <giecrilj@stegny.2a.pl>
@@ -185,23 +214,6 @@ Thu Feb 11 11:06:17 UTC 2021 - Christopher Yeleighton <giecrilj@stegny.2a.pl>
- use macros in spec file
- simplify trigger code
-------------------------------------------------------------------
Wed Feb 10 01:17:16 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
- Add glib2-CVE-2021-27219-add-g_memdup2.patch: g_memdup takes a
guint as parameter and sometimes leads into an integer overflow,
so add a g_memdup2 function which uses gsize to replace it.
(bsc#1182362, glgo#GNOME/glib!1927, glgo#GNOME/glib!1933,
glgo#GNOME/glib!1943)
-------------------------------------------------------------------
Thu Feb 10 00:49:58 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
- Add glib2-CVE-2021-27218.patch: g_byte_array_new_take takes a
gsize as length but stores in a guint, this patch will refuse if
the length is larger than guint. (bsc#1182328,
glgo#GNOME/glib!1944)
-------------------------------------------------------------------
Fri Feb 5 10:59:15 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
@@ -277,6 +289,16 @@ Sun Nov 15 18:52:39 UTC 2020 - Christopher Yeleighton <giecrilj@stegny.2a.pl>
- add %doc README.md
- rename -tests to -tests-devel
-------------------------------------------------------------------
Fri Nov 6 07:12:20 UTC 2020 - Alynx Zhou <alynx.zhou@suse.com>
- Add patches to support for slim format of timezone (bsc#1178346):
+ glib2-add-support-for-slim-timezone-format.patch: basic support
for slim format (glgo#GNOME/glib!1533).
+ glib2-fix-6-days-until-the-end-of-the-month.patch: fix DST
incorrect end day when using slim format
(glgo#GNOME/glib!1683).
-------------------------------------------------------------------
Thu Oct 22 11:45:40 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
@@ -356,8 +378,6 @@ Mon Oct 5 02:55:02 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Rebase glib2-gdbus-codegen-version.patch.
- Build without gtk-doc: it would require a not yet released
version of gtk-doc.
- Drop glib2-add-support-for-slim-timezone-format.patch: fixed
upstream.
-------------------------------------------------------------------
Sun Oct 4 11:01:34 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
@@ -369,16 +389,6 @@ Sun Oct 4 11:01:34 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
glgo#GNOME/GLib!1666, glgo#GNOME/GLib!1672.
+ Updated translations.
-------------------------------------------------------------------
Fri Oct 4 07:12:20 UTC 2020 - Alynx Zhou <alynx.zhou@suse.com>
- Add patches to support for slim format of timezone (bsc#1178346):
+ glib2-add-support-for-slim-timezone-format.patch: basic support
for slim format (glgo#GNOME/glib!1533).
+ glib2-fix-6-days-until-the-end-of-the-month.patch: fix DST
incorrect end day when using slim format
(glgo#GNOME/glib!1683).
-------------------------------------------------------------------
Tue Aug 18 17:20:55 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

3
glib2.spec
View File

@@ -47,6 +47,8 @@ Patch2: glib2-suppress-schema-deprecated-path-warning.patch
Patch3: glib2-dbus-socket-path.patch
# PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch olaf@aepfle.de -- Remove version string from files generated by gdbus-codegen
Patch4: glib2-gdbus-codegen-version.patch
# PATCH-FIX-UPSTREAM 63e7864.patch boo#1189088 dimstar@opensuse.org -- Fix build with glibc 2.34: use 3 parameters for close_range
Patch5: https://gitlab.gnome.org/GNOME/glib/-/commit/63e7864.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: gamin-devel
@@ -269,6 +271,7 @@ translation-update-upstream
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} .
cp -a %{SOURCE4} gnome_defaults.conf
# replace /usr/bin/env shebangs