pool/glib-networking
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 182875 from home:dimstar:branches:GNOME:Factory

Browse Source 
Allow to running without certs.pem defined

OBS-URL: https://build.opensuse.org/request/show/182875
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib-networking?expand=0&rev=71
This commit is contained in:
Dominique Leuenberger 2013-07-19 10:18:57 +00:00 committed by Git OBS Bridge
parent 8785e10686
commit a3020deaf6
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
glib-networking-fix-no-cert-bundles.patch Normal file
View File

@ -0,0 +1,30 @@
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);

11
glib-networking.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Jul 11 21:11:29 UTC 2013 - dimstar@opensuse.org
- Build using system pkcs#11 certificate store instead of using
/etc/ssl/certs.pem:
+ Pass the following parameters to configure
--with-pkcs
--without-ca-certificate
+ Add glib-networking-fix-no-cert-bundles.patch: do not fail if
no certificate bundle (anchor) is specified.
-------------------------------------------------------------------
Tue Jul 9 16:18:44 UTC 2013 - dimstar@opensuse.org

6
glib-networking.spec
View File

@ -24,6 +24,8 @@ 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
@ -50,12 +52,14 @@ 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-ca-certificates=/etc/ssl/ca-bundle.pem
--with-pkcs \
--without-ca-certificates
%__make %{?_smp_mflags} V=1
%install