* [bug#48985] [PATCH] gnu: libressl: Remove search paths.
@ 2021-06-12 21:24 Brice Waegeneire
2021-06-16 20:57 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Brice Waegeneire @ 2021-06-12 21:24 UTC (permalink / raw)
To: 48985
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.
---
gnu/packages/ntp.scm | 13 ++++++++-----
gnu/packages/tls.scm | 29 ++++++++++++++---------------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index b86def1929..edfcdf4dec 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -187,11 +188,13 @@ computers over a network.")
"0ijsylc7a4jlpxsqa0jq1w1c7333id8pcakzl7a5749ria1xp0l5"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags `( "--with-privsep-user=ntpd"
- "--localstatedir=/var"
- ,(string-append "--with-cacert="
- (assoc-ref %build-inputs "libressl")
- "/etc/ssl/cert.pem"))
+ `(#:configure-flags (list "--with-privsep-user=ntpd"
+ "--localstatedir=/var"
+ (string-append "--with-cacert="
+ (assoc-ref %build-inputs "libressl")
+ "/share/libressl-"
+ ,(package-version libressl)
+ "/cert.pem"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'modify-install-locations
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 6a47b4a26e..28fe820aa3 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -612,21 +613,19 @@ required structures.")
"0rihprcgxsydsbcqgd1952k2cfn4jmp7rlyp1c6sglfc6rdmcwd4"))))
(build-system gnu-build-system)
(arguments
- ;; Do as if 'getentropy' were missing: Linux kernels before 3.17 lack its
- ;; underlying 'getrandom' system call and ENOSYS isn't properly handled.
- ;; See <https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00235.html>.
- '(#:configure-flags '("ac_cv_func_getentropy=no"
- ;; Provide a TLS-enabled netcat.
- "--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")))))
+ `(#:configure-flags
+ (list
+ ;; Do as if 'getentropy' were missing: Linux kernels before 3.17 lack its
+ ;; underlying 'getrandom' system call and ENOSYS isn't properly handled.
+ ;; See <https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00235.html>.
+ "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.
+ "--enable-nc")))
(home-page "https://www.libressl.org/")
(synopsis "SSL/TLS implementation")
(description "LibreSSL is a version of the TLS/crypto stack, forked from
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#48985] [PATCH] gnu: libressl: Remove search paths.
2021-06-12 21:24 [bug#48985] [PATCH] gnu: libressl: Remove search paths Brice Waegeneire
@ 2021-06-16 20:57 ` Ludovic Courtès
2021-06-17 6:49 ` Brice Waegeneire
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2021-06-16 20:57 UTC (permalink / raw)
To: Brice Waegeneire; +Cc: 48985
Brice Waegeneire <brice@waegenei.re> skribis:
> 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.
[...]
> - ,(string-append "--with-cacert="
> - (assoc-ref %build-inputs "libressl")
> - "/etc/ssl/cert.pem"))
> + `(#:configure-flags (list "--with-privsep-user=ntpd"
> + "--localstatedir=/var"
> + (string-append "--with-cacert="
> + (assoc-ref %build-inputs "libressl")
> + "/share/libressl-"
> + ,(package-version libressl)
> + "/cert.pem"))
So the etc/ssl/cert.pm file name was wrong for a while?
Note: instead of (package-version libressl), we should look at the
libressl input of ‘this-package’, though it’s probably not big deal
here.
Otherwise LGTM, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [bug#48985] [PATCH] gnu: libressl: Remove search paths.
2021-06-16 20:57 ` Ludovic Courtès
@ 2021-06-17 6:49 ` Brice Waegeneire
0 siblings, 0 replies; 3+ messages in thread
From: Brice Waegeneire @ 2021-06-17 6:49 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 48985
Ludovic Courtès <ludo@gnu.org> writes:
> Brice Waegeneire <brice@waegenei.re> skribis:
>> - ,(string-append "--with-cacert="
>> - (assoc-ref %build-inputs "libressl")
>> - "/etc/ssl/cert.pem"))
>> + `(#:configure-flags (list "--with-privsep-user=ntpd"
>> + "--localstatedir=/var"
>> + (string-append "--with-cacert="
>> + (assoc-ref %build-inputs "libressl")
>> + "/share/libressl-"
>> + ,(package-version libressl)
>> + "/cert.pem"))
>
> So the etc/ssl/cert.pm file name was wrong for a while?
No, the file existed and was used properly. I forgot to mention
explicitly that libressl used to put it's SSL configuration in etc/ssl,
I moved it to share/libressl-$version/ as does openssl.
> Note: instead of (package-version libressl), we should look at the
> libressl input of ‘this-package’, though it’s probably not big deal
> here.
I tired to correct it, missed. But I have fixed it in the second commit.
:/
> Otherwise LGTM, thanks!
Pushed as 76a9bad380111493b5a1422485f941de799c6c90 and
d65bd74411ab4820318311062b0f327b139a5784.
Cheers,
- Brice
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-17 6:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-12 21:24 [bug#48985] [PATCH] gnu: libressl: Remove search paths Brice Waegeneire
2021-06-16 20:57 ` Ludovic Courtès
2021-06-17 6:49 ` Brice Waegeneire
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).