rpm/texlive
SHA256
1
0
Fork 0
forked from pool/texlive
Code Pull Requests Activity
aa3cebead7
texlive/biber-certs.dif

225 lines
9.7 KiB
Plaintext
Raw Blame History

--- Build.PL
+++ Build.PL 2013-07-30 11:55:12.321939296 +0000
@@ -66,7 +66,6 @@ my $builder = $class->new(
'Business::ISBN' => 0,
'Business::ISSN' => 0,
'Business::ISMN' => 0,
- 'Mozilla::CA' => '20130114',
'perl' => '5.16.0'
},
recommends => {
--- META.json
+++ META.json 2013-07-30 11:30:42.721439449 +0000
@@ -48,7 +48,6 @@
"List::AllUtils" : "0",
"List::MoreUtils" : "0",
"Log::Log4perl" : "0",
- "Mozilla::CA" : "20130114",
"Regexp::Common" : "0",
"Text::BibTeX" : "0.66",
"URI" : "0",
--- META.yml
+++ META.yml 2013-07-30 11:30:35.853439347 +0000
@@ -88,7 +88,6 @@ requires:
List::AllUtils: 0
List::MoreUtils: 0
Log::Log4perl: 0
- Mozilla::CA: 20130114
Regexp::Common: 0
Text::BibTeX: 0.66
URI: 0
--- bin/biber
+++ bin/biber 2013-07-30 11:58:02.261439590 +0000
@@ -606,9 +606,8 @@ this and this option is ignored (default
=item B<--ssl-nointernalca>
-Don't try to use the default Mozilla CA certificates when using HTTPS to fetch remote data.
-This assumes that the user will set one of the perl LWP::UserAgent module environment variables
-to find the CA certs.
+This option has no effects as this biber version is dumped without internal Mozilla CA certificates.
+Instead the system CA certificates will be used by perl LWP::UserAgent module.
=item B<--ssl-noverify-host>
--- lib/Biber/Input/file/biblatexml.pm
+++ lib/Biber/Input/file/biblatexml.pm 2013-07-30 11:54:22.741480026 +0000
@@ -95,13 +95,26 @@ sub extract_entries {
# use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
# We have to explicitly set the cert path because otherwise the https module
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
- not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
+ unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ foreach my $ca_bundle (qw{
+ /etc/ssl/certs/ca-certificates.crt
+ /etc/pki/tls/certs/ca-bundle.crt
+ /etc/ssl/ca-bundle.pem
+ }) {
+ next if ! -e $ca_bundle;
+ $ENV{PERL_LWP_SSL_CA_FILE} = $ca_bundle;
+ break;
+ }
+ }
+ unless (exists($ENV{PERL_LWP_SSL_CA_PATH})) {
+ foreach my $ca_path (qw{
+ /etc/ssl/certs/
+ /etc/pki/tls/
+ }) {
+ next if ! -d $ca_path;
+ $ENV{PERL_LWP_SSL_CA_PATH} = $ca_path;
+ break;
+ }
}
if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
--- lib/Biber/Input/file/bibtex.pm
+++ lib/Biber/Input/file/bibtex.pm 2013-07-30 11:54:56.009439347 +0000
@@ -136,13 +136,26 @@ sub extract_entries {
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
# We have to explicitly set the cert path because otherwise the https module
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
- not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
+ unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ foreach my $ca_bundle (qw{
+ /etc/ssl/certs/ca-certificates.crt
+ /etc/pki/tls/certs/ca-bundle.crt
+ /etc/ssl/ca-bundle.pem
+ }) {
+ next if ! -e $ca_bundle;
+ $ENV{PERL_LWP_SSL_CA_FILE} = $ca_bundle;
+ break;
+ }
+ }
+ unless (exists($ENV{PERL_LWP_SSL_CA_PATH})) {
+ foreach my $ca_path (qw{
+ /etc/ssl/certs/
+ /etc/pki/tls/
+ }) {
+ next if ! -d $ca_path;
+ $ENV{PERL_LWP_SSL_CA_PATH} = $ca_path;
+ break;
+ }
}
if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
--- lib/Biber/Input/file/endnotexml.pm
+++ lib/Biber/Input/file/endnotexml.pm 2013-07-30 11:52:55.597939238 +0000
@@ -114,13 +114,26 @@ sub extract_entries {
# use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
# We have to explicitly set the cert path because otherwise the https module
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
- not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
+ unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ foreach my $ca_bundle (qw{
+ /etc/ssl/certs/ca-certificates.crt
+ /etc/pki/tls/certs/ca-bundle.crt
+ /etc/ssl/ca-bundle.pem
+ }) {
+ next if ! -e $ca_bundle;
+ $ENV{PERL_LWP_SSL_CA_FILE} = $ca_bundle;
+ break;
+ }
+ }
+ unless (exists($ENV{PERL_LWP_SSL_CA_PATH})) {
+ foreach my $ca_path (qw{
+ /etc/ssl/certs/
+ /etc/pki/tls/
+ }) {
+ next if ! -d $ca_path;
+ $ENV{PERL_LWP_SSL_CA_PATH} = $ca_path;
+ break;
+ }
}
if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
--- lib/Biber/Input/file/ris.pm
+++ lib/Biber/Input/file/ris.pm 2013-07-30 11:51:46.481960038 +0000
@@ -109,13 +109,26 @@ sub extract_entries {
# use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
# We have to explicitly set the cert path because otherwise the https module
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
- not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
+ unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ foreach my $ca_bundle (qw{
+ /etc/ssl/certs/ca-certificates.crt
+ /etc/pki/tls/certs/ca-bundle.crt
+ /etc/ssl/ca-bundle.pem
+ }) {
+ next if ! -e $ca_bundle;
+ $ENV{PERL_LWP_SSL_CA_FILE} = $ca_bundle;
+ break;
+ }
+ }
+ unless (exists($ENV{PERL_LWP_SSL_CA_PATH})) {
+ foreach my $ca_path (qw{
+ /etc/ssl/certs/
+ /etc/pki/tls/
+ }) {
+ next if ! -d $ca_path;
+ $ENV{PERL_LWP_SSL_CA_PATH} = $ca_path;
+ break;
+ }
}
if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
--- lib/Biber/Input/file/zoterordfxml.pm
+++ lib/Biber/Input/file/zoterordfxml.pm 2013-07-30 11:53:38.269439442 +0000
@@ -125,13 +125,26 @@ sub extract_entries {
# use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
# We have to explicitly set the cert path because otherwise the https module
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
- not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
+ unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ foreach my $ca_bundle (qw{
+ /etc/ssl/certs/ca-certificates.crt
+ /etc/pki/tls/certs/ca-bundle.crt
+ /etc/ssl/ca-bundle.pem
+ }) {
+ next if ! -e $ca_bundle;
+ $ENV{PERL_LWP_SSL_CA_FILE} = $ca_bundle;
+ break;
+ }
+ }
+ unless (exists($ENV{PERL_LWP_SSL_CA_PATH})) {
+ foreach my $ca_path (qw{
+ /etc/ssl/certs/
+ /etc/pki/tls/
+ }) {
+ next if ! -d $ca_path;
+ $ENV{PERL_LWP_SSL_CA_PATH} = $ca_path;
+ break;
+ }
}
if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
View Git Blame Copy Permalink