From 32bf2619b10033b8930a8e6af78a780eb213c349b85dd2ea6c5578943ee26b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Sun, 1 Sep 2013 09:30:11 +0000
Subject: [PATCH] Accepting request 196633 from
 home:dimstar:branches:GNOME:Factory

Revert this - Ludwig re-introduced the cert bundle

OBS-URL: https://build.opensuse.org/request/show/196633
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib-networking?expand=0&rev=75
---
 glib-networking-fix-no-cert-bundles.patch | 30 -----------------------
 glib-networking.changes                   | 10 ++++++++
 glib-networking.spec                      |  6 +----
 3 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 glib-networking-fix-no-cert-bundles.patch

diff --git a/glib-networking-fix-no-cert-bundles.patch b/glib-networking-fix-no-cert-bundles.patch
deleted file mode 100644
index 6e7f8bc..0000000
--- a/glib-networking-fix-no-cert-bundles.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: glib-networking-2.37.4/tls/gnutls/gtlsbackend-gnutls.c
-===================================================================
---- glib-networking-2.37.4.orig/tls/gnutls/gtlsbackend-gnutls.c
-+++ glib-networking-2.37.4/tls/gnutls/gtlsbackend-gnutls.c
-@@ -103,8 +103,10 @@ g_tls_backend_gnutls_real_create_databas
-   const gchar *anchor_file = NULL;
- #ifdef GTLS_SYSTEM_CA_FILE
-   anchor_file = GTLS_SYSTEM_CA_FILE;
--#endif
-   return g_tls_file_database_new (anchor_file, error);
-+#else
-+  return NULL;
-+#endif
- }
- 
- static void
-@@ -144,11 +146,13 @@ g_tls_backend_gnutls_get_default_databas
-                      error->message);
-           g_clear_error (&error);
-         }
-+#ifdef GTLS_SYSTEM_CA_FILE
-       else
-         {
-           g_assert (result);
-           self->priv->default_database = g_object_ref (result);
-         }
-+#endif
-     }
- 
-   g_mutex_unlock (&self->priv->mutex);
diff --git a/glib-networking.changes b/glib-networking.changes
index da1c74f..37f87d6 100644
--- a/glib-networking.changes
+++ b/glib-networking.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Aug 28 09:12:27 UTC 2013 - dimstar@opensuse.org
+
+- Revert the changes from Jul 11 to not use certs.pem:
+  + No longer pass --with-pkcs and --without-ca-certificate to
+    configure, but instead pass
+    --with-ca-certificates=/etc/ssl/ca-bundle.pem.
+  + Drop glib-networking-fix-no-cert-bundles.patch: the patch
+    causes side-effects, as discovered in bnc#825903).
+
 -------------------------------------------------------------------
 Tue Jul 30 07:06:44 UTC 2013 - dimstar@opensuse.org
 
diff --git a/glib-networking.spec b/glib-networking.spec
index 7f8a989..6abb87a 100644
--- a/glib-networking.spec
+++ b/glib-networking.spec
@@ -24,8 +24,6 @@ License:        LGPL-2.1+
 Group:          System/Libraries
 Source:         http://download.gnome.org/sources/glib-networking/2.37/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM glib-networking-fix-no-cert-bundles.patch bgo#704058 bnc#825903 dimstar@opensuse.org -- Allow to fully operate without gnutls anchors, passing the responsibility to gnutls.
-Patch0:         glib-networking-fix-no-cert-bundles.patch
 # For directory ownership
 BuildRequires:  dbus-1
 BuildRequires:  intltool
@@ -52,14 +50,12 @@ Currently, there is only a proxy module based on libproxy.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
 translation-update-upstream
 
 %build
 %configure \
     --disable-static \
-    --with-pkcs \
-    --without-ca-certificates
+    --with-ca-certificates=/etc/ssl/ca-bundle.pem
 %__make %{?_smp_mflags} V=1
 
 %install