From 2dc1266eb39faa29c79ab2697564072f11d3feb8 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Mon, 3 Aug 2020 12:26:40 -1000 Subject: [PATCH] glib-2.0: update 2.62.5 to 2.62.6 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Stable branch bug fix and security release. One patch update, none deleted. This is expected to be the final release in the 2.62.x stable series Changes: Fix SOCKS5 username/password authentication (#1986) Exception handling fixes on Windows (!1373) Bugs fixed: 1986 Socks5 Proxy: Authentication seems broken 1988 Socks5 Proxy: Wrong error returned when using no authentication 2049 Crash in g_array_copy 1378 Backport !1373 win32 exception fixes to glib-2-62 1380 Backport !1254 “giomodule: gio modules are no longer installed in bindir on MSVC” to glib-2-62 1393 Backport !1390 “garray: Fix copying an array with reserved elements” to glib-2-62 1394 Backport part of !1375 “tests: Skip g-file-info-filesystem-readonly test if bindfs fails” to glib-2-62 1411 Backport SOCKS5 fixes to glib-2-62 Signed-off-by: Steve Sakoman --- meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 4 ++-- .../glib-2.0/{glib-2.0_2.62.5.bb => glib-2.0_2.62.6.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.62.5.bb => glib-2.0_2.62.6.bb} (93%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index fc320dcab8..36d32506e2 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -31,8 +31,8 @@ index 1007abd..5380982 100644 #endif #include -@@ -1158,7 +1160,15 @@ get_gio_module_dir (void) - #endif +@@ -1149,7 +1151,15 @@ get_gio_module_dir (void) + NULL); g_free (install_dir); #else - module_dir = g_strdup (GIO_MODULE_DIR); diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.62.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb similarity index 93% rename from meta/recipes-core/glib-2.0/glib-2.0_2.62.5.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb index e463dd9b7c..911152ddaa 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.62.5.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb @@ -20,8 +20,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "4029ea2df04a8d4c360e45d9e8316784" -SRC_URI[sha256sum] = "b8d1cdafa46658b63d7512efbe2cd21bd36cd7be83140e44930c47b79f82452e" +SRC_URI[md5sum] = "46bba5410ad4e75f65e4b2cc61a1afc8" +SRC_URI[sha256sum] = "104fa26fbefae8024ff898330c671ec23ad075c1c0bce45c325c6d5657d58b9c" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. -- 2.40.1