gnu: libressl: Remove search paths.
Unlike OpenSSL, LibreSSL hardcode it's certificate bundle and doesn't allow to specify it through a environment variable. * gnu/packages/tls.scm (libressl)[configure-flags]: Specify OpenSSL configuration directory. [native-search-paths]: Remove it. * gnu/packages/ntp.scm (openntpd)[configure-flags]: Adjust CAcert location.master
parent
db87a223fe
commit
76a9bad380
|
@ -7,6 +7,7 @@
|
||||||
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
|
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
|
||||||
|
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -187,11 +188,14 @@ computers over a network.")
|
||||||
"0ijsylc7a4jlpxsqa0jq1w1c7333id8pcakzl7a5749ria1xp0l5"))))
|
"0ijsylc7a4jlpxsqa0jq1w1c7333id8pcakzl7a5749ria1xp0l5"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:configure-flags `( "--with-privsep-user=ntpd"
|
`(#:configure-flags
|
||||||
|
(let* ((libressl (assoc-ref %build-inputs "libressl"))
|
||||||
|
(libressl-version ,(package-version libressl)))
|
||||||
|
(list "--with-privsep-user=ntpd"
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
,(string-append "--with-cacert="
|
(string-append "--with-cacert=" libressl
|
||||||
(assoc-ref %build-inputs "libressl")
|
"/share/libressl-" libressl-version
|
||||||
"/etc/ssl/cert.pem"))
|
"/cert.pem")))
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'modify-install-locations
|
(add-after 'unpack 'modify-install-locations
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||||
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
|
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
|
||||||
|
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -612,21 +613,19 @@ required structures.")
|
||||||
"0rihprcgxsydsbcqgd1952k2cfn4jmp7rlyp1c6sglfc6rdmcwd4"))))
|
"0rihprcgxsydsbcqgd1952k2cfn4jmp7rlyp1c6sglfc6rdmcwd4"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
|
`(#:configure-flags
|
||||||
|
(list
|
||||||
;; Do as if 'getentropy' were missing: Linux kernels before 3.17 lack its
|
;; Do as if 'getentropy' were missing: Linux kernels before 3.17 lack its
|
||||||
;; underlying 'getrandom' system call and ENOSYS isn't properly handled.
|
;; underlying 'getrandom' system call and ENOSYS isn't properly handled.
|
||||||
;; See <https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00235.html>.
|
;; See <https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00235.html>.
|
||||||
'(#:configure-flags '("ac_cv_func_getentropy=no"
|
"ac_cv_func_getentropy=no"
|
||||||
|
;; FIXME It's using it's own bundled certificate, instead it should
|
||||||
|
;; behave like OpenSSL by using environment variables.
|
||||||
|
(string-append "--with-openssldir=" %output
|
||||||
|
"/share/libressl-"
|
||||||
|
,(package-version this-package))
|
||||||
;; Provide a TLS-enabled netcat.
|
;; Provide a TLS-enabled netcat.
|
||||||
"--enable-nc")))
|
"--enable-nc")))
|
||||||
(native-search-paths
|
|
||||||
(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/")
|
(home-page "https://www.libressl.org/")
|
||||||
(synopsis "SSL/TLS implementation")
|
(synopsis "SSL/TLS implementation")
|
||||||
(description "LibreSSL is a version of the TLS/crypto stack, forked from
|
(description "LibreSSL is a version of the TLS/crypto stack, forked from
|
||||||
|
|
Reference in New Issue