guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

164/182: gnu: LibreSSL: Make search paths single-entry.


From: guix-commits
Subject: 164/182: gnu: LibreSSL: Make search paths single-entry.
Date: Fri, 15 Nov 2019 00:02:03 -0500 (EST)

kkebreau pushed a commit to branch wip-gnome-updates
in repository guix.

commit 0e74b6af49e3df48677457c127e824d84fae9b0c
Author: Marius Bakke <address@hidden>
Date:   Sun Nov 10 01:54:58 2019 +0100

    gnu: LibreSSL: Make search paths single-entry.
    
    Fixes <https://bugs.gnu.org/36817>.
    Reported by Katherine Cox-Buday <address@hidden>.
    
    * gnu/packages/tls.scm (libressl)[native-search-paths]: Add SEPARATOR #F in
    search path specifications.
---
 gnu/packages/tls.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 02609fd..dd8f0fa 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -515,15 +515,13 @@ required structures.")
                            ;; Provide a TLS-enabled netcat.
                            "--enable-nc")))
     (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")
+            (separator #f)              ;single entry
             (files '("etc/ssl/certs/ca-certificates.crt")))))
     (home-page "https://www.libressl.org/";)
     (synopsis "SSL/TLS implementation")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]