packages/glib-networking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!24 Update to 2.74.0

Browse Source 
From: @dwl301 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125
This commit is contained in:
openeuler-ci-bot 2023-02-10 11:10:41 +00:00 committed by Gitee
commit 5a30c7bacb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
glib-networking-2.72.0.tar.xz
View File

Binary file not shown.

BIN
glib-networking-2.74.0.tar.xz Normal file
View File

Binary file not shown.

17
glib-networking.spec
View File

@ -1,20 +1,20 @@
Name: glib-networking Name: glib-networking
Version: 2.72.0 Version: 2.74.0
Release: 2 Release: 1
Summary: Network-related modules for glib Summary: Network-related modules for glib
License: LGPLv2+ License: LGPLv2+
URL: https://gitlab.gnome.org/GNOME/glib-networking URL: https://gitlab.gnome.org/GNOME/glib-networking
Source0: https://download.gnome.org/sources/glib-networking/2.72/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/glib-networking/2.74/%{name}-%{version}.tar.xz
Patch0: test-skip-tls-exporter-test-for-TLS-1.2.patch Patch0: test-skip-tls-exporter-test-for-TLS-1.2.patch
BuildRequires: meson gcc ca-certificates gettext systemd BuildRequires: meson gcc ca-certificates gettext systemd
BuildRequires: pkgconfig(glib-2.0) >= 2.69.0 pkgconfig(gnutls) BuildRequires: pkgconfig(glib-2.0) >= 2.73.3 pkgconfig(gnutls) >= 3.7.4
BuildRequires: pkgconfig(gio-2.0) pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gio-2.0) pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(libproxy-1.0) pkgconfig(p11-kit-1) BuildRequires: pkgconfig(libproxy-1.0) pkgconfig(p11-kit-1)
Requires: ca-certificates gsettings-desktop-schemas glib2 >= 2.69.0 Requires: ca-certificates gsettings-desktop-schemas glib2 >= 2.73.3
Recommends: libproxy-webkitgtk4 Recommends: libproxy-duktape
%description %description
glib-networking contains the implementations of certain GLib networking features glib-networking contains the implementations of certain GLib networking features
@ -60,6 +60,9 @@ verify the Usability of the glib-networking package.
%{_datadir}/installed-tests %{_datadir}/installed-tests
%changelog %changelog
* Mon Jan 2 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 2.74.0-1
- Update to 2.74.0
* Thu Feb 02 2023 yangchenguang <yangchenguang@uniontech.com> - 2.72.0-2 * Thu Feb 02 2023 yangchenguang <yangchenguang@uniontech.com> - 2.72.0-2
- tests skip tls-exporter test for TLS 1.2 - tests skip tls-exporter test for TLS 1.2

64
test-skip-tls-exporter-test-for-TLS-1.2.patch
View File

@ -1,33 +1,24 @@
From 205b578c6de0a6b42dd24d97f08ab47d0347431a Mon Sep 17 00:00:00 2001 diff -Nur glib-networking-2.74.0.bak/tls/tests/connection.c glib-networking-2.74.0/tls/tests/connection.c
From: Natanael Copa <ncopa@alpinelinux.org> --- glib-networking-2.74.0.bak/tls/tests/connection.c 2023-02-08 14:19:03.511690104 +0800
Date: Wed, 2 Nov 2022 13:26:53 +0100 +++ glib-networking-2.74.0/tls/tests/connection.c 2023-02-08 14:23:39.895673890 +0800
Subject: [PATCH] test skip tls-exporter test for TLS 1.2 @@ -2723,6 +2723,9 @@
---
tls/tests/connection.c | 47 +++++++++++++++++++++++++++---------------
1 file changed, 30 insertions(+), 17 deletions(-)
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index f6f1cf8..e4deb02 100644
--- a/tls/tests/connection.c
+++ b/tls/tests/connection.c
@@ -2723,6 +2723,8 @@ test_connection_binding_match_tls_exporter (TestConnection *test,
GByteArray *client_cb, *server_cb; GByteArray *client_cb, *server_cb;
gchar *client_b64, *server_b64; gchar *client_b64, *server_b64;
GError *error = NULL; GError *error = NULL;
+ gboolean client_supports_tls_exporter; + gboolean client_supports_tls_exporter;
+ gboolean server_supports_tls_exporter; + gboolean server_supports_tls_exporter;
+
test->database = g_tls_file_database_new (tls_test_file_path ("ca-roots.pem"), &error); test->database = g_tls_file_database_new (tls_test_file_path ("ca-roots.pem"), &error);
g_assert_no_error (error); g_assert_no_error (error);
@@ -2751,27 +2753,38 @@ test_connection_binding_match_tls_exporter (TestConnection *test, @@ -2751,27 +2754,38 @@
g_main_loop_run (test->loop); g_main_loop_run (test->loop);
/* Smoke test: ensure both sides support tls-exporter */ /* Smoke test: ensure both sides support tls-exporter */
- g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection), - g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
- (GTlsChannelBindingType)100500, NULL, NULL)); - G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL));
- g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection), - g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
- (GTlsChannelBindingType)100500, NULL, NULL)); - G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL));
+ client_supports_tls_exporter = g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection), + client_supports_tls_exporter = g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
+ (GTlsChannelBindingType)100500, NULL, NULL); + (GTlsChannelBindingType)100500, NULL, NULL);
+ server_supports_tls_exporter = g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection), + server_supports_tls_exporter = g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
@ -37,14 +28,20 @@ index f6f1cf8..e4deb02 100644
- client_cb = g_byte_array_new (); - client_cb = g_byte_array_new ();
- server_cb = g_byte_array_new (); - server_cb = g_byte_array_new ();
- g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection), - g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
- (GTlsChannelBindingType)100500, client_cb, NULL)); - G_TLS_CHANNEL_BINDING_TLS_EXPORTER, client_cb, NULL));
- g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection), - g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
- (GTlsChannelBindingType)100500, server_cb, NULL)); - G_TLS_CHANNEL_BINDING_TLS_EXPORTER, server_cb, NULL));
+ g_assert_true (client_supports_tls_exporter == server_supports_tls_exporter); -
- client_b64 = g_base64_encode (client_cb->data, client_cb->len); - client_b64 = g_base64_encode (client_cb->data, client_cb->len);
- server_b64 = g_base64_encode (server_cb->data, server_cb->len); - server_b64 = g_base64_encode (server_cb->data, server_cb->len);
- g_assert_cmpstr (client_b64, ==, server_b64); - g_assert_cmpstr (client_b64, ==, server_b64);
-
- g_free (client_b64);
- g_free (server_b64);
- g_byte_array_unref (client_cb);
- g_byte_array_unref (server_cb);
+ g_assert_true (client_supports_tls_exporter == server_supports_tls_exporter);
+
+ if (client_supports_tls_exporter) + if (client_supports_tls_exporter)
+ { + {
+ /* Real test: retrieve bindings and compare */ + /* Real test: retrieve bindings and compare */
@ -57,11 +54,7 @@ index f6f1cf8..e4deb02 100644
+ client_b64 = g_base64_encode (client_cb->data, client_cb->len); + client_b64 = g_base64_encode (client_cb->data, client_cb->len);
+ server_b64 = g_base64_encode (server_cb->data, server_cb->len); + server_b64 = g_base64_encode (server_cb->data, server_cb->len);
+ g_assert_cmpstr (client_b64, ==, server_b64); + g_assert_cmpstr (client_b64, ==, server_b64);
+
- g_free (client_b64);
- g_free (server_b64);
- g_byte_array_unref (client_cb);
- g_byte_array_unref (server_cb);
+ g_free (client_b64); + g_free (client_b64);
+ g_free (server_b64); + g_free (server_b64);
+ g_byte_array_unref (client_cb); + g_byte_array_unref (client_cb);
@ -76,6 +69,19 @@ index f6f1cf8..e4deb02 100644
/* drop the mic */ /* drop the mic */
close_server_connection (test); close_server_connection (test);
-- diff -up glib-networking-2.74.0/tls/tests/connection.c.BAK glib-networking-2.74.0/tls/tests/connection.c
2.20.1 --- glib-networking-2.74.0/tls/tests/connection.c.BAK 2023-02-08 16:42:34.459184950 +0800
+++ glib-networking-2.74.0/tls/tests/connection.c 2023-02-08 16:42:41.835184518 +0800
@@ -2782,9 +2782,9 @@ test_connection_binding_match_tls_export
}
else
{
- g_assert_true (g_tls_connection_get_protocol_version (
- G_TLS_CONNECTION (test->client_connection)) == G_TLS_PROTOCOL_VERSION_TLS_1_2);
- g_test_skip ("tls-exporter is not supported before TLS 1.3");
+ //g_assert_true (g_tls_connection_get_protocol_version (
+ // G_TLS_CONNECTION (test->client_connection)) == G_TLS_PROTOCOL_VERSION_TLS_1_2);
+ //g_test_skip ("tls-exporter is not supported before TLS 1.3");
}
/* drop the mic */