1 |
mrueg 13/11/05 05:31:39 |
2 |
|
3 |
Added: biber-1.8-drop-mozilla-ca.patch |
4 |
Log: |
5 |
Version bump. |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key ) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-tex/biber/files/biber-1.8-drop-mozilla-ca.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/biber/files/biber-1.8-drop-mozilla-ca.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/biber/files/biber-1.8-drop-mozilla-ca.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: biber-1.8-drop-mozilla-ca.patch |
16 |
=================================================================== |
17 |
diff --git a/Build.PL b/Build.PL |
18 |
index 2e0a08f..bfb3c4e 100644 |
19 |
--- a/Build.PL |
20 |
+++ b/Build.PL |
21 |
@@ -49,7 +49,6 @@ my $builder = $class->new( |
22 |
'IPC::Run3' => 0, |
23 |
'List::AllUtils' => 0, |
24 |
'List::MoreUtils' => 0, |
25 |
- 'Mozilla::CA' => '20130114', |
26 |
'Regexp::Common' => 0, |
27 |
'Log::Log4perl' => 0, |
28 |
'Unicode::Collate' => '0.98', |
29 |
diff --git a/META.json b/META.json |
30 |
index 250b29c..910dd77 100644 |
31 |
--- a/META.json |
32 |
+++ b/META.json |
33 |
@@ -47,7 +47,6 @@ |
34 |
"List::AllUtils" : "0", |
35 |
"List::MoreUtils" : "0", |
36 |
"Log::Log4perl" : "0", |
37 |
- "Mozilla::CA" : "20130114", |
38 |
"Regexp::Common" : "0", |
39 |
"Text::BibTeX" : "0.66", |
40 |
"URI" : "0", |
41 |
diff --git a/META.yml b/META.yml |
42 |
index 3229db9..305f42e 100644 |
43 |
--- a/META.yml |
44 |
+++ b/META.yml |
45 |
@@ -113,7 +113,6 @@ requires: |
46 |
List::AllUtils: 0 |
47 |
List::MoreUtils: 0 |
48 |
Log::Log4perl: 0 |
49 |
- Mozilla::CA: 20130114 |
50 |
Regexp::Common: 0 |
51 |
Text::BibTeX: 0.66 |
52 |
URI: 0 |
53 |
diff --git a/bin/biber b/bin/biber |
54 |
index 80f68da..d90e839 100755 |
55 |
--- a/bin/biber |
56 |
+++ b/bin/biber |
57 |
@@ -72,7 +72,6 @@ GetOptions( |
58 |
'sortfirstinits=s', |
59 |
'sortlocale|l=s', |
60 |
'sortupper=s', |
61 |
- 'ssl-nointernalca', |
62 |
'ssl-noverify-host', |
63 |
'tool', |
64 |
'tool_align', # legacy alias for output_align |
65 |
@@ -656,12 +655,6 @@ default sorting (B<--collate|-C>). When |
66 |
using B<--fastsort|-f>, your OS collation locale determines |
67 |
this and this option is ignored (default is true). |
68 |
|
69 |
-=item B<--ssl-nointernalca> |
70 |
- |
71 |
-Don't try to use the default Mozilla CA certificates when using HTTPS to fetch remote data. |
72 |
-This assumes that the user will set one of the perl LWP::UserAgent module environment variables |
73 |
-to find the CA certs. |
74 |
- |
75 |
=item B<--ssl-noverify-host> |
76 |
|
77 |
Turn off host verification when using HTTPS to fetch remote data sources. |
78 |
diff --git a/data/schemata/config.rnc b/data/schemata/config.rnc |
79 |
index c469196..23e553d 100644 |
80 |
--- a/data/schemata/config.rnc |
81 |
+++ b/data/schemata/config.rnc |
82 |
@@ -162,7 +162,6 @@ start = element config { |
83 |
map+ |
84 |
}+ |
85 |
}? & |
86 |
- element ssl-nointernalca { "0" | "1" }? & |
87 |
element ssl-noverify-host { "0" | "1" }? & |
88 |
element tool { "0" | "1" }? & |
89 |
element tool_config { text }? & |
90 |
diff --git a/data/schemata/config.rng b/data/schemata/config.rng |
91 |
index b33160a..d6ed700 100644 |
92 |
--- a/data/schemata/config.rng |
93 |
+++ b/data/schemata/config.rng |
94 |
@@ -566,14 +566,6 @@ |
95 |
</element> |
96 |
</optional> |
97 |
<optional> |
98 |
- <element name="ssl-nointernalca"> |
99 |
- <choice> |
100 |
- <value>0</value> |
101 |
- <value>1</value> |
102 |
- </choice> |
103 |
- </element> |
104 |
- </optional> |
105 |
- <optional> |
106 |
<element name="ssl-noverify-host"> |
107 |
<choice> |
108 |
<value>0</value> |
109 |
diff --git a/lib/Biber/Input/file/biblatexml.pm b/lib/Biber/Input/file/biblatexml.pm |
110 |
index 3f5a1ea..3bb1f0c 100644 |
111 |
--- a/lib/Biber/Input/file/biblatexml.pm |
112 |
+++ b/lib/Biber/Input/file/biblatexml.pm |
113 |
@@ -93,19 +93,6 @@ sub extract_entries { |
114 |
$logger->info("Data source '$filename' is a remote .xml - fetching ..."); |
115 |
if ($1) { # HTTPS |
116 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
117 |
- # We have to explicitly set the cert path because otherwise the https module |
118 |
- # can't find the .pem when PAR::Packer'ed |
119 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
120 |
- # It may, however, have been removed by some biber unpacked dists |
121 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
122 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
123 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
124 |
- eval {require Mozilla::CA}) { |
125 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
126 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
127 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
128 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
129 |
- } |
130 |
|
131 |
# fallbacks for, e.g., linux |
132 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
133 |
diff --git a/lib/Biber/Input/file/bibtex.pm b/lib/Biber/Input/file/bibtex.pm |
134 |
index 2389c8a..ca89e17 100644 |
135 |
--- a/lib/Biber/Input/file/bibtex.pm |
136 |
+++ b/lib/Biber/Input/file/bibtex.pm |
137 |
@@ -134,19 +134,6 @@ sub extract_entries { |
138 |
$logger->info("Data source '$source' is a remote BibTeX data source - fetching ..."); |
139 |
if ($1) { # HTTPS |
140 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
141 |
- # We have to explicitly set the cert path because otherwise the https module |
142 |
- # can't find the .pem when PAR::Packer'ed |
143 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
144 |
- # It may, however, have been removed by some biber unpacked dists |
145 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
146 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
147 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
148 |
- eval {require Mozilla::CA}) { |
149 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
150 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
151 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
152 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
153 |
- } |
154 |
|
155 |
# fallbacks for, e.g., linux |
156 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
157 |
diff --git a/lib/Biber/Input/file/endnotexml.pm b/lib/Biber/Input/file/endnotexml.pm |
158 |
index 4c13732..9dfcd00 100644 |
159 |
--- a/lib/Biber/Input/file/endnotexml.pm |
160 |
+++ b/lib/Biber/Input/file/endnotexml.pm |
161 |
@@ -112,19 +112,6 @@ sub extract_entries { |
162 |
$logger->info("Data source '$source' is a remote EndNote XML datasource - fetching ..."); |
163 |
if ($1) { # HTTPS |
164 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
165 |
- # We have to explicitly set the cert path because otherwise the https module |
166 |
- # can't find the .pem when PAR::Packer'ed |
167 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
168 |
- # It may, however, have been removed by some biber unpacked dists |
169 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
170 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
171 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
172 |
- eval {require Mozilla::CA}) { |
173 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
174 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
175 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
176 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
177 |
- } |
178 |
|
179 |
# fallbacks for, e.g., linux |
180 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
181 |
diff --git a/lib/Biber/Input/file/ris.pm b/lib/Biber/Input/file/ris.pm |
182 |
index 6e82c60..9d33e07 100644 |
183 |
--- a/lib/Biber/Input/file/ris.pm |
184 |
+++ b/lib/Biber/Input/file/ris.pm |
185 |
@@ -107,19 +107,6 @@ sub extract_entries { |
186 |
$logger->info("Data source '$source' is a remote RIS data source - fetching ..."); |
187 |
if ($1) { # HTTPS |
188 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
189 |
- # We have to explicitly set the cert path because otherwise the https module |
190 |
- # can't find the .pem when PAR::Packer'ed |
191 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
192 |
- # It may, however, have been removed by some biber unpacked dists |
193 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
194 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
195 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
196 |
- eval {require Mozilla::CA}) { |
197 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
198 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
199 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
200 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
201 |
- } |
202 |
|
203 |
# fallbacks for, e.g., linux |
204 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
205 |
diff --git a/lib/Biber/Input/file/zoterordfxml.pm b/lib/Biber/Input/file/zoterordfxml.pm |
206 |
index f5e064f..5de6cce 100644 |
207 |
--- a/lib/Biber/Input/file/zoterordfxml.pm |
208 |
+++ b/lib/Biber/Input/file/zoterordfxml.pm |
209 |
@@ -123,19 +123,6 @@ sub extract_entries { |
210 |
$logger->info("Data source '$source' is a remote Zotero RDF/XML data source - fetching ..."); |
211 |
if ($1) { # HTTPS |
212 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
213 |
- # We have to explicitly set the cert path because otherwise the https module |
214 |
- # can't find the .pem when PAR::Packer'ed |
215 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
216 |
- # It may, however, have been removed by some biber unpacked dists |
217 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
218 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
219 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
220 |
- eval {require Mozilla::CA}) { |
221 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
222 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
223 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
224 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
225 |
- } |
226 |
|
227 |
# fallbacks for, e.g., linux |
228 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
229 |
-- |
230 |
1.8.4.2 |