update version to 2.76.1 and enable test
This commit is contained in:
yangl777
parent
d6acd42508
commit
3e0666281c
Binary file not shown.
BIN
glib-networking-2.76.1.tar.xz
Normal file
BIN
glib-networking-2.76.1.tar.xz
Normal file
Binary file not shown.
@ -1,12 +1,10 @@
|
|||||||
Name: glib-networking
|
Name: glib-networking
|
||||||
Version: 2.74.0
|
Version: 2.76.1
|
||||||
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.74/%{name}-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/glib-networking/2.76/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
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.73.3 pkgconfig(gnutls) >= 3.7.4
|
BuildRequires: pkgconfig(glib-2.0) >= 2.73.3 pkgconfig(gnutls) >= 3.7.4
|
||||||
@ -37,6 +35,9 @@ verify the Usability of the glib-networking package.
|
|||||||
%install
|
%install
|
||||||
%meson_install
|
%meson_install
|
||||||
|
|
||||||
|
%check
|
||||||
|
%meson_test
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
|
|
||||||
@ -44,7 +45,6 @@ verify the Usability of the glib-networking package.
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc NEWS README
|
%doc NEWS README
|
||||||
%{_libdir}/gio/modules/libgioenvironmentproxy.so
|
|
||||||
%{_libdir}/gio/modules/libgiognomeproxy.so
|
%{_libdir}/gio/modules/libgiognomeproxy.so
|
||||||
%{_libdir}/gio/modules/libgiognutls.so
|
%{_libdir}/gio/modules/libgiognutls.so
|
||||||
%{_libdir}/gio/modules/libgiolibproxy.so
|
%{_libdir}/gio/modules/libgiolibproxy.so
|
||||||
@ -58,6 +58,9 @@ verify the Usability of the glib-networking package.
|
|||||||
%{_datadir}/installed-tests
|
%{_datadir}/installed-tests
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 26 2023 yanglu <yanglu72@h-partners.co> - 2.76.1-1
|
||||||
|
- update version to 2.76.1 and enable test
|
||||||
|
|
||||||
* Wed Aug 9 2023 zhangpan <zhangpan@h-partners.co> - 2.74.0-2
|
* Wed Aug 9 2023 zhangpan <zhangpan@h-partners.co> - 2.74.0-2
|
||||||
- disable make check
|
- disable make check
|
||||||
|
|
||||||
|
|||||||
@ -1,87 +0,0 @@
|
|||||||
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 +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),
|
|
||||||
- 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));
|
|
||||||
+ 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),
|
|
||||||
+ (GTlsChannelBindingType)100500, 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);
|
|
||||||
+ 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),
|
|
||||||
+ (GTlsChannelBindingType)100500, client_cb, NULL));
|
|
||||||
+ g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
|
|
||||||
+ (GTlsChannelBindingType)100500, 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 -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 */
|
|
||||||
Loading…
x
Reference in New Issue
Block a user