From patchwork Sat May 7 08:37:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 39131 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 56B8827BBEA; Sat, 7 May 2022 09:38:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 21BE427BBE9 for ; Sat, 7 May 2022 09:38:31 +0100 (BST) Received: from localhost ([::1]:46948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFxO-0002XO-7l for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:38:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFwy-00024u-UI for guix-patches@gnu.org; Sat, 07 May 2022 04:38:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56503) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFwy-0002kX-L5 for guix-patches@gnu.org; Sat, 07 May 2022 04:38:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnFwy-0003qh-JH for guix-patches@gnu.org; Sat, 07 May 2022 04:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 02/10] gnu: openssl: Use $SSL_CERT_DIR/$SSL_CERT_FILE. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 May 2022 08:38:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55297 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55297@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 55297-submit@debbugs.gnu.org id=B55297.165191267314716 (code B ref 55297); Sat, 07 May 2022 08:38:04 +0000 Received: (at 55297) by debbugs.gnu.org; 7 May 2022 08:37:53 +0000 Received: from localhost ([127.0.0.1]:50389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwm-0003pC-Sm for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:53 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nQ-12 for 55297@debbugs.gnu.org; Sat, 07 May 2022 04:37:47 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id Tkdi270084UW6Th06kdiWR; Sat, 07 May 2022 10:37:42 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:32 +0000 Message-Id: <20220507083740.59995-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507083740.59995-1-maximedevos@telenet.be> References: <20220507083740.59995-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1651912662; bh=O5dxz+av6/yTNmhikuuzbTDjLHHBevKCLaI+IWBMRT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gAQ6QcHnTYlGfSCbn7U+uDSUQkxvJIkPP1OuaYtl9MTiPnWf3moyfJ+EsRU5D18E5 HD8NE6YategtZyYrQmXuMPnilx1RXYetmXBHt+RoZoAhERHyONe9ax8f5MJBniXWBR qkRC51MA5YzAqzFMGPM8iIHdR/ntWJIPYs+HNw/3m/2nLWdwBEWOehOwl1sSatubOG SveULInHW9DmlUUCs/5JMbC+IUKel8frmbsyWiScSwhMbPyEeM8Go2xBihi3B2wvlH osZ8i1N2w1kxha+PdeA/eXyDLX/72QUH1VsiEq+yQ7STOm1Zf7CJpejGMgxdEZntTB 9mEWeocZ5wbug== 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 * gnu/packages/tls.scm (openssl)[native-search-paths]: Use the $SSL_CERT_DIR/$SSL_CERT_FILE from (guix search-paths) instead of a local copy. --- gnu/packages/tls.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index cadc9a1518..38643d6284 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -50,6 +50,7 @@ (define-module (gnu packages tls) #:use-module (guix build-system python) #:use-module (guix build-system cmake) #:use-module (guix build-system trivial) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages compression) #:use-module (gnu packages) #:use-module (gnu packages autotools) @@ -494,15 +495,7 @@ (define-public openssl #$(package-version this-package) "/misc"))))))) (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") - (file-type 'regular) - (separator #f) ;single entry - (files '("etc/ssl/certs/ca-certificates.crt"))))) + (list $SSL_CERT_DIR $SSL_CERT_FILE)) (synopsis "SSL/TLS implementation") (description "OpenSSL is an implementation of SSL/TLS.")