From patchwork Sat Jun 12 21:24:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 30200 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8A37127BC78; Sat, 12 Jun 2021 22:25:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66D7427BC84 for ; Sat, 12 Jun 2021 22:25:13 +0100 (BST) Received: from localhost ([::1]:57252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsB7w-0005L1-Fa for patchwork@mira.cbaines.net; Sat, 12 Jun 2021 17:25:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsB7n-0005I5-Ob for guix-patches@gnu.org; Sat, 12 Jun 2021 17:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsB7n-0002N2-HB for guix-patches@gnu.org; Sat, 12 Jun 2021 17:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsB7n-0008RN-F0 for guix-patches@gnu.org; Sat, 12 Jun 2021 17:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48985] [PATCH] gnu: libressl: Remove search paths. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Jun 2021 21:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48985 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48985@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162353308132350 (code B ref -1); Sat, 12 Jun 2021 21:25:03 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jun 2021 21:24:41 +0000 Received: from localhost ([127.0.0.1]:42237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsB7N-0008Pb-Aq for submit@debbugs.gnu.org; Sat, 12 Jun 2021 17:24:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:44662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsB7L-0008PT-IM for submit@debbugs.gnu.org; Sat, 12 Jun 2021 17:24:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsB7L-0005Fy-Bl for guix-patches@gnu.org; Sat, 12 Jun 2021 17:24:35 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:59253) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsB7J-00023X-DC for guix-patches@gnu.org; Sat, 12 Jun 2021 17:24:35 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 0156E240002 for ; Sat, 12 Jun 2021 21:24:30 +0000 (UTC) From: Brice Waegeneire Date: Sat, 12 Jun 2021 23:24:30 +0200 Message-Id: <20210612212430.13332-1-brice@waegenei.re> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.178.230; envelope-from=brice@waegenei.re; helo=relay10.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2021 Marius Bakke +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; 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 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Solene Rapenne +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; 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 . - '(#: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 . + "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