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.

diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm
index 30bc8eee4014e2b7bf571a3760ffe7fe565c6f60..07030573147e5cf5188af6144de1b74ea9a81690 100644 (file)
--- 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 e00116759cf2a6ccfa0ca1c42094a4cbe4e90fa4..4a704617eed44657282b1ea6bd93be0aeda9fcb7 100644 (file)
--- 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 932619496c3d3c7634cb1a550a920dae106140a2..ea4f3e0dc563bac69a999ed42b4884f48b1892a7 100644 (file)
--- 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 fc8fafc708c4ce8e971e512b74703005184ba92c..723882b40aaad2cc4a0b347604da38cdbe1ec19d 100644 (file)
--- 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 616963216eddb8da1c621aa046b5c0806f4f604c..c7d7e6544ffcf445963690aa6ede4b2c438017a5 100644 (file)
--- 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