diff --git a/glib-networking.spec b/glib-networking.spec index 64eae7827baef35fcc5c18406046cf5a9132b6b2..9604073aea4d0e6cb1acc099f62933355dd1df39 100644 --- a/glib-networking.spec +++ b/glib-networking.spec @@ -1,11 +1,13 @@ Name: glib-networking Version: 2.58.0 -Release: 5 +Release: 6 Summary: Network-related modules for glib License: LGPLv2+ URL: http://www.gnome.org Source0: http://download.gnome.org/sources/glib-networking/2.58/glib-networking-%{version}.tar.xz +Patch0001: handle-new-gnutls-e-certificate-required.patch + BuildRequires: meson gcc ca-certificates gettext systemd BuildRequires: pkgconfig(glib-2.0) >= 2.55.1 pkgconfig(gnutls) >= 3.3.5 BuildRequires: pkgconfig(gio-2.0) pkgconfig(gsettings-desktop-schemas) @@ -51,6 +53,9 @@ verify the Usability of the glib-networking package. %{_datadir}/installed-tests %changelog +* Mon Mar 16 2020 openEuler Buildteam - 2.58.0-6 +- sync handle new gnutls certificate requred patch + * Fri Jan 10 2020 openEuler Buildteam - 2.58.0-5 - clean unused patch diff --git a/handle-new-gnutls-e-certificate-required.patch b/handle-new-gnutls-e-certificate-required.patch new file mode 100644 index 0000000000000000000000000000000000000000..da21cd30fdb170e178feaf4efa30d0545b47cfe1 --- /dev/null +++ b/handle-new-gnutls-e-certificate-required.patch @@ -0,0 +1,29 @@ +From 5f79d76fbc7f52eb677ac9b0353563043deaef71 Mon Sep 17 00:00:00 2001 +From: wangxp006 +Date: Mon, 16 Mar 2020 16:33:25 +0800 +Subject: [PATCH] handle new gnutls e certificate required + +--- + tls/gnutls/gtlsconnection-gnutls.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c +index 959fa68..f9d43bc 100644 +--- a/tls/gnutls/gtlsconnection-gnutls.c ++++ b/tls/gnutls/gtlsconnection-gnutls.c +@@ -1016,7 +1016,11 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, + else + return 0; + } +- else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) ++ else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND ++#ifdef GNUTLS_E_CERTIFICATE_REQUIRED ++ || status == GNUTLS_E_CERTIFICATE_REQUIRED /* Added in GnuTLS 3.6.7 */ ++#endif ++ ) + { + g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED, + _("TLS connection peer did not send a certificate")); +-- +1.8.3.1 +