From af6100f51bf79efef0f79f90245790c410545513 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 11:26:22 +0800
Subject: [PATCH] gnu: glib-networking: Use
'/etc/ssl/certs/ca-certificates.crt' as TLS CA file.
* gnu/packages/gnome.scm (glib-networking)[arguments]: Pass
'--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt' to configure.
Add 'disable-failing-tls-tests' phase.
---
gnu/packages/gnome.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e510eb55ac9..fba5eeb77e2 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1876,8 +1876,7 @@ (define-public glib-networking
(build-system gnu-build-system)
(arguments
`(#:configure-flags
- ;; FIXME: ca-certificates.crt is not available in the build environment.
- '("--with-ca-certificates=no")
+ '("--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-giomoduledir
@@ -1886,7 +1885,16 @@ (define-public glib-networking
(substitute* "configure"
(("GIO_MODULE_DIR=.*")
(string-append "GIO_MODULE_DIR=" %output
- "/lib/gio/modules\n"))))))))
+ "/lib/gio/modules\n")))))
+ (add-before 'check 'disable-failing-tls-tests
+ ;; The tests 'file-database' and 'connection' fail due to
+ ;; missing ca-certificates.crt in the build environment.
+ (lambda _
+ (substitute* "tls/tests/Makefile"
+ (("TESTS = \\$\\(am__EXEEXT_3\\)")
+ (string-append
+ "TESTS = certificate$(EXEEXT) "
+ "$(am__EXEEXT_1) $(am__EXEEXT_2)"))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("intltool" ,intltool)))
--
GitLab