From 8e6f83309a702333456cfc7bce2da8ec2f7ddf54a0ab4b69a3b8b9623fbc51dc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Apr 2019 07:04:48 +0000 Subject: [PATCH] Accepting request 691860 from home:vitezslav_cizek:branches:GNOME:Factory - Handle new GnuTLS error GNUTLS_E_CERTIFICATE_REQUIRED + https://gitlab.gnome.org/GNOME/glib-networking/issues/70 + add 0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch OBS-URL: https://build.opensuse.org/request/show/691860 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib-networking?expand=0&rev=130 --- ...le-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch | 34 +++++++++++++++++++ glib-networking.changes | 7 ++++ glib-networking.spec | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch diff --git a/0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch b/0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch new file mode 100644 index 0000000..6deeb4b --- /dev/null +++ b/0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch @@ -0,0 +1,34 @@ +From 1ce6b40da8ecbf997c5522a592a122e805aa81c4 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Wed, 3 Apr 2019 18:00:55 -0500 +Subject: [PATCH] gnutls: Handle new GNUTLS_E_CERTIFICATE_REQUIRED + +This new error in GnuTLS 3.6.7 should correspond to +G_TLS_ERROR_CERTIFICATE_REQUIRED. This fixes our client auth tests when +run with GnuTLS 3.6.7. + +Fixes #70 +--- + 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 27bbbcd..774d668 100644 +--- a/tls/gnutls/gtlsconnection-gnutls.c ++++ b/tls/gnutls/gtlsconnection-gnutls.c +@@ -1062,7 +1062,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")); +-- +2.21.0 + diff --git a/glib-networking.changes b/glib-networking.changes index 9f1a4f9..c6bb0b3 100644 --- a/glib-networking.changes +++ b/glib-networking.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 5 14:47:33 UTC 2019 - Vítězslav Čížek + +- Handle new GnuTLS error GNUTLS_E_CERTIFICATE_REQUIRED + + https://gitlab.gnome.org/GNOME/glib-networking/issues/70 + + add 0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch + ------------------------------------------------------------------- Tue Apr 2 05:52:06 UTC 2019 - Bjørn Lie diff --git a/glib-networking.spec b/glib-networking.spec index f10314e..4293359 100644 --- a/glib-networking.spec +++ b/glib-networking.spec @@ -26,6 +26,7 @@ Group: Development/Libraries/C and C++ URL: https://www.gnome.org Source0: https://download.gnome.org/sources/glib-networking/2.60/%{name}-%{version}.tar.xz Source99: baselibs.conf +Patch: 0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch BuildRequires: ca-certificates-mozilla # For directory ownership @@ -56,6 +57,7 @@ Currently, there is only a proxy module based on libproxy. %prep %setup -q +%patch -p1 translation-update-upstream %build