Update IO-Socket-IP to CPAN version 0.28

  [DELTA]

0.28    2014/02/10 16:17:59
        [CHANGES]
         * Renamed internal _configure method to _io_socket_ip__configure to
           avoid clashes with modules that try to subclass IO::Socket::INET

        [BUGFIXES]
         * Disable AI_ADDRCONFIG during one-sided 'v6 tests as sometimes it
           would otherwise fail
         * Skip the SO_BROADCAST test on OSes that fail with EACCES (RT92502)

8 files changed, 28 insertions, 10 deletions

diff --git a/cpan/IO-Socket-IP/Changes b/cpan/IO-Socket-IP/Changes
index 7f2624e955..ef3f7388d3 100644
--- a/cpan/IO-Socket-IP/Changes
+++ b/cpan/IO-Socket-IP/Changes
@@ -1,5 +1,15 @@
 Revision history for IO-Socket-IP
 
+0.28    2014/02/10 16:17:59
+        [CHANGES]
+         * Renamed internal _configure method to _io_socket_ip__configure to
+           avoid clashes with modules that try to subclass IO::Socket::INET
+
+        [BUGFIXES]
+         * Disable AI_ADDRCONFIG during one-sided 'v6 tests as sometimes it
+           would otherwise fail
+         * Skip the SO_BROADCAST test on OSes that fail with EACCES (RT92502)
+
 0.27    2014/01/20 18:08:31
         [BUGFIXES]
          * Apply a short timeout to unit tests that probe for internet
diff --git a/cpan/IO-Socket-IP/META.json b/cpan/IO-Socket-IP/META.json
index 2bc1290a7d..66b1744ced 100644
--- a/cpan/IO-Socket-IP/META.json
+++ b/cpan/IO-Socket-IP/META.json
@@ -29,7 +29,7 @@
    "provides" : {
       "IO::Socket::IP" : {
          "file" : "lib/IO/Socket/IP.pm",
-         "version" : "0.27"
+         "version" : "0.28"
       }
    },
    "release_status" : "stable",
@@ -38,5 +38,5 @@
          "http://dev.perl.org/licenses/"
       ]
    },
-   "version" : "0.27"
+   "version" : "0.28"
 }
diff --git a/cpan/IO-Socket-IP/META.yml b/cpan/IO-Socket-IP/META.yml
index 7aa66badfd..9e8bb03ddd 100644
--- a/cpan/IO-Socket-IP/META.yml
+++ b/cpan/IO-Socket-IP/META.yml
@@ -14,10 +14,10 @@ name: IO-Socket-IP
 provides:
   IO::Socket::IP:
     file: lib/IO/Socket/IP.pm
-    version: 0.27
+    version: 0.28
 requires:
   IO::Socket: 0
   Socket: 1.97
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.27
+version: 0.28
diff --git a/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm b/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm
index 11ecf3bf4e..44d057f6aa 100644
--- a/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm
+++ b/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm
@@ -7,7 +7,7 @@ package IO::Socket::IP;
 # $VERSION needs to be set before  use base 'IO::Socket'
 #  - https://rt.cpan.org/Ticket/Display.html?id=92107
 BEGIN {
-   $VERSION = '0.27';
+   $VERSION = '0.28';
 }
 
 use strict;
@@ -364,10 +364,11 @@ sub configure
       }
    }
 
-   $self->_configure( $arg );
+   $self->_io_socket_ip__configure( $arg );
 }
 
-sub _configure
+# Avoid simply calling it _configure, as some subclasses of IO::Socket::INET on CPAN already take that
+sub _io_socket_ip__configure
 {
    my $self = shift;
    my ( $arg ) = @_;
diff --git a/cpan/IO-Socket-IP/t/04local-client-v6.t b/cpan/IO-Socket-IP/t/04local-client-v6.t
index 5c55367c4b..ae265f91c8 100644
--- a/cpan/IO-Socket-IP/t/04local-client-v6.t
+++ b/cpan/IO-Socket-IP/t/04local-client-v6.t
@@ -49,6 +49,7 @@ foreach my $socktype (qw( SOCK_STREAM SOCK_DGRAM )) {
       PeerHost    => "::1",
       PeerService => $testport,
       Type        => Socket->$socktype,
+      GetAddrInfoFlags => 0, # disable AI_ADDRCONFIG
    );
 
    ok( defined $socket, "IO::Socket::IP->new constructs a $socktype socket" ) or
diff --git a/cpan/IO-Socket-IP/t/05local-server-v6.t b/cpan/IO-Socket-IP/t/05local-server-v6.t
index 2be2683805..22ee59e3ce 100644
--- a/cpan/IO-Socket-IP/t/05local-server-v6.t
+++ b/cpan/IO-Socket-IP/t/05local-server-v6.t
@@ -34,6 +34,7 @@ foreach my $socktype (qw( SOCK_STREAM SOCK_DGRAM )) {
       ( $socktype eq "SOCK_STREAM" ? ( Listen => 1 ) : () ),
       LocalHost => "::1",
       Type      => Socket->$socktype,
+      GetAddrInfoFlags => 0, # disable AI_ADDRCONFIG
    );
 
    ok( defined $testserver, "IO::Socket::IP->new constructs a $socktype socket" ) or
diff --git a/cpan/IO-Socket-IP/t/10args.t b/cpan/IO-Socket-IP/t/10args.t
index ea02da0e8d..8d46861196 100644
--- a/cpan/IO-Socket-IP/t/10args.t
+++ b/cpan/IO-Socket-IP/t/10args.t
@@ -19,7 +19,7 @@ sub arguments_is {
       no warnings 'redefine';
       my $args;
 
-      local *IO::Socket::IP::_configure = sub {
+      local *IO::Socket::IP::_io_socket_ip__configure = sub {
          $args = $_[1];
          return $_[0];
       };
diff --git a/cpan/IO-Socket-IP/t/11sockopts.t b/cpan/IO-Socket-IP/t/11sockopts.t
index 40e74a2eb7..90f92ae7bd 100644
--- a/cpan/IO-Socket-IP/t/11sockopts.t
+++ b/cpan/IO-Socket-IP/t/11sockopts.t
@@ -7,6 +7,7 @@ use Test::More;
 
 use IO::Socket::IP;
 
+use Errno qw( EACCES );
 use Socket qw( SOL_SOCKET SO_REUSEADDR SO_REUSEPORT SO_BROADCAST );
 
 TODO: {
@@ -43,12 +44,16 @@ SKIP: {
    ok( $sock->getsockopt( SOL_SOCKET, SO_REUSEPORT ), 'SO_REUSEPORT set' );
 }
 
-{
+SKIP: {
+   # Some OSes need special privileges to set SO_BROADCAST
+   $! = 0;
    my $sock = IO::Socket::IP->new(
       LocalHost => "127.0.0.1",
       Type      => SOCK_DGRAM,
       Broadcast => 1,
-   ) or die "Cannot socket() - $@";
+   );
+   skip "Privileges required to set broadcast on datagram socket", 1 if !$sock and $! == EACCES;
+   die "Cannot socket() - $@" unless $sock;
 
    ok( $sock->getsockopt( SOL_SOCKET, SO_BROADCAST ), 'SO_BROADCAST set' );
 }