aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-05-09 18:15:35 -0400
committerJoey Hess <joey@kitenet.net>2011-05-09 18:15:35 -0400
commitb2754fa27222e7cbc6ae7616ef80f4c70aa3d7d4 (patch)
treee912e5068e2db49c8c5b6e462890f54e5d812935
parent825f81340a823c9626839fbba574e5a3d7c409fa (diff)
downloadikiwiki-b2754fa27222e7cbc6ae7616ef80f4c70aa3d7d4.tar
ikiwiki-b2754fa27222e7cbc6ae7616ef80f4c70aa3d7d4.tar.gz
openid: also use Net::INET6Glue if available
-rw-r--r--IkiWiki/Plugin/openid.pm1
-rw-r--r--debian/changelog5
2 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index bd67384f2..bd2cfdc44 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -229,6 +229,7 @@ sub getobj ($$) {
my $q=shift;
my $session=shift;
+ eval q{use Net::INET6Glue::INET_is_INET6}; # may not be available
eval q{use Net::OpenID::Consumer};
error($@) if $@;
diff --git a/debian/changelog b/debian/changelog
index 723882b40..9765d5a3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ 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.
+ * openid, aggregate, pinger: Use Net::INET6Glue if available to
+ support making ipv6 connections. (Note that if LWPx::ParanoidAgent
+ is installed, it defeats this for openid.)
-- Joey Hess <joeyh@debian.org> Thu, 05 May 2011 13:02:19 -0400