diff options
author | Steve Sakoman <steve@sakoman.com> | 2020-08-03 12:26:40 -1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-12 10:53:45 +0100 |
commit | e629d093363178ebc57f0ab95e4ed8b70ece9cb4 (patch) | |
tree | 78e07954851fa0b9f5048f8410db62088076041c /meta/recipes-core | |
parent | f4f66c0d586415248d55d88a98560cd12b4e43ea (diff) | |
download | poky-e629d093363178ebc57f0ab95e4ed8b70ece9cb4.tar.gz |
glib-2.0: update 2.62.5 to 2.62.6
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
(From OE-Core rev: 2dc1266eb39faa29c79ab2697564072f11d3feb8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 4 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.62.6.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.62.5.bb) | 4 |
2 files changed, 4 insertions, 4 deletions
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 | |||
31 | #endif | 31 | #endif |
32 | #include <glib/gstdio.h> | 32 | #include <glib/gstdio.h> |
33 | 33 | ||
34 | @@ -1158,7 +1160,15 @@ get_gio_module_dir (void) | 34 | @@ -1149,7 +1151,15 @@ get_gio_module_dir (void) |
35 | #endif | 35 | NULL); |
36 | g_free (install_dir); | 36 | g_free (install_dir); |
37 | #else | 37 | #else |
38 | - module_dir = g_strdup (GIO_MODULE_DIR); | 38 | - 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 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 \ | |||
20 | 20 | ||
21 | SRC_URI_append_class-native = " file://relocate-modules.patch" | 21 | SRC_URI_append_class-native = " file://relocate-modules.patch" |
22 | 22 | ||
23 | SRC_URI[md5sum] = "4029ea2df04a8d4c360e45d9e8316784" | 23 | SRC_URI[md5sum] = "46bba5410ad4e75f65e4b2cc61a1afc8" |
24 | SRC_URI[sha256sum] = "b8d1cdafa46658b63d7512efbe2cd21bd36cd7be83140e44930c47b79f82452e" | 24 | SRC_URI[sha256sum] = "104fa26fbefae8024ff898330c671ec23ad075c1c0bce45c325c6d5657d58b9c" |
25 | 25 | ||
26 | # Find any meson cross files in FILESPATH that are relevant for the current | 26 | # Find any meson cross files in FILESPATH that are relevant for the current |
27 | # build (using siteinfo) and add them to EXTRA_OEMESON. | 27 | # build (using siteinfo) and add them to EXTRA_OEMESON. |