From patchwork Sat May 7 08:37:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 39137 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 501E827BBEA; Sat, 7 May 2022 09:39:30 +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 9C86C27BBE9 for ; Sat, 7 May 2022 09:39:29 +0100 (BST) Received: from localhost ([::1]:48386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFyK-0003Va-EP for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:39:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFx0-00026J-2R for guix-patches@gnu.org; Sat, 07 May 2022 04:38:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56507) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFwz-0002l5-Q0 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 1nnFwz-0003r4-Nr for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 01/10] search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE. References: In-Reply-To: Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 May 2022 08:38:05 +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.165191267414737 (code B ref 55297); Sat, 07 May 2022 08:38:05 +0000 Received: (at 55297) by debbugs.gnu.org; 7 May 2022 08:37:54 +0000 Received: from localhost ([127.0.0.1]:50395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwn-0003pX-Tw for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:54 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nP-0s for 55297@debbugs.gnu.org; Sat, 07 May 2022 04:37:48 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id Tkdi270084UW6Th06kdiWP; Sat, 07 May 2022 10:37:42 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:31 +0000 Message-Id: <20220507083740.59995-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1651912662; bh=WuP+sSvxhpiaToBL8HGKvUhPb08CQidw57KI+bUZIwU=; h=From:To:Cc:Subject:Date; b=nNNz5C86GWvEZ618KHalLRKuZqr5qLqo5K5LY8AqNPwCzTc3WodYJLd/EZw57r98f NV2uCtcE/ytTazD0N1NyTjw2Nwa/o9R2f9P4BQRgChdAsleFUQcqgyfv86pJRUwDHA m3kadV1iZfbNYVhNzsmu7cU+iTcnqOP7/q8mYhz4sQ/wjKRYKKcH+TwLaDEIF2avE1 TcWJKqvJ6jpWiaY8ipIRnb6QPjJFyuOS4f5POtMCvY/QSmCy+8BydBRlmpG1CHtPwo 9JCuhUI7DUo4tkMVpCHNgJw1qdnlXgZPAdPBFVafHi7UfiIPPE7gMD9dvpfXxLLOUl y+50j0ZwxVpzQ== 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 For the ‘why’, see the docstring next to $SSL_CERT_DIR. In later commits, packages will be changed to use these variables and the variables will be added to more packages. * guix/search-paths.scm ($SSL_CERT_DIR, $SSL_CERT_FILE): New variables. * doc/guix.texi (Search Paths): Document them. --- doc/guix.texi | 21 ++++++++++++++++++++- guix/search-paths.scm | 26 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) base-commit: 855097683230b756ba28636bed03ce904b6f3589 prerequisite-patch-id: 8c36bd91ff2f97cee25843119fdb12a71b3947bd prerequisite-patch-id: 3082a0c917de3ca7abf1fc40c2fced691da6d99f prerequisite-patch-id: ae89e00772cf3737e32b3b7bd191bfbeaaf5d0ed prerequisite-patch-id: d74573180a62eaa0b6ac57ef46d08409fb5652a8 prerequisite-patch-id: ccb777079d8182a3e44b29cc061f59496ae16188 prerequisite-patch-id: cbb90155003134235f98b750f5e4de2096c9e414 prerequisite-patch-id: ff8b567c0b58018b9c2085a324ce02711eadc77e prerequisite-patch-id: 6569c696b96227cfb2f056a894d441b99141a571 prerequisite-patch-id: eeb5c4446896b7d5209de79e7b9a2486a9a5dadb prerequisite-patch-id: 226931bbd40f2e7b43df22ea44783293d663e97a prerequisite-patch-id: 7b0f5bf490c804d1ce3f3bb0daf45273ce9bae8a prerequisite-patch-id: 0605551576cb5fbb0215575f8acee2ad91441ec8 prerequisite-patch-id: 851c816dcdc728b085c2cad0f00b140113915af7 prerequisite-patch-id: eca886865831aca6a9803626f60fd37f1f3e1a49 prerequisite-patch-id: 49190c9aa45e582877c7716c59f4f509a4623948 prerequisite-patch-id: f9e4fa15bc34d249aecf318c66cb598762ee5728 prerequisite-patch-id: 69e49a32a11f33c23ccaa1a785c40dfc04068403 prerequisite-patch-id: ec55a066dbaf5790b993edfbead3d27c7817949e prerequisite-patch-id: 44dedf2945b47ffe0a298b7129e7134567327d2d prerequisite-patch-id: 441f8c8acc52886c30a2ca167329cf5117b9d024 prerequisite-patch-id: ad05c828905c092a370a7b267c09c4ec2dbc4850 prerequisite-patch-id: 4683b5d9fe136a4f71cf3f8f6fa99363b80aaa64 prerequisite-patch-id: bd6189df0a2a0122a769ba3f849dcd1f047dea14 prerequisite-patch-id: b723e932d080a91ab5d87a92c154e6ede074fe9c prerequisite-patch-id: cb2dd382af23e9d1d7eb63f55c463ea15ab7fb95 diff --git a/doc/guix.texi b/doc/guix.texi index 7369a306f6..25e2429533 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -88,7 +88,7 @@ Copyright @copyright{} 2020 Daniel Brooks@* Copyright @copyright{} 2020 John Soo@* Copyright @copyright{} 2020 Jonathan Brielmaier@* Copyright @copyright{} 2020 Edgar Vincent@* -Copyright @copyright{} 2021 Maxime Devos@* +Copyright @copyright{} 2021, 2022 Maxime Devos@* Copyright @copyright{} 2021 B. Wilson@* Copyright @copyright{} 2021 Xinglu Chen@* Copyright @copyright{} 2021 Raghav Gururajan@* @@ -9830,6 +9830,25 @@ Again, the libxml2 example shows a situation where this is needed. @end table @end deftp +Some search paths are not tied by a single package but to many packages. +To reduce duplications, some of them are pre-defined in @code{(guix +search-paths)}. + +@defvr {Scheme Variable} $SSL_CERT_DIR +@defvrx {Scheme Variable} $SSL_CERT_FILE +These two search paths indicate where X.509 certificates can be found +(@pxref{X.509 Certificates}). +@end defvr + +These pre-defined search paths can be used as in the following example: + +@lisp +(package + (name "curl") + ;; some fields omitted ... + (native-search-paths (list $SSL_CERT_DIR $SSL_CERT_FILE))) +@end lisp + How do you turn search path specifications on one hand and a bunch of directories on the other hand in a set of environment variable definitions? That's the job of @code{evaluate-search-paths}. diff --git a/guix/search-paths.scm b/guix/search-paths.scm index 002e6342bb..6b13a98946 100644 --- a/guix/search-paths.scm +++ b/guix/search-paths.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2017, 2018 Ludovic Courtès +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,8 @@ (define-module (guix search-paths) search-path-specification-file-pattern $PATH + $SSL_CERT_DIR + $SSL_CERT_FILE search-path-specification->sexp sexp->search-path-specification @@ -70,6 +73,29 @@ (define $PATH (variable "PATH") (files '("bin" "sbin")))) +;; Two variables for certificates (see (guix)X.509 Certificates), +;; respected by 'openssl', possibly GnuTLS in the future +;; (https://gitlab.com/gnutls/gnutls/-/merge_requests/1541) +;; and many of their dependents -- even some GnuTLS depepdents +;; like Guile. As they are not tied to a single package, define +;; them here to avoid duplication. +;; +;; Additionally, the 'native-search-paths' field is not thunked, +;; so doing (package-native-search-paths openssl) +;; could cause import cycle issues. +(define-public $SSL_CERT_DIR + (search-path-specification + (variable "SSL_CERT_DIR") + (separator #f) ;single entry + (files '("etc/ssl/certs")))) + +(define-public $SSL_CERT_FILE + (search-path-specification + (variable "SSL_CERT_FILE") + (file-type 'regular) + (separator #f) ;single entry + (files '("etc/ssl/certs/ca-certificates.crt")))) + (define (search-path-specification->sexp spec) "Return an sexp representing SPEC, a . The sexp corresponds to the arguments expected by `set-path-environment-variable'." 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.") From patchwork Sat May 7 08:37:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 39130 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 4FE9227BBEA; Sat, 7 May 2022 09:38:21 +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 2145127BBE9 for ; Sat, 7 May 2022 09:38:21 +0100 (BST) Received: from localhost ([::1]:46374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFxE-000282-9K for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:38:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFwz-00024y-0C for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFwx-0002kI-Nh for guix-patches@gnu.org; Sat, 07 May 2022 04:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnFww-0003q6-MC for guix-patches@gnu.org; Sat, 07 May 2022 04:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 03/10] gnu: cuirass: Use $SSL_CERT_DIR. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 May 2022 08:38:02 +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.165191266714656 (code B ref 55297); Sat, 07 May 2022 08:38:02 +0000 Received: (at 55297) by debbugs.gnu.org; 7 May 2022 08:37:47 +0000 Received: from localhost ([127.0.0.1]:50379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwg-0003oB-KT for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:47 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nR-0l for 55297@debbugs.gnu.org; Sat, 07 May 2022 04:37:44 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id Tkdi270084UW6Th06kdiWV; Sat, 07 May 2022 10:37:42 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:33 +0000 Message-Id: <20220507083740.59995-3-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=RCvckiZv6U/TDd3is15QIYIAdVK/Mam9eHnhFgFErKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=c4CRhsDBivJczgpDGT7MX77J+tsCSn/K2L0c11rucZMcq1yY/s8iB8w+I9eaTHqGY m8xhWSIzFl5yZCui0BRpuWyBT7uk8X4r7ouPYdH5BMDeahNqMhaG4NnxzVh6AY9ypn P3nf2My7DCTyYi85S/vsxzAbcj6Pur7ggdcuvfxal0bvJrZyHyl0vdD1GclhXuhp3Y CsRZpfRdxReTR6XgonchrHaTV+qkDcdL2s/D9UV5z9MMmjNmKSmMTseDR4hNObDqxk tPqKNSgucfWybmAj2VEwXxHS970W6Seb93tPuzgE6XG70/srkg0GOxQj8Yz+H+nRMx OiTaGwnivEBwA== 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/ci.scm (cuirass)[native-search-paths]: Use the $SSL_CERT_DIR from (guix search-paths) instead of a local copy. --- gnu/packages/ci.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index a2dce71d40..ab421fe870 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -28,6 +28,7 @@ (define-module (gnu packages ci) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix download) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages boost) @@ -52,7 +53,8 @@ (define-module (gnu packages ci) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) (define-public cuirass (let ((commit "9f08035f942a1e78f92e2db886d7837b0ab98b2f") @@ -173,9 +175,7 @@ (define-public cuirass (file-type 'regular) (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))) - (search-path-specification - (variable "SSL_CERT_DIR") - (files '("etc/ssl/certs"))))) + $SSL_CERT_DIR)) (synopsis "Continuous integration system") (description "Cuirass is a continuous integration tool using GNU Guix. It is From patchwork Sat May 7 08:37:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 39135 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 C4FCD27BBEA; Sat, 7 May 2022 09:39:16 +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 8FF5B27BBE9 for ; Sat, 7 May 2022 09:39:16 +0100 (BST) Received: from localhost ([::1]:47878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFy7-00039w-NF for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:39:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFww-00023R-LI for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFww-0002kD-CU for guix-patches@gnu.org; Sat, 07 May 2022 04:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnFww-0003pz-7u for guix-patches@gnu.org; Sat, 07 May 2022 04:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 04/10] gnu: cmake-bootstrap: 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:02 +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.165191266614646 (code B ref 55297); Sat, 07 May 2022 08:38:02 +0000 Received: (at 55297) by debbugs.gnu.org; 7 May 2022 08:37:46 +0000 Received: from localhost ([127.0.0.1]:50377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwg-0003o9-7x for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:46 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nS-0s for 55297@debbugs.gnu.org; Sat, 07 May 2022 04:37:44 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id Tkdi270084UW6Th06kdiWX; Sat, 07 May 2022 10:37:43 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:34 +0000 Message-Id: <20220507083740.59995-4-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=r59z4C4S5og93a9b/FPqoM1NpwD0hbNhzw6O7v1vJuw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XK8qlP8MXW7+JvF70ziDgKwynrm1uRHswqSzPG9ecc3cUss95KJCQg6QdRlTVRmEt a60VUjI8zw/E1CH8WN7KjOAVkMidK5/rdJWq1HMnZ85t11B05HbjVB2T36JphZNjmC bRm6CL9hDDPfMd3Nb2VUFtauY3f1Mr0VAGYvBFVAC+oH71m96a3V84cw0CVEwAF6VD x2IAN8oTA8IAuglOhMTGdZ6DOnMV5jfSKmm8wAWhTFKVtOZbYH7IFUw+OUZ/7yBv2r JTSfanGFKJiX54z85PK2z6JpYrU41+SA94mxJE2AAgpcSma4ZKlJiCVp9RTFBpth9/ FpXBF+Oaywn0Q== 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/cmake.scm (cmake-bootstrap)[native-search-paths]: Use the $SSL_CERT_DIR/$SSL_CERT_FILE from (guix search-paths) instead of a local copy. --- gnu/packages/cmake.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 4207f14310..cf930c57fc 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -38,6 +38,7 @@ (define-module (gnu packages cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages compression) @@ -229,15 +230,8 @@ (define-public cmake-bootstrap (files '(""))) ;; "cmake-curl-certificates.patch" changes CMake to honor 'SSL_CERT_DIR' ;; and 'SSL_CERT_FILE', hence these search path entries. - (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"))))) + $SSL_CERT_DIR + $SSL_CERT_FILE)) (home-page "https://cmake.org/") (synopsis "Cross-platform build system") (description 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. From patchwork Sat May 7 08:37:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 39133 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 78EED27BBEA; Sat, 7 May 2022 09:38:44 +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 45AF727BBE9 for ; Sat, 7 May 2022 09:38:44 +0100 (BST) Received: from localhost ([::1]:47422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFxb-0002qu-DX for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:38:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFwz-00025H-Ad for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFwz-0002kk-1W 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 1nnFwy-0003qp-Vf for guix-patches@gnu.org; Sat, 07 May 2022 04:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 06/10] gnu: guix: Use $SSL_CERT_DIR. 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.165191267314723 (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]:50391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwn-0003pJ-6e for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:53 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nU-0q 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 Tkdi270084UW6Th06kdjWc; Sat, 07 May 2022 10:37:43 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:36 +0000 Message-Id: <20220507083740.59995-6-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=2VIPJ1wePFHySNAttRFsQlmo5eYQcdlX8hp5G0qeMIg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TQ91LuHE/el5eY9dduxXfsJ2OgMQmMe2QQDkVJYIJyZsPol27DYVzDLaA/3ZywyUT mFHXMRYz2f77brUZcSh6qBA2qDrrMCqpgWi7aefHZtsDyL+gGVYNUSddScP78DJXRU g5ez6sE5OfaZSnXJmt7dxt8DA1XvGbVHMzb36NdJ+uUifJEgA2jQazU1BYSuuOyp1z 3jAWe1MdOmfiKRvqbioebSmVPIDRgxWVAeoqSZ0OMbHYNKNPIzYOpie0XsvhniV3jG ugRAEJ0xVwb7MUK7wNoBzNnLzrlG9Yr7DEd5I2Dv3MKHzymk5KTB/m8NoBLYORHWS5 YFy2iP2Wqqf9g== 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/package-management.scm (guix)[native-search-paths]: Use the $SSL_CERT_DIR from (guix search-paths) instead of a local copy. --- gnu/packages/package-management.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9c5db0d608..3a8f620335 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -120,6 +120,7 @@ (define-module (gnu packages package-management) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -472,14 +473,9 @@ (define code (list (search-path-specification (variable "GUIX_EXTENSIONS_PATH") (files '("share/guix/extensions"))) - ;; (guix git) and (guix build download) honor this variable whose ;; name comes from OpenSSL. - (search-path-specification - (variable "SSL_CERT_DIR") - (separator #f) ;single entry - (files '("etc/ssl/certs"))))) - + $SSL_CERT_DIR)) (home-page "https://www.gnu.org/software/guix/") (synopsis "Functional package manager for installed software packages and versions") (description From patchwork Sat May 7 08:37:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 39136 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 DA60527BBEA; Sat, 7 May 2022 09:39:18 +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 A946727BBE9 for ; Sat, 7 May 2022 09:39:18 +0100 (BST) Received: from localhost ([::1]:47954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFy9-0003EJ-Qn for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:39:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFwz-00025m-Mb for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFwz-0002ky-Df 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 1nnFwz-0003qx-BU for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 07/10] gnu: youtube-dl: Add missing $SSL_CERT_DIR/FILE search paths. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 May 2022 08:38:05 +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.165191267414731 (code B ref 55297); Sat, 07 May 2022 08:38:05 +0000 Received: (at 55297) by debbugs.gnu.org; 7 May 2022 08:37:54 +0000 Received: from localhost ([127.0.0.1]:50393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwn-0003pQ-I9 for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:53 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nV-30 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 Tkdi270084UW6Th06kdjWe; Sat, 07 May 2022 10:37:43 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:37 +0000 Message-Id: <20220507083740.59995-7-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=EzeZ362lAIbLg7QiBgAKdXwrjv6b881B5I8Fys08Els=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W5DSzZWKWcTnl3qJUu4aK/7KXxA9aVrL4Q7h+e9b44Qqr2HEtPRGFuIAFq33xfQMj dARiAftlfThEn/qF4TJCF4RrK/OwFNsATLI6TgzZVvu1bvD8nKOFGo1hGRtYlEyCqd 53QEaM552us7YwxOPAA+hA1qlNYSxRFLcLeFK+owefkbEfGrKFc3v2ecuxp5y0IAiZ fjszmSMR48IEpLnHCHeDKKE3meylvZt5+FERv+ZWgQIPNW+1c2joPJQs3WVZDb30zZ OgE8nDHdiv0hzddS2Oons8pJm8ChjQZZ3r+yNHECrQoLCy6c5S11YU+o3NDmUphDG/ 4cuU6uqToB1Rw== 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 youtube-dl respects these variables. * gnu/packages/video.scm (youtube-dl)[native-search-paths]: Add $SSL_CERT_DIR / $SSL_CERT_FILE. --- gnu/packages/video.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4bc50073cd..204fdb7c6f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Bird ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,6 +100,7 @@ (define-module (gnu packages video) #:use-module (guix build-system qt) #:use-module (guix build-system waf) #:use-module (guix build-system trivial) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages assembly) @@ -2441,6 +2443,8 @@ (define-public youtube-dl (list zip)) (inputs (list ffmpeg)) + (native-search-paths + (list $SSL_CERT_DIR $SSL_CERT_FILE)) (synopsis "Download videos from YouTube.com and other sites") (description "Youtube-dl is a small command-line program to download videos from From patchwork Sat May 7 08:37:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 39128 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 2A33527BBEA; Sat, 7 May 2022 09:38:19 +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 F17E427BBE9 for ; Sat, 7 May 2022 09:38:18 +0100 (BST) Received: from localhost ([::1]:46316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFxB-00025N-Nd for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:38:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFwy-00024p-PF for guix-patches@gnu.org; Sat, 07 May 2022 04:38:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFwy-0002kS-GE 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 1nnFwx-0003qK-E4 for guix-patches@gnu.org; Sat, 07 May 2022 04:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 08/10] gnu: youtube-dl-gui: Add search paths of 'youtube-dl'. 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.165191266814683 (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]:50383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwh-0003oa-QP for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:48 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nW-6u 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 Tkdi270084UW6Th06kdjWg; Sat, 07 May 2022 10:37:43 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:38 +0000 Message-Id: <20220507083740.59995-8-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=yY7gg4QvuFIB8wY7gi/8e4F4Gp+NLqGY8TJzplc8pn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=U4hbuVSPVYWdnBmZnjPxcK+58Y6GtDFI5akO45OasZyz6BoRjV7rnKCrW3HVtYjE8 u/qmtL16mY1mmCvnLw+XIWVm76N2qT7JUJbJ/3iqd+LXXV+Jq+oDI5iqKa8bAoN+bO nVcw5lKm4VT3di/Naq8J+rVC+4omHNsPIQwmM28Wm3gOloJqla+p7BOn+C6GF1StHC retMjs5DHxJjKR9fzavhHcscw97EoIy6ZyD+h6M3ObARuH+ZNpgId6smvsHC2QW920 Jfj0/7um/IW3ENfKq/LZOcTxmNDnGB8A8BuizFSChVcOZ+IL+3Saih80t5jPGag0lD QrQO5GeljWuMw== 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 'youtube-dl-gui' uses 'youtube-dl' so presumably it needs the same search paths. * gnu/packages/video.scm (youtube-dl-gui)[native-search-paths]: Add the search paths of 'youtube-dl'. --- gnu/packages/video.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 204fdb7c6f..1a1ab31653 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2610,6 +2610,7 @@ (define-public youtube-dl-gui (list gettext-minimal)) (inputs (list python2-twodict python2-wxpython youtube-dl)) + (native-search-paths (package-native-search-paths youtube-dl)) (home-page "https://github.com/MrS0m30n3/youtube-dl-gui") (synopsis "GUI (Graphical User Interface) for @command{youtube-dl}") From patchwork Sat May 7 08:37:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 39132 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 C111F27BBEA; Sat, 7 May 2022 09:38:33 +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 9805527BBE9 for ; Sat, 7 May 2022 09:38:33 +0100 (BST) Received: from localhost ([::1]:47050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFxQ-0002bK-Lr for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:38:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFwz-000258-6F for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFwy-0002ke-Sx 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 1nnFwx-0003qR-Qt for guix-patches@gnu.org; Sat, 07 May 2022 04:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 09/10] gnu: youtube-viewer: Add search paths of 'youtube-dl'. 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.165191266814692 (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]:50385 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwi-0003om-6u for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:48 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nX-Ai 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 Tkdi270084UW6Th06kdjWl; Sat, 07 May 2022 10:37:43 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:39 +0000 Message-Id: <20220507083740.59995-9-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=ZVZuGK7hOOXMYFOdrA94YXz8c8pDhMxsqEOfhZqCONo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mV0AceSmNP6b2bAPDEXDQ3T7Fjq3Cd4dRyCXG7adQR/Fd204ALElW7F9BVP6+/b4c jyJdv9zVlRCYC7k7qy9FdqCx1npJ0XClrboJeE7GxVyKQ3Jcj93JRCuLwWhT4/dpTW KqL/XzSVpb9eFyhGKYBC5jnC5dSSFMJ5PYwDXqGAZz7x2npcIAK/5JjppF056wSJnO kRPG0Sn2imIeP/VCBOxdR61YZo1yH7Z6tmmUajotqb7mtzvY0Iw0CXrQCIlDwqmox6 4POpZoZqeV7NJWo2r6HcQUOtqhK7Hq2pRzspPh8ntmz03/ME2pylVTDcVE9jZ1EKtr TY/NHt33MRpxA== 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 'youtube-viewer' uses 'youtube-dl' so presumably it needs the same search paths. * gnu/packages/video.scm (youtube-viewer)[native-search-paths]: Add the search paths of 'youtube-dl'. --- gnu/packages/video.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1a1ab31653..9b009dc1b9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2729,6 +2729,7 @@ (define-public youtube-viewer `("PERL5LIB" ":" prefix (,lib-path ,site-dir))) (find-files bin-dir)) #t)))))) + (native-search-paths (package-native-search-paths youtube-dl)) (synopsis "Lightweight application for searching and streaming videos from YouTube") (description From patchwork Sat May 7 08:37:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 39129 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 6EBB427BBEA; Sat, 7 May 2022 09:38:20 +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 2C16A27BBE9 for ; Sat, 7 May 2022 09:38:20 +0100 (BST) Received: from localhost ([::1]:46342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFxD-00026Z-AK for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:38:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFwy-00024k-HY for guix-patches@gnu.org; Sat, 07 May 2022 04:38:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFwy-0002kN-8k 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-0003qZ-6s for guix-patches@gnu.org; Sat, 07 May 2022 04:38:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 10/10] gnu: w3m: Add $SSL_CERT_DIR/$SSL_CERT_FILE search paths.. 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.165191267314709 (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]:50387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwm-0003p9-Hb for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:52 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nZ-G5 for 55297@debbugs.gnu.org; Sat, 07 May 2022 04:37:46 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id Tkdi270084UW6Th06kdjWo; Sat, 07 May 2022 10:37:43 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:40 +0000 Message-Id: <20220507083740.59995-10-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=m/tHX/II8nXHN8UZdXGUHhqFAb0iGKNOx5WUuKppzBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZcYxrBCtMT4y/pixE6dHKl/IJcWYMOosls0a/wDwXwLndEPmYQK+GO7R6cGXXNYjG PbbpjgRc+10Imy6ZahAGziBK2G0mdNNCKcamxY3V3baqvFhy84MXhwkBO++tVQ03yS H7KlZq/cvM047sMvTa+NSF9sSZGjdzDgjN5x5Ja+cl7t83diib4n5latV14b4KZ5a2 ukYPzepqxaU8BhfUarcs+bdJpvjzd2QL9Jrv56RgPTd8Ev5bCY4P38gmZWj3Q22tGo Q2kGLuKY0Nz/MAN3hUGFb9HaoSsdIq6EVi1eFYyt/jGA/57/HO1pfq36tuIRMAchQa EXbnBw8xLRcdA== 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 Try $ guix shell openssl w3m le-certs --pure -- w3m https://en.wikipedia.org and $ guix shell openssl w3m nss-certs --pure -- w3m https://en.wikipedia.org The second command succeeds whereas the first command results in ‘unable to get local issuer certificate; accept? (y/n)’, so it looks like w3m respects $SSL_CERT_DIR/$SSL_CERT_FILE. * gnu/packages/w3m.scm (w3m)[native-search-paths]: Add $SSL_CERT_DIR/$SSL_CERT_FILE search paths. * gnu/ackages/freedesktop.scm (xdg-utils)[native-inputs]{w3m}: Use a variant of 'w3m' without $SSL_CERT_DIR/$SSL_CERT_FILE to avoid rebuilds. --- gnu/packages/freedesktop.scm | 7 ++++++- gnu/packages/w3m.scm | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 55bde8e705..f785e42b89 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -409,7 +409,12 @@ (define-public xdg-utils "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) (build-system gnu-build-system) (native-inputs - (list docbook-xsl docbook-xml-4.1.2 libxslt w3m xmlto)) + (list docbook-xsl docbook-xml-4.1.2 libxslt + ;; TODO(staging): don't remove search paths. + ;; Search paths are temporarily removed to + ;; avoid rebuilds. + (package (inherit w3m) (native-search-paths '())) + xmlto)) (inputs `(("awk" ,gawk) ("coreutils" ,coreutils) diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 5239cd43a0..72ed22bfe4 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -35,6 +35,7 @@ (define-module (gnu packages w3m) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) #:use-module (gnu packages) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system gnu)) @@ -78,6 +79,7 @@ (define-public w3m ("perl" ,perl) ("pkg-config" ,pkg-config))) (home-page "http://w3m.sourceforge.net/") + (native-search-paths (list $SSL_CERT_DIR $SSL_CERT_FILE)) (synopsis "Text-mode web browser") (description "w3m is a text-based web browser as well as a pager like @code{more} or