From b010e41346d418220582c20ab8d7f3971e4fb78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Fri, 14 Aug 2015 17:28:36 +0800
Subject: [PATCH] gnutls: Allow overriding the anchor file location by
 'SSL_CERT_FILE'

---
 tls/gnutls/gtlsbackend-gnutls.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tls/gnutls/gtlsbackend-gnutls.c b/tls/gnutls/gtlsbackend-gnutls.c
index 55ec1a5..217d3c8 100644
--- a/tls/gnutls/gtlsbackend-gnutls.c
+++ b/tls/gnutls/gtlsbackend-gnutls.c
@@ -101,8 +101,10 @@ g_tls_backend_gnutls_real_create_database (GTlsBackendGnutls  *self,
                                            GError            **error)
 {
   const gchar *anchor_file = NULL;
+  anchor_file = g_getenv ("SSL_CERT_FILE");
 #ifdef GTLS_SYSTEM_CA_FILE
-  anchor_file = GTLS_SYSTEM_CA_FILE;
+  if (!anchor_file)
+    anchor_file = GTLS_SYSTEM_CA_FILE;
 #endif
   return g_tls_file_database_new (anchor_file, error);
 }
-- 
2.4.3

bs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=d5e78827c3dd224689c8b7ea986fbf3130be9ab6'>refs</a><a class='active' href='/guix/log/tests/discovery.scm'>log</a><a href='/guix/tree/tests/discovery.scm?id=d5e78827c3dd224689c8b7ea986fbf3130be9ab6'>tree</a><a href='/guix/commit/tests/discovery.scm?id=d5e78827c3dd224689c8b7ea986fbf3130be9ab6'>commit</a><a href='/guix/diff/tests/discovery.scm?id=d5e78827c3dd224689c8b7ea986fbf3130be9ab6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/discovery.scm'>
<input type='hidden' name='id' value='d5e78827c3dd224689c8b7ea986fbf3130be9ab6'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d5e78827c3dd224689c8b7ea986fbf3130be9ab6'>root</a>/<a href='/guix/log/tests?id=d5e78827c3dd224689c8b7ea986fbf3130be9ab6'>tests</a>/<a href='/guix/log/tests/discovery.scm?id=d5e78827c3dd224689c8b7ea986fbf3130be9ab6'>discovery.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/discovery.scm?id=d5e78827c3dd224689c8b7ea986fbf3130be9ab6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-07-03 23:51:23 +0200'>2017-07-03</span></td><td><a href='/guix/commit/tests/discovery.scm?id=960c6ce96d746cf19829ad26e092ec5dad2a5c62'>discovery: Recurse into directories pointed to by a symlink.</a><span class='msg-avail'>...<span class='msg-tooltip'>Reported by Christopher Baines &lt;mail@cbaines.net&gt;
and Alex Kost &lt;alezost@gmail.com&gt;
at &lt;https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00290.html&gt;.

* guix/discovery.scm (scheme-files): When ENTRY is a symlink that
doesn't end in '.scm', call 'stat' and recurse if it points to a
directory.
* tests/discovery.scm ("scheme-modules recurses in symlinks to
directories"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-06-18 00:14:07 +0200'>2017-06-18</span></td><td><a href='/guix/commit/tests/discovery.scm?id=d46c4423f46278bd2f96770ceb0667431414349e'>discovery: 'scheme-files' returns '() for a non-accessible directory.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes a regression introduced in
d27cc3bfaafe6b5b0831e88afb1c46311d382a0b.

Reported by Ricardo Wurmus &lt;rekado@elephly.net&gt;.

* guix/discovery.scm (scheme-files): Catch 'scandir*' system errors.
Return '() and optionally raise a warning upon 'system-error'.
* tests/discovery.scm ("scheme-modules, non-existent directory"): New
test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-03 23:50:15 +0200'>2017-05-03</span></td><td><a href='/guix/commit/tests/discovery.scm?id=cd903ef7871170d3c4eced45418459d293ef48a7'>Add (guix discovery).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/discovery.scm, tests/discovery.scm: New files.
* gnu/packages.scm (scheme-files, file-name-&gt;module-name)
(scheme-modules, all-package-modules): Remove.
(fold-packages): Rewrite in terms of 'fold-module-public-variables'.
* gnu/tests.scm: Use (guix discovery).
* Makefile.am (MODULES): Add guix/discovery.scm.
(SCM_TESTS): Add tests/discovery.scm.
</span></span></td><td>Ludovic Courtès</td></tr>