diff --git a/SOURCES/0001-libcharset-Drop-a-redundant-environment-variable.patch b/SOURCES/0001-libcharset-Drop-a-redundant-environment-variable.patch new file mode 100644 index 0000000..2d5d1c3 --- /dev/null +++ b/SOURCES/0001-libcharset-Drop-a-redundant-environment-variable.patch @@ -0,0 +1,38 @@ +From a18f091c6c090b93cd816f8cd5be763b6e238632 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Fri, 7 Feb 2020 17:10:23 +0000 +Subject: [PATCH] libcharset: Drop a redundant environment variable + +It was used for running tests when we built with autotools, but is no +longer used in the Meson build system. If we need something similar in +future, it should be done by adding internal API to override the +directory on a per-call basis, rather than loading a path from a shared +global table every time. + +Signed-off-by: Philip Withnall + +Helps: #1919 +--- + glib/libcharset/localcharset.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/glib/libcharset/localcharset.c b/glib/libcharset/localcharset.c +index 0c4d544be..ab3a2678d 100644 +--- a/glib/libcharset/localcharset.c ++++ b/glib/libcharset/localcharset.c +@@ -117,11 +117,7 @@ _g_locale_get_charset_aliases (void) + const char *base = "charset.alias"; + char *file_name; + +- /* Make it possible to override the charset.alias location. This is +- necessary for running the testsuite before "make install". */ +- dir = getenv ("CHARSETALIASDIR"); +- if (dir == NULL || dir[0] == '\0') +- dir = relocate (GLIB_CHARSETALIAS_DIR); ++ dir = relocate (GLIB_CHARSETALIAS_DIR); + + /* Concatenate dir and base into freshly allocated file_name. */ + { +-- +2.31.1 + diff --git a/SPECS/glib2.spec b/SPECS/glib2.spec index 89a23c8..871cf04 100644 --- a/SPECS/glib2.spec +++ b/SPECS/glib2.spec @@ -5,7 +5,7 @@ Name: glib2 Version: 2.56.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A library of handy utility functions License: LGPLv2+ @@ -92,6 +92,9 @@ Patch100: 0001-glocalfileoutputstream-Factor-out-a-flag-check.patch Patch101: 0002-glocalfileoutputstream-Fix-CREATE_REPLACE_DESTINATIO.patch Patch102: 0003-glocalfileoutputstream-Add-a-missing-O_CLOEXEC-flag-.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1938284 +Patch110: 0001-libcharset-Drop-a-redundant-environment-variable.patch + %description GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, @@ -289,6 +292,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/installed-tests %changelog +* Tue May 04 2021 Michael Catanzaro - 2.56.4-11 +- Remove CHARSETALIASDIR environment variable + Resolves: #1938284 + * Wed Mar 31 2021 Michael Catanzaro - 2.56.4-10 - Fix CVE-2021-27218 Resolves: #1939072