* [bug#55297] [PATCH 02/10] gnu: openssl: Use $SSL_CERT_DIR/$SSL_CERT_FILE.
2022-05-07 8:37 ` [bug#55297] [PATCH 01/10] search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE Maxime Devos
@ 2022-05-07 8:37 ` Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 03/10] gnu: cuirass: Use $SSL_CERT_DIR Maxime Devos
` (7 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Maxime Devos @ 2022-05-07 8:37 UTC (permalink / raw)
To: 55297; +Cc: Maxime Devos
* 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.")
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#55297] [PATCH 03/10] gnu: cuirass: Use $SSL_CERT_DIR.
2022-05-07 8:37 ` [bug#55297] [PATCH 01/10] search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 02/10] gnu: openssl: Use $SSL_CERT_DIR/$SSL_CERT_FILE Maxime Devos
@ 2022-05-07 8:37 ` Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 04/10] gnu: cmake-bootstrap: Use $SSL_CERT_DIR/$SSL_CERT_FILE Maxime Devos
` (6 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Maxime Devos @ 2022-05-07 8:37 UTC (permalink / raw)
To: 55297; +Cc: Maxime Devos
* 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
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#55297] [PATCH 04/10] gnu: cmake-bootstrap: Use $SSL_CERT_DIR/$SSL_CERT_FILE.
2022-05-07 8:37 ` [bug#55297] [PATCH 01/10] search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 02/10] gnu: openssl: Use $SSL_CERT_DIR/$SSL_CERT_FILE Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 03/10] gnu: cuirass: Use $SSL_CERT_DIR Maxime Devos
@ 2022-05-07 8:37 ` Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 05/10] gnu: curl: " Maxime Devos
` (5 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Maxime Devos @ 2022-05-07 8:37 UTC (permalink / raw)
To: 55297; +Cc: Maxime Devos
* 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
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#55297] [PATCH 05/10] gnu: curl: Use $SSL_CERT_DIR/$SSL_CERT_FILE.
2022-05-07 8:37 ` [bug#55297] [PATCH 01/10] search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE Maxime Devos
` (2 preceding siblings ...)
2022-05-07 8:37 ` [bug#55297] [PATCH 04/10] gnu: cmake-bootstrap: Use $SSL_CERT_DIR/$SSL_CERT_FILE Maxime Devos
@ 2022-05-07 8:37 ` Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 06/10] gnu: guix: Use $SSL_CERT_DIR Maxime Devos
` (4 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Maxime Devos @ 2022-05-07 8:37 UTC (permalink / raw)
To: 55297; +Cc: Maxime Devos
* 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.
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#55297] [PATCH 06/10] gnu: guix: Use $SSL_CERT_DIR.
2022-05-07 8:37 ` [bug#55297] [PATCH 01/10] search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE Maxime Devos
` (3 preceding siblings ...)
2022-05-07 8:37 ` [bug#55297] [PATCH 05/10] gnu: curl: " Maxime Devos
@ 2022-05-07 8:37 ` Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 07/10] gnu: youtube-dl: Add missing $SSL_CERT_DIR/FILE search paths Maxime Devos
` (3 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Maxime Devos @ 2022-05-07 8:37 UTC (permalink / raw)
To: 55297; +Cc: Maxime Devos
* 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
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#55297] [PATCH 07/10] gnu: youtube-dl: Add missing $SSL_CERT_DIR/FILE search paths.
2022-05-07 8:37 ` [bug#55297] [PATCH 01/10] search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE Maxime Devos
` (4 preceding siblings ...)
2022-05-07 8:37 ` [bug#55297] [PATCH 06/10] gnu: guix: Use $SSL_CERT_DIR Maxime Devos
@ 2022-05-07 8:37 ` Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 08/10] gnu: youtube-dl-gui: Add search paths of 'youtube-dl' Maxime Devos
` (2 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Maxime Devos @ 2022-05-07 8:37 UTC (permalink / raw)
To: 55297; +Cc: Maxime Devos
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 <GNUtoo@cyberdimension.org>
;;; Copyright © 2022 Bird <birdsite@airmail.cc>
;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
+;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;;
;;; 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
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#55297] [PATCH 08/10] gnu: youtube-dl-gui: Add search paths of 'youtube-dl'.
2022-05-07 8:37 ` [bug#55297] [PATCH 01/10] search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE Maxime Devos
` (5 preceding siblings ...)
2022-05-07 8:37 ` [bug#55297] [PATCH 07/10] gnu: youtube-dl: Add missing $SSL_CERT_DIR/FILE search paths Maxime Devos
@ 2022-05-07 8:37 ` Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 09/10] gnu: youtube-viewer: " Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 10/10] gnu: w3m: Add $SSL_CERT_DIR/$SSL_CERT_FILE search paths Maxime Devos
8 siblings, 0 replies; 15+ messages in thread
From: Maxime Devos @ 2022-05-07 8:37 UTC (permalink / raw)
To: 55297; +Cc: Maxime Devos
'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}")
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#55297] [PATCH 09/10] gnu: youtube-viewer: Add search paths of 'youtube-dl'.
2022-05-07 8:37 ` [bug#55297] [PATCH 01/10] search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE Maxime Devos
` (6 preceding siblings ...)
2022-05-07 8:37 ` [bug#55297] [PATCH 08/10] gnu: youtube-dl-gui: Add search paths of 'youtube-dl' Maxime Devos
@ 2022-05-07 8:37 ` Maxime Devos
2022-05-07 8:37 ` [bug#55297] [PATCH 10/10] gnu: w3m: Add $SSL_CERT_DIR/$SSL_CERT_FILE search paths Maxime Devos
8 siblings, 0 replies; 15+ messages in thread
From: Maxime Devos @ 2022-05-07 8:37 UTC (permalink / raw)
To: 55297; +Cc: Maxime Devos
'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
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#55297] [PATCH 10/10] gnu: w3m: Add $SSL_CERT_DIR/$SSL_CERT_FILE search paths..
2022-05-07 8:37 ` [bug#55297] [PATCH 01/10] search-paths: Define $SSL_CERT_DIR and $SSL_CERT_FILE Maxime Devos
` (7 preceding siblings ...)
2022-05-07 8:37 ` [bug#55297] [PATCH 09/10] gnu: youtube-viewer: " Maxime Devos
@ 2022-05-07 8:37 ` Maxime Devos
8 siblings, 0 replies; 15+ messages in thread
From: Maxime Devos @ 2022-05-07 8:37 UTC (permalink / raw)
To: 55297; +Cc: Maxime Devos
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
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread