1 |
mrueg 14/05/29 12:56:31 |
2 |
|
3 |
Added: biber-1.9-drop-mozilla-ca.patch |
4 |
Log: |
5 |
Version bump. |
6 |
|
7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key ) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-tex/biber/files/biber-1.9-drop-mozilla-ca.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/biber/files/biber-1.9-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.9-drop-mozilla-ca.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: biber-1.9-drop-mozilla-ca.patch |
16 |
=================================================================== |
17 |
From f31062a94aefff64cc193aa3a394fd3a623c2aa7 Mon Sep 17 00:00:00 2001 |
18 |
From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@××××.eu> |
19 |
Date: Thu, 29 May 2014 14:23:06 +0200 |
20 |
Subject: [PATCH] Remove Mozilla::CA dependency. |
21 |
|
22 |
|
23 |
diff --git a/Build.PL b/Build.PL |
24 |
index 3ea589b..76acdc7 100644 |
25 |
--- a/Build.PL |
26 |
+++ b/Build.PL |
27 |
@@ -49,7 +49,6 @@ my $builder = $class->new( |
28 |
'IPC::Run3' => 0, |
29 |
'List::AllUtils' => 0, |
30 |
'List::MoreUtils' => 0, |
31 |
- 'Mozilla::CA' => '20130114', |
32 |
'Regexp::Common' => 0, |
33 |
'Log::Log4perl' => 0, |
34 |
'Unicode::Collate' => '1.04', |
35 |
diff --git a/META.json b/META.json |
36 |
index cf91a91..1855294 100644 |
37 |
--- a/META.json |
38 |
+++ b/META.json |
39 |
@@ -44,7 +44,6 @@ |
40 |
"List::AllUtils" : "0", |
41 |
"List::MoreUtils" : "0", |
42 |
"Log::Log4perl" : "0", |
43 |
- "Mozilla::CA" : "20130114", |
44 |
"Regexp::Common" : "0", |
45 |
"Text::BibTeX" : "0.69", |
46 |
"URI" : "0", |
47 |
diff --git a/META.yml b/META.yml |
48 |
index 7091ddb..82706ee 100644 |
49 |
--- a/META.yml |
50 |
+++ b/META.yml |
51 |
@@ -114,7 +114,6 @@ requires: |
52 |
List::AllUtils: 0 |
53 |
List::MoreUtils: 0 |
54 |
Log::Log4perl: 0 |
55 |
- Mozilla::CA: 20130114 |
56 |
Regexp::Common: 0 |
57 |
Text::BibTeX: 0.69 |
58 |
URI: 0 |
59 |
diff --git a/bin/biber b/bin/biber |
60 |
index 6038535..4c3ea1c 100755 |
61 |
--- a/bin/biber |
62 |
+++ b/bin/biber |
63 |
@@ -73,7 +73,6 @@ GetOptions( |
64 |
'sortfirstinits=s', |
65 |
'sortlocale|l=s', |
66 |
'sortupper=s', |
67 |
- 'ssl-nointernalca', |
68 |
'ssl-noverify-host', |
69 |
'tool', |
70 |
'tool_align|tool-align', # legacy alias for output_align |
71 |
@@ -664,12 +663,6 @@ default sorting (B<--collate|-C>). When |
72 |
using B<--fastsort|-f>, your OS collation locale determines |
73 |
this and this option is ignored (default is true). |
74 |
|
75 |
-=item B<--ssl-nointernalca> |
76 |
- |
77 |
-Don't try to use the default Mozilla CA certificates when using HTTPS to fetch remote data. |
78 |
-This assumes that the user will set one of the perl LWP::UserAgent module environment variables |
79 |
-to find the CA certs. |
80 |
- |
81 |
=item B<--ssl-noverify-host> |
82 |
|
83 |
Turn off host verification when using HTTPS to fetch remote data sources. |
84 |
diff --git a/data/schemata/config.rnc b/data/schemata/config.rnc |
85 |
index e798733..5fcce6d 100644 |
86 |
--- a/data/schemata/config.rnc |
87 |
+++ b/data/schemata/config.rnc |
88 |
@@ -72,7 +72,6 @@ start = element config { |
89 |
map+ |
90 |
}+ |
91 |
}? & |
92 |
- element ssl-nointernalca { "0" | "1" }? & |
93 |
element ssl-noverify-host { "0" | "1" }? & |
94 |
element tool { "0" | "1" }? & |
95 |
element tool_config { text }? & |
96 |
diff --git a/data/schemata/config.rng b/data/schemata/config.rng |
97 |
index 185cde6..f7e4176 100644 |
98 |
--- a/data/schemata/config.rng |
99 |
+++ b/data/schemata/config.rng |
100 |
@@ -335,14 +335,6 @@ |
101 |
</element> |
102 |
</optional> |
103 |
<optional> |
104 |
- <element name="ssl-nointernalca"> |
105 |
- <choice> |
106 |
- <value>0</value> |
107 |
- <value>1</value> |
108 |
- </choice> |
109 |
- </element> |
110 |
- </optional> |
111 |
- <optional> |
112 |
<element name="ssl-noverify-host"> |
113 |
<choice> |
114 |
<value>0</value> |
115 |
diff --git a/lib/Biber/Input/file/biblatexml.pm b/lib/Biber/Input/file/biblatexml.pm |
116 |
index d3f7377..21b1471 100644 |
117 |
--- a/lib/Biber/Input/file/biblatexml.pm |
118 |
+++ b/lib/Biber/Input/file/biblatexml.pm |
119 |
@@ -97,19 +97,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/bibtex.pm b/lib/Biber/Input/file/bibtex.pm |
140 |
index 33185a6..f3fd9f2 100644 |
141 |
--- a/lib/Biber/Input/file/bibtex.pm |
142 |
+++ b/lib/Biber/Input/file/bibtex.pm |
143 |
@@ -140,19 +140,6 @@ sub extract_entries { |
144 |
else { |
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/endnotexml.pm b/lib/Biber/Input/file/endnotexml.pm |
164 |
index 14adc38..b880e8a 100644 |
165 |
--- a/lib/Biber/Input/file/endnotexml.pm |
166 |
+++ b/lib/Biber/Input/file/endnotexml.pm |
167 |
@@ -111,19 +111,6 @@ sub extract_entries { |
168 |
$logger->info("Data source '$source' is a remote EndNote XML datasource - fetching ..."); |
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/ris.pm b/lib/Biber/Input/file/ris.pm |
188 |
index 0dbeacc..dda7466 100644 |
189 |
--- a/lib/Biber/Input/file/ris.pm |
190 |
+++ b/lib/Biber/Input/file/ris.pm |
191 |
@@ -110,19 +110,6 @@ sub extract_entries { |
192 |
else { |
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 |
diff --git a/lib/Biber/Input/file/zoterordfxml.pm b/lib/Biber/Input/file/zoterordfxml.pm |
212 |
index 0d05d2b..79ba19e 100644 |
213 |
--- a/lib/Biber/Input/file/zoterordfxml.pm |
214 |
+++ b/lib/Biber/Input/file/zoterordfxml.pm |
215 |
@@ -123,19 +123,6 @@ sub extract_entries { |
216 |
$logger->info("Data source '$source' is a remote Zotero RDF/XML data source - fetching ..."); |
217 |
if ($1) { # HTTPS |
218 |
# use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues |
219 |
- # We have to explicitly set the cert path because otherwise the https module |
220 |
- # can't find the .pem when PAR::Packer'ed |
221 |
- # Have to explicitly try to require Mozilla::CA here to get it into %INC below |
222 |
- # It may, however, have been removed by some biber unpacked dists |
223 |
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and |
224 |
- not exists($ENV{PERL_LWP_SSL_CA_PATH}) and |
225 |
- not defined(Biber::Config->getoption('ssl-nointernalca')) and |
226 |
- eval {require Mozilla::CA}) { |
227 |
- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem |
228 |
- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} ); |
229 |
- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/' |
230 |
- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem'); |
231 |
- } |
232 |
|
233 |
# fallbacks for, e.g., linux |
234 |
unless (exists($ENV{PERL_LWP_SSL_CA_FILE})) { |
235 |
-- |
236 |
2.0.0 |