commit ae4c0e392dee702aab95ad4d376e89273091792c · pyrox.dev/nixpkgs

+9 -26
pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
···

       1
       1
       -
       From 321401098f2c86a6f68e186cfc06e030b09484b6 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Tyson Whitehead <twhitehead@gmail.com>

     

       3
       3
       -
       Date: Fri, 29 Jun 2018 15:47:00 -0400

     

       4
       4
       -
       Subject: [PATCH] Respect NIX_SSL_CERT_FILE and SSL_CERT_FILE (in that order)

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        lib/LWP/Protocol/https.pm | 8 ++++++++

     

       8
       8
       -
        1 file changed, 8 insertions(+)

     

       9
       9
       -
       

     

       10
       1
        
       diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm

     

       11
       11
       -
       index f7230e2..c78b9ce 100644

     

       2
       2
       +
       index 645e828..7098f64 100644

     

       12
       3
        
       --- a/lib/LWP/Protocol/https.pm

     

       13
       4
        
       +++ b/lib/LWP/Protocol/https.pm

     

       14
       14
       -
       @@ -23,6 +23,14 @@ sub _extra_sock_opts

     

       15
       15
       -
        	$ssl_opts{SSL_verify_mode} = 0;

     

       5
       5
       +
       @@ -29,6 +29,9 @@ sub _extra_sock_opts

     

       6
       6
       +
                }

     

       16
       7
        
            }

     

       17
       8
        
            if ($ssl_opts{SSL_verify_mode}) {

     

       18
       18
       -
       +	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {

     

       19
       19
       -
       +	    $ssl_opts{SSL_ca_file} = $ENV{'NIX_SSL_CERT_FILE'}

     

       20
       20
       -
       +                if !defined $ssl_opts{SSL_ca_file};

     

       21
       21
       -
       +	    $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'}

     

       22
       22
       -
       +                if !defined $ssl_opts{SSL_ca_file};

     

       23
       23
       -
       +	    $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt"

     

       24
       24
       -
       +		if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt";

     

       25
       25
       -
       +	}

     

       26
       26
       -
        	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {

     

       27
       27
       -
        	    eval {

     

       28
       28
       -
        		require Mozilla::CA;

     

       29
       29
       -
       -- 

     

       30
       30
       -
       2.14.0

     

       31
       31
       -
       

     

       9
       9
       +
       +        if ($ENV{NIX_SSL_CERT_FILE}) {

     

       10
       10
       +
       +            $ssl_opts{SSL_ca_file} //= $ENV{NIX_SSL_CERT_FILE};

     

       11
       11
       +
       +        }

     

       12
       12
       +
                unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {

     

       13
       13
       +
                    if ($Net::HTTPS::SSL_SOCKET_CLASS eq 'IO::Socket::SSL'

     

       14
       14
       +
                        && defined &IO::Socket::SSL::default_ca