aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-05-09 14:00:48 -0400
committerJoey Hess <joey@kitenet.net>2011-05-09 14:00:48 -0400
commit825f81340a823c9626839fbba574e5a3d7c409fa (patch)
treec010115b80fcb15b576eeb225f03e7ad3e1b9060
parentcb252846903c034feae1921f75236f784793f080 (diff)
downloadikiwiki-825f81340a823c9626839fbba574e5a3d7c409fa.tar
ikiwiki-825f81340a823c9626839fbba574e5a3d7c409fa.tar.gz
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.
-rw-r--r--Bundle/IkiWiki/Extras.pm1
-rw-r--r--IkiWiki/Plugin/aggregate.pm1
-rw-r--r--IkiWiki/Plugin/pinger.pm2
-rw-r--r--debian/changelog2
-rw-r--r--debian/control2
5 files changed, 7 insertions, 1 deletions
diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm
index 30bc8eee4..070305731 100644
--- a/Bundle/IkiWiki/Extras.pm
+++ b/Bundle/IkiWiki/Extras.pm
@@ -35,6 +35,7 @@ Term::ReadLine::Gnu
HTML::Tree
Sort::Naturally
Gravatar::URL
+Net::INET6Glue
=head1 AUTHOR
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index e00116759..4a704617e 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -498,6 +498,7 @@ sub needsaggregate () {
}
sub aggregate (@) {
+ eval q{use Net::INET6Glue::INET_is_INET6}; # may not be available
eval q{use XML::Feed};
error($@) if $@;
eval q{use URI::Fetch};
diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index 932619496..ea4f3e0dc 100644
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -67,6 +67,8 @@ sub ping {
if (! $pinged && %pages) {
$pinged=1;
+ eval q{use Net::INET6Glue::INET_is_INET6}; # may not be available
+
my $ua;
eval q{use LWPx::ParanoidAgent};
if (!$@) {
diff --git a/debian/changelog b/debian/changelog
index fc8fafc70..723882b40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (3.20110431) UNRELEASED; urgency=low
* Add conflict with libyaml-libyaml-perl, since that library does
not support utf8. Closes: #625713
(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
diff --git a/debian/control b/debian/control
index 616963216..c7d7e6544 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl,
libtext-csv-perl, graphviz, libnet-amazon-s3-perl,
libsparkline-php, texlive, dvipng, libtext-wikicreole-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
Replaces: ikiwiki-plugin-table
Provides: ikiwiki-plugin-table