JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lwp-protocol-https: honour NIX_SSL_CERT_FILE

Browse Source
This commit is contained in:
Tyson Whitehead 2018-06-29 16:29:22 -04:00
parent 9037f608ae
commit 321f13427c
No known key found for this signature in database
GPG Key ID: B22199763A27997B
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
View File

@ -1,15 +1,31 @@
diff -ru -x '*~' LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm From 321401098f2c86a6f68e186cfc06e030b09484b6 Mon Sep 17 00:00:00 2001
--- LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm 2013-04-29 23:16:18.000000000 +0200 From: Tyson Whitehead <twhitehead@gmail.com>
+++ LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm 2016-03-02 14:59:01.639844511 +0100 Date: Fri, 29 Jun 2018 15:47:00 -0400
@@ -24,6 +24,11 @@ Subject: [PATCH] Respect NIX_SSL_CERT_FILE and SSL_CERT_FILE (in that order)
---
lib/LWP/Protocol/https.pm | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm
index f7230e2..c78b9ce 100644
--- a/lib/LWP/Protocol/https.pm
+++ b/lib/LWP/Protocol/https.pm
@@ -23,6 +23,14 @@ sub _extra_sock_opts
$ssl_opts{SSL_verify_mode} = 0;
} }
if ($ssl_opts{SSL_verify_mode}) { if ($ssl_opts{SSL_verify_mode}) {
unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
+ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'}; + $ssl_opts{SSL_ca_file} = $ENV{'NIX_SSL_CERT_FILE'}
+ if !defined $ssl_opts{SSL_ca_file};
+ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'}
+ if !defined $ssl_opts{SSL_ca_file};
+ $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt" + $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt"
+ if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt"; + if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt";
+ } + }
+ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
eval { eval {
require Mozilla::CA; require Mozilla::CA;
}; --
2.14.0