summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-11-02 22:30:10 +0100
committerMarius Bakke <mbakke@fastmail.com>2017-11-02 22:30:10 +0100
commit5d7a47cc30c57aca5c11a21eebbb959d98e372a4 (patch)
tree83f9b54d2f2425a8ebcf4904f3cf2b1bc0c979e1
parentbdf0b6fcfff004bba0abf9584b870b53fa13f005 (diff)
downloadguix-5d7a47cc30c57aca5c11a21eebbb959d98e372a4.tar.gz
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).
-rw-r--r--gnu/packages/tls.scm7
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 98ea8729d4..60fb14c9ae 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