03/03: gnu: openssl: Make search paths single-entry.

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 5d7a47cc30c57aca5c11a21eebbb959d98e372a4
Author: Marius Bakke <address@hidden>
Date:   Thu Nov 2 22:30:10 2017 +0100

    gnu: openssl: Make search paths single-entry.
    
    * gnu/packages/tls.scm (openssl)[native-search-paths]: Add (separator #f) on
    SSL_CERT_DIR and SSL_CERT_FILE; set SSL_CERT_FILE to (file-type 'regular).
---
 gnu/packages/tls.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 98ea872..60fb14c 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -366,15 +366,14 @@ required structures.")
                                                      ,version "/misc"))
              #t))))))
    (native-search-paths
-    ;; FIXME: These two variables must designate a single file or directory
-    ;; and are not actually "search paths."  In practice it works OK in user
-    ;; profiles because there's always just one item that matches the
-    ;; specification.
     (list (search-path-specification
            (variable "SSL_CERT_DIR")
+           (separator #f)                        ;single entry
            (files '("etc/ssl/certs")))
           (search-path-specification
            (variable "SSL_CERT_FILE")
+           (file-type 'regular)
+           (separator #f)                        ;single entry
            (files '("etc/ssl/certs/ca-certificates.crt")))))
    (synopsis "SSL/TLS implementation")
    (description