From patchwork Sat May 7 08:37:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 39134 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 D339127BBEA; Sat, 7 May 2022 09:38:59 +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 9D71627BBE9 for ; Sat, 7 May 2022 09:38:59 +0100 (BST) Received: from localhost ([::1]:47504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFxq-0002uF-BJ for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:38:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFwz-00025K-DB for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56500) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFwz-0002kM-4O for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnFwx-0003qE-23 for guix-patches@gnu.org; Sat, 07 May 2022 04:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 05/10] gnu: curl: 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:03 +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.165191266814671 (code B ref 55297); Sat, 07 May 2022 08:38:03 +0000 Received: (at 55297) by debbugs.gnu.org; 7 May 2022 08:37:48 +0000 Received: from localhost ([127.0.0.1]:50381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwh-0003oJ-9m for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:47 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nT-0z for 55297@debbugs.gnu.org; Sat, 07 May 2022 04:37:45 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id Tkdi270084UW6Th06kdjWa; Sat, 07 May 2022 10:37:43 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:35 +0000 Message-Id: <20220507083740.59995-5-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=1651912663; bh=CvmTHBAfpH+6nDDgTXEhHUO6biNgASNogeyIjgTUcNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gr/ftjY5hCkCGd9LwSpfseahr4XKyDpPh0ypPSHVMGgO0BD0GENCatBrBQOPadDRG bO4TnNDCii0bddJsgRhS7ctw18stqwPsuyGgKoDxvizimVRQnUVj80B/G/c0ohS6sW olak7HNo6bBFFdYb/RdEgdgQWPy2nJdAnp4GmefFoGstV3SvaiAAZIE2ezDcRdiD+l LAF0B4TM1xxSIg8+Yqn4ck6k9k4Cn90UUyQ+/EBlmgIlRHNIUM+W9rnBG0KdUGG62t lIYdoE5go+0oM+PZxsni0hRQ81sBS/6et2lZCRVonSs6S2jYK60TJwKHhQ2+byKaAb roIUYbFFKLryA== 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/curl.scm (curl)[native-search-paths]: Use the $SSL_CERT_DIR/$SSL_CERT_FILE from (guix search-paths) instead of a local copy. --- gnu/packages/curl.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index a83ecbaa09..7fa0261147 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -41,6 +41,7 @@ (define-module (gnu packages curl) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -82,15 +83,8 @@ (define-public curl ("python" ,python-minimal-wrapper))) (native-search-paths ;; These variables are introduced by curl-use-ssl-cert-env.patch. - (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 ;; Note: This search path is respected by the `curl` command-line ;; tool only. Patching libcurl to read it too would bring no ;; advantages and require maintaining a more complex patch.