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