aggregate, pinger: Use Net::INET6Glue if available to support making ipv6 connections.

Making outgoing ipv6 connections for openid auth is still broken; the glue
module does not seem to solve that, so I did not make openid use it.
master
Joey Hess 2011-05-09 14:00:48 -04:00
parent cb25284690
commit 825f81340a
5 changed files with 7 additions and 1 deletions

View File

@ -35,6 +35,7 @@ Term::ReadLine::Gnu
HTML::Tree HTML::Tree
Sort::Naturally Sort::Naturally
Gravatar::URL Gravatar::URL
Net::INET6Glue
=head1 AUTHOR =head1 AUTHOR

View File

@ -498,6 +498,7 @@ sub needsaggregate () {
} }
sub aggregate (@) { sub aggregate (@) {
eval q{use Net::INET6Glue::INET_is_INET6}; # may not be available
eval q{use XML::Feed}; eval q{use XML::Feed};
error($@) if $@; error($@) if $@;
eval q{use URI::Fetch}; eval q{use URI::Fetch};

View File

@ -67,6 +67,8 @@ sub ping {
if (! $pinged && %pages) { if (! $pinged && %pages) {
$pinged=1; $pinged=1;
eval q{use Net::INET6Glue::INET_is_INET6}; # may not be available
my $ua; my $ua;
eval q{use LWPx::ParanoidAgent}; eval q{use LWPx::ParanoidAgent};
if (!$@) { if (!$@) {

2
debian/changelog vendored
View File

@ -6,6 +6,8 @@ ikiwiki (3.20110431) UNRELEASED; urgency=low
* Add conflict with libyaml-libyaml-perl, since that library does * Add conflict with libyaml-libyaml-perl, since that library does
not support utf8. Closes: #625713 not support utf8. Closes: #625713
(see https://rt.cpan.org/Public/Bug/Display.html?id=54683) (see https://rt.cpan.org/Public/Bug/Display.html?id=54683)
* aggregate, pinger: Use Net::INET6Glue if available to
support making ipv6 connections.
-- Joey Hess <joeyh@debian.org> Thu, 05 May 2011 13:02:19 -0400 -- Joey Hess <joeyh@debian.org> Thu, 05 May 2011 13:02:19 -0400

2
debian/control vendored
View File

@ -38,7 +38,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
libtext-csv-perl, graphviz, libnet-amazon-s3-perl, libtext-csv-perl, graphviz, libnet-amazon-s3-perl,
libsparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsparkline-php, texlive, dvipng, libtext-wikicreole-perl,
libsort-naturally-perl, libtext-textile-perl, libhighlight-perl, libsort-naturally-perl, libtext-textile-perl, libhighlight-perl,
po4a (>= 0.35-1), gettext po4a (>= 0.35-1), gettext, libnet-inet6glue-perl
Conflicts: ikiwiki-plugin-table, libyaml-libyaml-perl Conflicts: ikiwiki-plugin-table, libyaml-libyaml-perl
Replaces: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table
Provides: ikiwiki-plugin-table Provides: ikiwiki-plugin-table