mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
glib-networking: upgrade 2.80.0 -> 2.80.1
eagain.patch is dropped, as it is included in this release. Changelog: - OpenSSL: fix crash in complete_handshake (!251, Dario Saccavino) - OpenSSL: fix invalid free in openssl_get_binding_tls_server_end_point() (!255) - TLS test should handle G_IO_ERROR_WOULD_BLOCK (!253, Richard Purdie and Alexander Kanavin) - Updated translations (From OE-Core rev: 47095302f235250af0134a3d041bb4dbf228bca1) Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
2c45ddc4b1
commit
22dfa89719
|
|
@ -1,36 +0,0 @@
|
|||
From f917ef5579257007bc02850e79769fe5ec48b2b7 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Sat, 6 May 2023 12:18:50 +0100
|
||||
Subject: [PATCH] In autobuilder testing we regularly see glib-networking ptest
|
||||
fail with:
|
||||
|
||||
GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27)
|
||||
Bail out! GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27)
|
||||
FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6)
|
||||
SUMMARY: total=4; passed=3; skipped=0; failed=1; user=0.9s; system=0.4s; maxrss=10708
|
||||
FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6)
|
||||
|
||||
The test should probably retry in this situation so test a patch which does this.
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/253]
|
||||
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
---
|
||||
tls/tests/connection.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
|
||||
index 62a7fbb..3447c80 100644
|
||||
--- a/tls/tests/connection.c
|
||||
+++ b/tls/tests/connection.c
|
||||
@@ -2210,6 +2210,10 @@ simul_read_thread (gpointer user_data)
|
||||
test->buf + test->nread,
|
||||
MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread),
|
||||
NULL, &error);
|
||||
+
|
||||
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
|
||||
+ continue;
|
||||
+
|
||||
g_assert_no_error (error);
|
||||
|
||||
test->nread += nread;
|
||||
|
|
@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
|
|||
SECTION = "libs"
|
||||
DEPENDS = "glib-2.0-native glib-2.0"
|
||||
|
||||
SRC_URI[archive.sha256sum] = "d8f4f1aab213179ae3351617b59dab5de6bcc9e785021eee178998ebd4bb3acf"
|
||||
SRC_URI[archive.sha256sum] = "b80e2874157cd55071f1b6710fa0b911d5ac5de106a9ee2a4c9c7bee61782f8e"
|
||||
|
||||
# Upstream note that for the openssl backend, half the tests where this backend don't return
|
||||
# the expected error code or don't work as expected so default to gnutls
|
||||
|
|
@ -30,7 +30,6 @@ PACKAGECONFIG[gnomeproxy] = "-Dgnome_proxy=enabled,-Dgnome_proxy=disabled,gsetti
|
|||
inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome
|
||||
|
||||
SRC_URI += "file://run-ptest"
|
||||
SRC_URI += "file://eagain.patch"
|
||||
|
||||
FILES:${PN} += "\
|
||||
${libdir}/gio/modules/libgio*.so \
|
||||
Loading…
Reference in New Issue
Block a user