Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 340353 | Differences between
and this patch

Collapse All | Expand All

(-)bin/biber.orig (-7 lines)
Lines 65-71 Link Here
65
           'sortfirstinits=s',
65
           'sortfirstinits=s',
66
           'sortlocale|l=s',
66
           'sortlocale|l=s',
67
           'sortupper=s',
67
           'sortupper=s',
68
           'ssl-nointernalca',
69
           'ssl-noverify-host',
68
           'ssl-noverify-host',
70
           'tool',
69
           'tool',
71
           'tool_align',
70
           'tool_align',
Lines 552-563 Link Here
552
using B<--fastsort|-f>, your OS collation locale determines
551
using B<--fastsort|-f>, your OS collation locale determines
553
this and this option is ignored (default is true).
552
this and this option is ignored (default is true).
554
553
555
=item B<--ssl-nointernalca>
556
557
Don't try to use the default Mozilla CA certificates when using HTTPS to fetch remote data.
558
This assumes that the user will set one of the perl LWP::UserAgent module environment variables
559
to find the CA certs.
560
561
=item B<--ssl-noverify-host>
554
=item B<--ssl-noverify-host>
562
555
563
Turn off host verification when using HTTPS to fetch remote data sources.
556
Turn off host verification when using HTTPS to fetch remote data sources.
(-)data/schemata/config.rnc.orig (-1 lines)
Lines 52-58 Link Here
52
      map+
52
      map+
53
    }+
53
    }+
54
  }? &
54
  }? &
55
  element ssl-nointernalca     { "0" | "1" }? &
56
  element ssl-noverify-host    { "0" | "1" }? &
55
  element ssl-noverify-host    { "0" | "1" }? &
57
  element tool                 { "0" | "1" }? &
56
  element tool                 { "0" | "1" }? &
58
  element tool_align           { "0" | "1" }? &
57
  element tool_align           { "0" | "1" }? &
(-)data/schemata/config.rng.orig (-8 lines)
Lines 254-267 Link Here
254
          </element>
254
          </element>
255
        </optional>
255
        </optional>
256
        <optional>
256
        <optional>
257
          <element name="ssl-nointernalca">
258
            <choice>
259
              <value>0</value>
260
              <value>1</value>
261
            </choice>
262
          </element>
263
        </optional>
264
        <optional>
265
          <element name="ssl-noverify-host">
257
          <element name="ssl-noverify-host">
266
            <choice>
258
            <choice>
267
              <value>0</value>
259
              <value>0</value>
(-)lib/Biber/Input/file/biblatexml.pm.orig (-10 lines)
Lines 84-99 Link Here
84
    $logger->info("Data source '$filename' is a remote .xml - fetching ...");
84
    $logger->info("Data source '$filename' is a remote .xml - fetching ...");
85
    if ($1) { # HTTPS
85
    if ($1) { # HTTPS
86
      # use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
86
      # use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
87
      # We have to explicitly set the cert path because otherwise the https module
88
      # can't find the .pem when PAR::Packer'ed
89
      if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
90
          not defined(Biber::Config->getoption('ssl-nointernalca'))) {
91
        require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
92
        # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
93
        (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
94
        $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
95
        $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
96
      }
97
      if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
87
      if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
98
          $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
88
          $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
99
      }
89
      }
(-)lib/Biber/Input/file/bibtex.pm.orig (-10 lines)
Lines 125-140 Link Here
125
    $logger->info("Data source '$source' is a remote BibTeX data source - fetching ...");
125
    $logger->info("Data source '$source' is a remote BibTeX data source - fetching ...");
126
    if ($1) { # HTTPS
126
    if ($1) { # HTTPS
127
      # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
127
      # use IO::Socket::SSL qw(debug99); # useful for debugging SSL issues
128
      # We have to explicitly set the cert path because otherwise the https module
129
      # can't find the .pem when PAR::Packer'ed
130
      if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
131
          not defined(Biber::Config->getoption('ssl-nointernalca'))) {
132
        require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
133
        # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
134
        (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
135
        $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
136
        $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
137
      }
138
      if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
128
      if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
139
          $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
129
          $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
140
      }
130
      }
(-)lib/Biber/Input/file/endnotexml.pm.orig (-10 lines)
Lines 102-117 Link Here
102
    $logger->info("Data source '$source' is a remote EndNote XML datasource - fetching ...");
102
    $logger->info("Data source '$source' is a remote EndNote XML datasource - fetching ...");
103
    if ($1) { # HTTPS
103
    if ($1) { # HTTPS
104
      # use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
104
      # use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
105
      # We have to explicitly set the cert path because otherwise the https module
106
      # can't find the .pem when PAR::Packer'ed
107
      if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
108
          not defined(Biber::Config->getoption('ssl-nointernalca'))) {
109
        require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
110
        # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
111
        (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
112
        $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
113
        $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
114
      }
115
      if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
105
      if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
116
          $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
106
          $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
117
      }
107
      }
(-)lib/Biber/Input/file/ris.pm.orig (-10 lines)
Lines 97-112 Link Here
97
    $logger->info("Data source '$source' is a remote RIS data source - fetching ...");
97
    $logger->info("Data source '$source' is a remote RIS data source - fetching ...");
98
    if ($1) { # HTTPS
98
    if ($1) { # HTTPS
99
      # use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
99
      # use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
100
      # We have to explicitly set the cert path because otherwise the https module
101
      # can't find the .pem when PAR::Packer'ed
102
      if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
103
          not defined(Biber::Config->getoption('ssl-nointernalca'))) {
104
        require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
105
        # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
106
        (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
107
        $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
108
        $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
109
      }
110
      if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
100
      if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
111
          $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
101
          $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
112
      }
102
      }
(-)lib/Biber/Input/file/zoterordfxml.pm.orig (-10 lines)
Lines 114-129 Link Here
114
    $logger->info("Data source '$source' is a remote Zotero RDF/XML data source - fetching ...");
114
    $logger->info("Data source '$source' is a remote Zotero RDF/XML data source - fetching ...");
115
    if ($1) { # HTTPS
115
    if ($1) { # HTTPS
116
      # use IO::Socket::SSL qw(debug4); # useful for debugging SSL issues
116
      # use IO::Socket::SSL qw(debug4); # 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
      if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
120
          not defined(Biber::Config->getoption('ssl-nointernalca'))) {
121
        require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
122
        # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
123
        (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
124
        $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
125
        $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
126
      }
127
      if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
117
      if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
128
          $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
118
          $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
129
      }
119
      }
(-)Build.PL.orig (-1 lines)
Lines 65-71 Link Here
65
        'Business::ISBN' => 0,
65
        'Business::ISBN' => 0,
66
        'Business::ISSN' => 0,
66
        'Business::ISSN' => 0,
67
        'Business::ISMN' => 0,
67
        'Business::ISMN' => 0,
68
        'Mozilla::CA' => 0,
69
        'perl' => '5.16.0'
68
        'perl' => '5.16.0'
70
    },
69
    },
71
    recommends => {
70
    recommends => {
(-)META.json.orig (-1 lines)
Lines 48-54 Link Here
48
            "List::AllUtils" : "0",
48
            "List::AllUtils" : "0",
49
            "List::MoreUtils" : "0",
49
            "List::MoreUtils" : "0",
50
            "Log::Log4perl" : "0",
50
            "Log::Log4perl" : "0",
51
            "Mozilla::CA" : "0",
52
            "Regexp::Common" : "0",
51
            "Regexp::Common" : "0",
53
            "Text::BibTeX" : "0.66",
52
            "Text::BibTeX" : "0.66",
54
            "URI" : "0",
53
            "URI" : "0",
(-)META.yml.orig (-1 lines)
Lines 83-89 Link Here
83
  List::AllUtils: 0
83
  List::AllUtils: 0
84
  List::MoreUtils: 0
84
  List::MoreUtils: 0
85
  Log::Log4perl: 0
85
  Log::Log4perl: 0
86
  Mozilla::CA: 0
87
  Regexp::Common: 0
86
  Regexp::Common: 0
88
  Text::BibTeX: 0.66
87
  Text::BibTeX: 0.66
89
  URI: 0
88
  URI: 0

Return to bug 340353