From: Jesse Vincent <jesse@bestpractical.com>
Date: Thu, 25 Mar 2010 15:06:19 +0000 (-0400)
Subject: Downgrade Socket.pm's new inet_ntop and inet_pton to EXPORT_OK rather
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d6896be36b2f69111e4e9922186c9c724cc0d038;p=p5sagit%2Fp5-mst-13.2.git

Downgrade Socket.pm's new inet_ntop and inet_pton to EXPORT_OK rather
than EXPORT as they're new functions which clobber symbols in downstream
CPAN modules.
---

diff --git a/dist/Module-CoreList/lib/Module/CoreList.pm b/dist/Module-CoreList/lib/Module/CoreList.pm
index 0f29d2e..0753272 100644
--- a/dist/Module-CoreList/lib/Module/CoreList.pm
+++ b/dist/Module-CoreList/lib/Module/CoreList.pm
@@ -2,7 +2,7 @@ package Module::CoreList;
 use strict;
 use vars qw/$VERSION %released %version %families %upstream
 	    %bug_tracker %deprecated/;
-$VERSION = '2.27';
+$VERSION = '2.28';
 
 =head1 NAME
 
@@ -13881,7 +13881,7 @@ for my $version ( sort { $a <=> $b } keys %released ) {
 	'SelectSaver'           => '1.02',
 	'SelfLoader'            => '1.17',
 	'Shell'                 => '0.72_01',
-	'Socket'                => '1.86',
+	'Socket'                => '1.87',
 	'Storable'              => '2.22',
 	'Switch'                => '2.16',
 	'Symbol'                => '1.07',
diff --git a/ext/B/t/concise-xs.t b/ext/B/t/concise-xs.t
index 8e51b88..20ecb55 100644
--- a/ext/B/t/concise-xs.t
+++ b/ext/B/t/concise-xs.t
@@ -218,8 +218,8 @@ my $testpkgs = {
 		    XS => [qw/ unpack_sockaddr_un unpack_sockaddr_in
 			   sockatmark sockaddr_family pack_sockaddr_un
 			   pack_sockaddr_in inet_ntoa inet_aton
-			   inet_ntop inet_pton
 			   /],
+            # skip inet_ntop and inet_pton as they're not exported by default
 		},
 };
 
diff --git a/ext/Socket/Socket.pm b/ext/Socket/Socket.pm
index 48ec516..d4042cd 100644
--- a/ext/Socket/Socket.pm
+++ b/ext/Socket/Socket.pm
@@ -1,7 +1,7 @@
 package Socket;
 
 our($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
-$VERSION = "1.86";
+$VERSION = "1.87";
 
 =head1 NAME
 
@@ -180,12 +180,16 @@ address family passed in).  The host string may be a string hostname, such
 as 'www.perl.org', or an IP address.  If using an IP address, the type of
 IP address must be consistant with the address family passed into the function.
 
+This function is not exported by default.
+
 =item inet_ntop ADDRESS_FAMILY, IP_ADDRESS
 
 Takes an address family, either AF_INET or AF_INET6, and a string 
 (an opaque string as returned by inet_aton() or inet_pton()) and
 translates it to an IPv4 or IPv6 address string.
 
+This function is not exported by default.
+
 =back
 
 =cut
@@ -198,7 +202,6 @@ use XSLoader ();
 @ISA = qw(Exporter);
 @EXPORT = qw(
 	inet_aton inet_ntoa
-	inet_pton inet_ntop
 	sockaddr_family
 	pack_sockaddr_in unpack_sockaddr_in
 	pack_sockaddr_un unpack_sockaddr_un
@@ -360,6 +363,9 @@ use XSLoader ();
 
 @EXPORT_OK = qw(CR LF CRLF $CR $LF $CRLF
 
+	       inet_pton
+	       inet_ntop
+
 	       IPPROTO_IP
 	       IPPROTO_IPV6
 	       IPPROTO_RAW