From d2c77372dfe6cbc176d308bad35866ceab0e261fbde3e90a10953cabc835f772 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 20 Mar 2023 12:46:59 +0000 Subject: [PATCH] Accepting request 1072679 from GNOME:Next New stable release OBS-URL: https://build.opensuse.org/request/show/1072679 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib-networking?expand=0&rev=177 --- glib-networking-2.74.0.tar.xz | 3 - glib-networking-2.76.0.tar.xz | 3 + ...networking-gnutls-tls-exporter-tls12.patch | 88 ------------------- glib-networking.changes | 31 +++++++ glib-networking.spec | 9 +- 5 files changed, 37 insertions(+), 97 deletions(-) delete mode 100644 glib-networking-2.74.0.tar.xz create mode 100644 glib-networking-2.76.0.tar.xz delete mode 100644 glib-networking-gnutls-tls-exporter-tls12.patch diff --git a/glib-networking-2.74.0.tar.xz b/glib-networking-2.74.0.tar.xz deleted file mode 100644 index 7576818..0000000 --- a/glib-networking-2.74.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b -size 277232 diff --git a/glib-networking-2.76.0.tar.xz b/glib-networking-2.76.0.tar.xz new file mode 100644 index 0000000..bd86ecb --- /dev/null +++ b/glib-networking-2.76.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:149a05a179e629a538be25662aa324b499d7c4549c5151db5373e780a1bf1b9a +size 280852 diff --git a/glib-networking-gnutls-tls-exporter-tls12.patch b/glib-networking-gnutls-tls-exporter-tls12.patch deleted file mode 100644 index afced55..0000000 --- a/glib-networking-gnutls-tls-exporter-tls12.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 205b578c6de0a6b42dd24d97f08ab47d0347431a Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Wed, 2 Nov 2022 13:26:53 +0100 -Subject: [PATCH] tests: skip tls-exporter test for TLS 1.2 - -TLS exporter does not exist before TLS 1.3 so skip the tls-exporter test -for TLS 1.2. - -Fixes https://gitlab.gnome.org/GNOME/glib-networking/-/issues/201 - -Part-of: ---- - tls/tests/connection.c | 49 ++++++++++++++++++++++++++---------------- - 1 file changed, 31 insertions(+), 18 deletions(-) - -Index: glib-networking-2.74.0/tls/tests/connection.c -=================================================================== ---- glib-networking-2.74.0.orig/tls/tests/connection.c -+++ glib-networking-2.74.0/tls/tests/connection.c -@@ -2723,6 +2723,8 @@ test_connection_binding_match_tls_export - 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_export - 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), -- 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_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL)); -- -- /* Real test: retrieve bindings and compare */ -- 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), -- 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_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); -+ client_supports_tls_exporter = g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection), -+ G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL); -+ server_supports_tls_exporter = g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection), -+ G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL); -+ -+ g_assert_true (client_supports_tls_exporter == server_supports_tls_exporter); -+ -+ if (client_supports_tls_exporter) -+ { -+ /* Real test: retrieve bindings and compare */ -+ 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), -+ 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_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); -+ } -+ 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"); -+ } - - /* drop the mic */ - close_server_connection (test); diff --git a/glib-networking.changes b/glib-networking.changes index 9468395..38eff56 100644 --- a/glib-networking.changes +++ b/glib-networking.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Mar 17 15:49:19 UTC 2023 - Bjørn Lie + +- Update to version 2.76.0: + + Fix OpenSSL sessions becoming unresumable. + + Fix installed libproxy test. + +------------------------------------------------------------------- +Mon Feb 27 18:05:14 UTC 2023 - Dominique Leuenberger + +- Update to version 2.76.beta: + + Hopefully fix environment proxy resolver on Windows. + + Remove static_modules build option, use + -Ddefault_library=static instead. + + Updated translations. + +------------------------------------------------------------------- +Wed Feb 15 15:24:49 UTC 2023 - Dominique Leuenberger + +- Update to version 2.76.alpha: + + OpenSSL: add session resumption support. + + GnuTLS: several session resumption improvements. + + Skip TLS exporter test for TLS 1.2. + + Default values for build options have changed, no longer use + auto. + + Fix static linking on Windows. + + Don't use system trust on iOS. + + Updated translations. +- Drop glib-networking-gnutls-tls-exporter-tls12.patch: fixed + upstream. + ------------------------------------------------------------------- Wed Oct 26 10:22:12 UTC 2022 - Pedro Monreal diff --git a/glib-networking.spec b/glib-networking.spec index fe956b9..dd18a2a 100644 --- a/glib-networking.spec +++ b/glib-networking.spec @@ -1,7 +1,7 @@ # # spec file for package glib-networking # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,16 +18,14 @@ %define gio_real_package %(rpm -q --qf '%%{name}' --whatprovides gio) Name: glib-networking -Version: 2.74.0 +Version: 2.76.0 Release: 0 Summary: Network-related GIO modules for glib License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ URL: https://www.gnome.org -Source0: https://download.gnome.org/sources/glib-networking/2.74/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/glib-networking/2.76/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM glib-networking-gnutls-tls-exporter-tls12.patch glgo#GNOME/glib-networking#201 pmonreal@suse.com -- Fix build with gnutls 3.7.8 -Patch0: glib-networking-gnutls-tls-exporter-tls12.patch BuildRequires: ca-certificates-mozilla # For directory ownership BuildRequires: dbus-1 @@ -77,7 +75,6 @@ Currently, there is only a proxy module based on libproxy. %license COPYING LICENSE_EXCEPTION %doc NEWS README %{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service -%{_libdir}/gio/modules/libgioenvironmentproxy.so %{_libdir}/gio/modules/libgiognomeproxy.so %{_libdir}/gio/modules/libgiognutls.so %{_libdir}/gio/modules/libgiolibproxy.so