diff --git a/glib-networking-2.72.0.tar.xz b/glib-networking-2.72.0.tar.xz deleted file mode 100644 index a8820ceb8b4a293f1d93f2004d7fe7084ac74958..0000000000000000000000000000000000000000 Binary files a/glib-networking-2.72.0.tar.xz and /dev/null differ diff --git a/glib-networking-2.74.0.tar.xz b/glib-networking-2.74.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..9599960dbae30f70e58028655f03fee5052d9661 Binary files /dev/null and b/glib-networking-2.74.0.tar.xz differ diff --git a/glib-networking.spec b/glib-networking.spec index 128dbd7c7d65251fcd700e7a902136e896b24772..efcb8110922f636d532d242aa8dcf3b139ee02e9 100644 --- a/glib-networking.spec +++ b/glib-networking.spec @@ -1,20 +1,20 @@ Name: glib-networking -Version: 2.72.0 -Release: 2 +Version: 2.74.0 +Release: 1 Summary: Network-related modules for glib License: LGPLv2+ 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: 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(libproxy-1.0) pkgconfig(p11-kit-1) -Requires: ca-certificates gsettings-desktop-schemas glib2 >= 2.69.0 -Recommends: libproxy-webkitgtk4 +Requires: ca-certificates gsettings-desktop-schemas glib2 >= 2.73.3 +Recommends: libproxy-duktape %description 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 %changelog +* Mon Jan 2 2023 lin zhang - 2.74.0-1 +- Update to 2.74.0 + * Thu Feb 02 2023 yangchenguang - 2.72.0-2 - tests skip tls-exporter test for TLS 1.2 diff --git a/test-skip-tls-exporter-test-for-TLS-1.2.patch b/test-skip-tls-exporter-test-for-TLS-1.2.patch index 9b237c9163d43d098a6bff797fe65bf78ccdc309..bf87856c1e73e44c28cc9577ba6d943204ba073f 100644 --- a/test-skip-tls-exporter-test-for-TLS-1.2.patch +++ b/test-skip-tls-exporter-test-for-TLS-1.2.patch @@ -1,33 +1,24 @@ -From 205b578c6de0a6b42dd24d97f08ab47d0347431a Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Wed, 2 Nov 2022 13:26:53 +0100 -Subject: [PATCH] test skip tls-exporter test for TLS 1.2 - ---- - 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, +diff -Nur glib-networking-2.74.0.bak/tls/tests/connection.c glib-networking-2.74.0/tls/tests/connection.c +--- glib-networking-2.74.0.bak/tls/tests/connection.c 2023-02-08 14:19:03.511690104 +0800 ++++ glib-networking-2.74.0/tls/tests/connection.c 2023-02-08 14:23:39.895673890 +0800 +@@ -2723,6 +2723,9 @@ GByteArray *client_cb, *server_cb; gchar *client_b64, *server_b64; GError *error = NULL; + gboolean client_supports_tls_exporter; + gboolean server_supports_tls_exporter; ++ test->database = g_tls_file_database_new (tls_test_file_path ("ca-roots.pem"), &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); /* Smoke test: ensure both sides support tls-exporter */ - 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), -- (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), + (GTlsChannelBindingType)100500, NULL, NULL); + 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 (); - server_cb = g_byte_array_new (); - 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), -- (GTlsChannelBindingType)100500, server_cb, NULL)); -+ g_assert_true (client_supports_tls_exporter == server_supports_tls_exporter); - +- G_TLS_CHANNEL_BINDING_TLS_EXPORTER, server_cb, NULL)); +- - client_b64 = g_base64_encode (client_cb->data, client_cb->len); - server_b64 = g_base64_encode (server_cb->data, server_cb->len); - 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) + { + /* 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); + server_b64 = g_base64_encode (server_cb->data, server_cb->len); + 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 (server_b64); + g_byte_array_unref (client_cb); @@ -76,6 +69,19 @@ index f6f1cf8..e4deb02 100644 /* drop the mic */ close_server_connection (test); --- -2.20.1 - +diff -up glib-networking-2.74.0/tls/tests/connection.c.BAK glib-networking-2.74.0/tls/tests/connection.c +--- 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 */