Accepting request 692200 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/692200
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib-networking?expand=0&rev=61

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 <mcatanzaro@igalia.com>
+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
+

glib-networking-2.60.0.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:674e8b062c0639c274848d40b8308f8fb2ecd8b82e7eb6fe805d1aca7deb983c
-size 184368

glib-networking-2.60.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d71c6b2faa5ac29100314f08a1be020a2afd0291f025614c0af0d17b14435d92
+size 184828

glib-networking.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Apr  5 14:47:33 UTC 2019 - Vítězslav Čížek <vcizek@suse.com>
+
+- 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 <bjorn.lie@gmail.com>
+
+- Update to version 2.60.1:
+  + Improve reliability of client auth failure tests.
+  + Fix excessive CPU usage after sync handshake.
+
 -------------------------------------------------------------------
 Tue Mar 12 21:17:50 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 

glib-networking.spec

@@ -18,7 +18,7 @@
 
 %define gio_real_package %(rpm -q --qf '%%{name}' --whatprovides gio)
 Name:           glib-networking
-Version:        2.60.0.1
+Version:        2.60.1
 Release:        0
 Summary:        Network-related GIO modules for glib
 License:        LGPL-2.1-or-later
@@ -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