| 1 |
mrueg 15/07/04 15:38:52 |
| 2 |
|
| 3 |
Added: biber-2.1-drop-mozilla-ca.patch |
| 4 |
Log: |
| 5 |
Version bump. Fixes bug #547466. |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key ) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-tex/biber/files/biber-2.1-drop-mozilla-ca.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/biber/files/biber-2.1-drop-mozilla-ca.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/biber/files/biber-2.1-drop-mozilla-ca.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: biber-2.1-drop-mozilla-ca.patch |
| 16 |
=================================================================== |
| 17 |
From 29a48e5da01acb1f5f35e3a47b04ec4db42e50b9 Mon Sep 17 00:00:00 2001 |
| 18 |
From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@××××.eu> |
| 19 |
Date: Sun, 31 May 2015 00:34:11 +0200 |
| 20 |
Subject: [PATCH] Remove Mozilla::CA dependency. |
| 21 |
|
| 22 |
|
| 23 |
diff --git a/Build.PL b/Build.PL |
| 24 |
index 841af36..b43b5fe 100644 |
| 25 |
--- a/Build.PL |
| 26 |
+++ b/Build.PL |
| 27 |
@@ -53,7 +53,6 @@ my $builder = $class->new( |
| 28 |
'List::AllUtils' => 0, |
| 29 |
'List::MoreUtils' => 0, |
| 30 |
'List::MoreUtils::XS' => 0, |
| 31 |
- 'Mozilla::CA' => '20141217', |
| 32 |
'Regexp::Common' => 0, |
| 33 |
'Log::Log4perl' => 0, |
| 34 |
'Unicode::Collate' => '1.12', |
| 35 |
diff --git a/bin/biber b/bin/biber |
| 36 |
index 80ebd39..c4f8897 100755 |
| 37 |
--- a/bin/biber |
| 38 |
+++ b/bin/biber |
| 39 |
@@ -72,7 +72,6 @@ GetOptions( |
| 40 |
'sortfirstinits=s', |
| 41 |
'sortlocale|l=s', |
| 42 |
'sortupper=s', |
| 43 |
- 'ssl-nointernalca', |
| 44 |
'ssl-noverify-host', |
| 45 |
'tool', |
| 46 |
'tool_align|tool-align', # legacy alias for output_align |
| 47 |
@@ -658,12 +657,6 @@ default sorting (B<--collate|-C>). When |
| 48 |
using B<--fastsort|-f>, your OS collation locale determines |
| 49 |
this and this option is ignored (default is true). |
| 50 |
|
| 51 |
-=item B<--ssl-nointernalca> |
| 52 |
- |
| 53 |
-Don't try to use the default Mozilla CA certificates when using HTTPS to fetch remote data. |
| 54 |
-This assumes that the user will set one of the perl LWP::UserAgent module environment variables |
| 55 |
-to find the CA certs. |
| 56 |
- |
| 57 |
=item B<--ssl-noverify-host> |
| 58 |
|
| 59 |
Turn off host verification when using HTTPS to fetch remote data sources. |
| 60 |
diff --git a/data/schemata/config.rnc b/data/schemata/config.rnc |
| 61 |
index 9f96fec..2863e14 100644 |
| 62 |
--- a/data/schemata/config.rnc |
| 63 |
+++ b/data/schemata/config.rnc |
| 64 |
@@ -77,7 +77,6 @@ start = element config { |
| 65 |
map+ |
| 66 |
}+ |
| 67 |
}? & |
| 68 |
- element ssl-nointernalca { "0" | "1" }? & |
| 69 |
element ssl-noverify-host { "0" | "1" }? & |
| 70 |
element tool { "0" | "1" }? & |
| 71 |
element tool_config { text }? & |
| 72 |
diff --git a/data/schemata/config.rng b/data/schemata/config.rng |
| 73 |
index 3bd7072..8ef9bee 100644 |
| 74 |
--- a/data/schemata/config.rng |
| 75 |
+++ b/data/schemata/config.rng |
| 76 |
@@ -352,14 +352,6 @@ |
| 77 |
</element> |
| 78 |
</optional> |
| 79 |
<optional> |
| 80 |
- <element name="ssl-nointernalca"> |
| 81 |
- <choice> |
| 82 |
- <value>0</value> |
| 83 |
- <value>1</value> |
| 84 |
- </choice> |
| 85 |
- </element> |
| 86 |
- </optional> |
| 87 |
- <optional> |
| 88 |
<element name="ssl-noverify-host"> |
| 89 |
<choice> |
| 90 |
<value>0</value> |
| 91 |
diff --git a/lib/Biber/Input/file/biblatexml.pm b/lib/Biber/Input/file/biblatexml.pm |
| 92 |
index 4d1878b..8994c0f 100644 |
| 93 |
--- a/lib/Biber/Input/file/biblatexml.pm |
| 94 |
+++ b/lib/Biber/Input/file/biblatexml.pm |
| 95 |
@@ -97,19 +97,6 @@ sub extract_entries { |
| 96 |
else { |
| 97 |
if ($1) { # HTTPS |
| 98 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
| 99 |
- # We have to explicitly set the cert path because otherwise the https module |
| 100 |
- # can't find the .pem when PAR::Packer'ed |
| 101 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
| 102 |
- # It may, however, have been removed by some biber unpacked dists |
| 103 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
| 104 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
| 105 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
| 106 |
- eval {require Mozilla::CA}) { |
| 107 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
| 108 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
| 109 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
| 110 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
| 111 |
- } |
| 112 |
|
| 113 |
# fallbacks for, e.g., linux |
| 114 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
| 115 |
diff --git a/lib/Biber/Input/file/bibtex.pm b/lib/Biber/Input/file/bibtex.pm |
| 116 |
index 24b2772..c70e6e4 100644 |
| 117 |
--- a/lib/Biber/Input/file/bibtex.pm |
| 118 |
+++ b/lib/Biber/Input/file/bibtex.pm |
| 119 |
@@ -140,19 +140,6 @@ sub extract_entries { |
| 120 |
else { |
| 121 |
if ($1) { # HTTPS |
| 122 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
| 123 |
- # We have to explicitly set the cert path because otherwise the https module |
| 124 |
- # can't find the .pem when PAR::Packer'ed |
| 125 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
| 126 |
- # It may, however, have been removed by some biber unpacked dists |
| 127 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
| 128 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
| 129 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
| 130 |
- eval {require Mozilla::CA}) { |
| 131 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
| 132 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
| 133 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
| 134 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
| 135 |
- } |
| 136 |
|
| 137 |
# fallbacks for, e.g., linux |
| 138 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
| 139 |
diff --git a/lib/Biber/Input/file/endnotexml.pm b/lib/Biber/Input/file/endnotexml.pm |
| 140 |
index bf62a80..342b3b2 100644 |
| 141 |
--- a/lib/Biber/Input/file/endnotexml.pm |
| 142 |
+++ b/lib/Biber/Input/file/endnotexml.pm |
| 143 |
@@ -111,19 +111,6 @@ sub extract_entries { |
| 144 |
$logger->info("Data source '$source' is a remote EndNote XML datasource - fetching ..."); |
| 145 |
if ($1) { # HTTPS |
| 146 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
| 147 |
- # We have to explicitly set the cert path because otherwise the https module |
| 148 |
- # can't find the .pem when PAR::Packer'ed |
| 149 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
| 150 |
- # It may, however, have been removed by some biber unpacked dists |
| 151 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
| 152 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
| 153 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
| 154 |
- eval {require Mozilla::CA}) { |
| 155 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
| 156 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
| 157 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
| 158 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
| 159 |
- } |
| 160 |
|
| 161 |
# fallbacks for, e.g., linux |
| 162 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
| 163 |
diff --git a/lib/Biber/Input/file/ris.pm b/lib/Biber/Input/file/ris.pm |
| 164 |
index bc389c2..56f8d93 100644 |
| 165 |
--- a/lib/Biber/Input/file/ris.pm |
| 166 |
+++ b/lib/Biber/Input/file/ris.pm |
| 167 |
@@ -110,19 +110,6 @@ sub extract_entries { |
| 168 |
else { |
| 169 |
if ($1) { # HTTPS |
| 170 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
| 171 |
- # We have to explicitly set the cert path because otherwise the https module |
| 172 |
- # can't find the .pem when PAR::Packer'ed |
| 173 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
| 174 |
- # It may, however, have been removed by some biber unpacked dists |
| 175 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
| 176 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
| 177 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
| 178 |
- eval {require Mozilla::CA}) { |
| 179 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
| 180 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
| 181 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
| 182 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
| 183 |
- } |
| 184 |
|
| 185 |
# fallbacks for, e.g., linux |
| 186 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
| 187 |
diff --git a/lib/Biber/Input/file/zoterordfxml.pm b/lib/Biber/Input/file/zoterordfxml.pm |
| 188 |
index 6dbb3f9..15bc3f6 100644 |
| 189 |
--- a/lib/Biber/Input/file/zoterordfxml.pm |
| 190 |
+++ b/lib/Biber/Input/file/zoterordfxml.pm |
| 191 |
@@ -123,19 +123,6 @@ sub extract_entries { |
| 192 |
$logger->info("Data source '$source' is a remote Zotero RDF/XML data source - fetching ..."); |
| 193 |
if ($1) { # HTTPS |
| 194 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
| 195 |
- # We have to explicitly set the cert path because otherwise the https module |
| 196 |
- # can't find the .pem when PAR::Packer'ed |
| 197 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
| 198 |
- # It may, however, have been removed by some biber unpacked dists |
| 199 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
| 200 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
| 201 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
| 202 |
- eval {require Mozilla::CA}) { |
| 203 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
| 204 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
| 205 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
| 206 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
| 207 |
- } |
| 208 |
|
| 209 |
# fallbacks for, e.g., linux |
| 210 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
| 211 |
-- |
| 212 |
2.4.2 |
Archives