pool/libsoup2
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1224048 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1224048
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsoup2?expand=0&rev=9
This commit is contained in:
Ana Guerrero
2024-11-15 14:37:52 +00:00
committed by Git OBS Bridge
parent 73500b6062 45493b0135
commit 67c0e0039c
3 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
4c9e75c6.patch Normal file
View File

@@ -0,0 +1,42 @@
From 4c9e75c6676a37b6485620c332e568e1a3f530ff Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 13 Nov 2024 14:14:23 +0000
Subject: [PATCH] websocket-test: Disconnect error signal in another place
This is the same change as commit 29b96fab "websocket-test: disconnect
error copy after the test ends", and is done for the same reason, but
replicating it into a different function.
Fixes: 6adc0e3e "websocket: process the frame as soon as we read data"
Resolves: https://gitlab.gnome.org/GNOME/libsoup/-/issues/399
Signed-off-by: Simon McVittie <smcv@debian.org>
---
tests/websocket-test.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/websocket-test.c b/tests/websocket-test.c
index 6a48c1f9..723f2857 100644
--- a/tests/websocket-test.c
+++ b/tests/websocket-test.c
@@ -1508,8 +1508,9 @@ test_receive_invalid_encode_length_16 (Test *test,
GError *error = NULL;
InvalidEncodeLengthTest context = { test, NULL };
guint i;
+ guint error_id;
- g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
+ error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received);
/* We use 126(~) as payload length with 125 extended length */
@@ -1522,6 +1523,7 @@ test_receive_invalid_encode_length_16 (Test *test,
WAIT_UNTIL (error != NULL || received != NULL);
g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR);
g_clear_error (&error);
+ g_signal_handler_disconnect (test->client, error_id);
g_assert_null (received);
g_thread_join (thread);
--
GitLab

6
libsoup2.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 13 19:51:03 UTC 2024 - Michael Gorse <mgorse@suse.com>
- Add 4c9e75c6.patch: fix an intermittent test failure
(glgo#GNOME/libsoup#399).
-------------------------------------------------------------------
Tue Nov 12 23:21:48 UTC 2024 - Michael Gorse <mgorse@suse.com>

2
libsoup2.spec
View File

@@ -44,6 +44,8 @@ Patch7: libsoup-CVE-2024-52532.patch
Patch8: https://gitlab.gnome.org/GNOME/libsoup/-/commit/29b96fab.patch
# PATCH-FIX-UPSTREAM a35222dd.patch boo#1233292 mgorse@suse.com -- be more robust against invalid input when parsing params.
Patch9: https://gitlab.gnome.org/GNOME/libsoup/-/commit/a35222dd.patch
# PATCH-FIX-UPSTREAM 4c9e75c6.patch boo#1233287 mgorse@suse.com -- fix an intermittent test failure.
Patch10: https://gitlab.gnome.org/GNOME/libsoup/-/commit/4c9e75c6.patch
BuildRequires: glib-networking
BuildRequires: meson >= 0.50