From 8d972eca2d730652270e93473c116f52f50865886bdea5511f8429f6ebd0d136 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sat, 4 May 2019 07:57:31 +0000
Subject: [PATCH] Accepting request 700465 from GNOME:Next

New stable rel

OBS-URL: https://build.opensuse.org/request/show/700465
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib-networking?expand=0&rev=132
---
 ...le-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch | 34 -------------------
 glib-networking-2.60.1.tar.xz                 |  3 --
 glib-networking-2.60.2.tar.xz                 |  3 ++
 glib-networking.changes                       |  9 +++++
 glib-networking.spec                          |  6 ++--
 5 files changed, 14 insertions(+), 41 deletions(-)
 delete mode 100644 0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch
 delete mode 100644 glib-networking-2.60.1.tar.xz
 create mode 100644 glib-networking-2.60.2.tar.xz

diff --git a/0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch b/0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch
deleted file mode 100644
index 6deeb4b..0000000
--- a/0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-
diff --git a/glib-networking-2.60.1.tar.xz b/glib-networking-2.60.1.tar.xz
deleted file mode 100644
index 563facf..0000000
--- a/glib-networking-2.60.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d71c6b2faa5ac29100314f08a1be020a2afd0291f025614c0af0d17b14435d92
-size 184828
diff --git a/glib-networking-2.60.2.tar.xz b/glib-networking-2.60.2.tar.xz
new file mode 100644
index 0000000..8dd30dd
--- /dev/null
+++ b/glib-networking-2.60.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c022f3d10f55a5b7c31676fb001b4cb6401db8ab9f6e8418c69de00d0f268732
+size 184808
diff --git a/glib-networking.changes b/glib-networking.changes
index c6bb0b3..18e3a1f 100644
--- a/glib-networking.changes
+++ b/glib-networking.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri May  3 17:15:49 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 2.60.2:
+  + OpenSSL backend now defaults to system trust store.
+  + Fix client auth failure error with GnuTLS 3.6.7.
+- Drop 0001-gnutls-Handle-new-GNUTLS_E_CERTIFICATE_REQUIRED.patch:
+  fixed upstream.
+
 -------------------------------------------------------------------
 Fri Apr  5 14:47:33 UTC 2019 - Vítězslav Čížek <vcizek@suse.com>
 
diff --git a/glib-networking.spec b/glib-networking.spec
index 4293359..fe53038 100644
--- a/glib-networking.spec
+++ b/glib-networking.spec
@@ -18,7 +18,7 @@
 
 %define gio_real_package %(rpm -q --qf '%%{name}' --whatprovides gio)
 Name:           glib-networking
-Version:        2.60.1
+Version:        2.60.2
 Release:        0
 Summary:        Network-related GIO modules for glib
 License:        LGPL-2.1-or-later
@@ -26,7 +26,6 @@ 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,8 +55,7 @@ Currently, there is only a proxy module based on libproxy.
 %lang_package
 
 %prep
-%setup -q
-%patch -p1
+%autosetup -p1
 translation-update-upstream
 
 %build