[SCM] Packaging of IO::Socket::INET6 in Debian branch, master, updated. libio-socket-inet6-perl/2.67-11-gd302258
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Nov 28 19:35:05 UTC 2011
The following commit has been merged in the master branch:
commit 2a20ed486b09d3e322bccafc4aab132592cee8ea
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Mon Nov 28 11:20:19 2011 -0500
Imported Upstream version 2.69
diff --git a/Build.PL b/Build.PL
index b6ae19a..338de45 100644
--- a/Build.PL
+++ b/Build.PL
@@ -32,7 +32,7 @@ my $build = Test::Run::Builder->new(
{
resources =>
{
- repository => "http://svn.berlios.de/svnroot/repos/web-cpan/IO-Socket-INET6/",
+ repository => "https://bitbucket.org/shlomif/perl-io-socket-inet6",
},
keywords =>
[
diff --git a/ChangeLog b/ChangeLog
index 05bacb6..1870f46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
+2011-11-28 Shlomi Fish <shlomif at shlomifish.org>
+ * Fix the imports on t/io_multihomed6.t .
+ - Fixes https://rt.cpan.org/Ticket/Display.html?id=72769 again.
+ * Update the link to the repository in Build.PL.
+ * New Release IO-Socket-INET6-2.69
+
+2011-11-28 Shlomi Fish <shlomif at shlomifish.org>
+ * Solved symbol clashes in t/io_multihomed6.t .
+ - Fixes https://rt.cpan.org/Ticket/Display.html?id=72769
+ * New Release IO-Socket-INET6-2.68
+
2011-01-21 Shlomi Fish <shlomif at iglu.org.il>
* IO-Socket is doing some imports so we now do use IO::Socket ().
- Fixed the rest of the imports.
* Thanks to LeoNerd
- * New Release IO-Socket-INET6-2.7
+ * New Release IO-Socket-INET6-2.67
2011-01-13 Shlomi Fish <shlomif at iglu.org.il>
* Made the use Socket call import constants selectively, and not rely
diff --git a/MANIFEST b/MANIFEST
index 881c1b7..b5b5cd7 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -15,3 +15,4 @@ t/io_udp6.t
t/listen_port_only.t
t/pod-coverage.t
t/pod.t
+META.json
diff --git a/META.json b/META.json
new file mode 100644
index 0000000..eeba8f7
--- /dev/null
+++ b/META.json
@@ -0,0 +1,69 @@
+{
+ "abstract" : "Object interface for AF_INET|AF_INET6 domain sockets",
+ "author" : [
+ "This program is based on L<IO::Socket::INET> by Graham Barr\n<gbarr at pobox.com> and currently maintained by the Perl Porters.",
+ "Modified by Rafael Martinez Torres <rafael.martinez at novagnet.com> and\nEuro6IX project.",
+ "Modified further by Shlomi Fish <shlomif at iglu.org.il>, while disclaiming\nall copyrights."
+ ],
+ "dynamic_config" : 1,
+ "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112621",
+ "keywords" : [
+ "inet6",
+ "input",
+ "internet",
+ "ipv6",
+ "network",
+ "networking",
+ "output",
+ "socket",
+ "sockets"
+ ],
+ "license" : [
+ "perl_5"
+ ],
+ "meta-spec" : {
+ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+ "version" : "2"
+ },
+ "name" : "IO-Socket-INET6",
+ "prereqs" : {
+ "build" : {
+ "requires" : {
+ "Test::More" : 0
+ }
+ },
+ "configure" : {
+ "requires" : {
+ "Module::Build" : "0.36"
+ }
+ },
+ "runtime" : {
+ "requires" : {
+ "Carp" : 0,
+ "Errno" : 0,
+ "Exporter" : 0,
+ "IO::Socket" : 0,
+ "Socket" : 0,
+ "Socket6" : "0.12",
+ "strict" : 0,
+ "warnings" : 0
+ }
+ }
+ },
+ "provides" : {
+ "IO::Socket::INET6" : {
+ "file" : "lib/IO/Socket/INET6.pm",
+ "version" : "2.69"
+ }
+ },
+ "release_status" : "stable",
+ "resources" : {
+ "license" : [
+ "http://dev.perl.org/licenses/"
+ ],
+ "repository" : {
+ "url" : "https://bitbucket.org/shlomif/perl-io-socket-inet6"
+ }
+ },
+ "version" : "2.69"
+}
diff --git a/META.yml b/META.yml
index a9bea37..04be293 100644
--- a/META.yml
+++ b/META.yml
@@ -8,7 +8,8 @@ build_requires:
Test::More: 0
configure_requires:
Module::Build: 0.36
-generated_by: 'Module::Build version 0.3617'
+dynamic_config: 1
+generated_by: 'Module::Build version 0.38, CPAN::Meta::Converter version 2.112621'
keywords:
- inet6
- input
@@ -27,7 +28,7 @@ name: IO-Socket-INET6
provides:
IO::Socket::INET6:
file: lib/IO/Socket/INET6.pm
- version: 2.67
+ version: 2.69
requires:
Carp: 0
Errno: 0
@@ -39,5 +40,5 @@ requires:
warnings: 0
resources:
license: http://dev.perl.org/licenses/
- repository: http://svn.berlios.de/svnroot/repos/web-cpan/IO-Socket-INET6/
-version: 2.67
+ repository: https://bitbucket.org/shlomif/perl-io-socket-inet6
+version: 2.69
diff --git a/Makefile.PL b/Makefile.PL
index 0e2454f..9393f25 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,22 +1,22 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.36_17
+# Note: this file was auto-generated by Module::Build::Compat version 0.3800
use ExtUtils::MakeMaker;
WriteMakefile
(
- 'NAME' => 'IO::Socket::INET6',
- 'VERSION_FROM' => 'lib/IO/Socket/INET6.pm',
- 'PREREQ_PM' => {
- 'Carp' => 0,
- 'Errno' => 0,
- 'Exporter' => 0,
- 'IO::Socket' => 0,
- 'Socket' => 0,
- 'Socket6' => '0.12',
- 'Test::More' => 0,
- 'strict' => 0,
- 'warnings' => 0
- },
- 'INSTALLDIRS' => 'site',
- 'EXE_FILES' => [],
- 'PL_FILES' => {}
- )
+ 'PL_FILES' => {},
+ 'INSTALLDIRS' => 'site',
+ 'NAME' => 'IO::Socket::INET6',
+ 'EXE_FILES' => [],
+ 'VERSION_FROM' => 'lib/IO/Socket/INET6.pm',
+ 'PREREQ_PM' => {
+ 'warnings' => 0,
+ 'Exporter' => 0,
+ 'Carp' => 0,
+ 'strict' => 0,
+ 'Test::More' => 0,
+ 'Socket6' => '0.12',
+ 'IO::Socket' => 0,
+ 'Socket' => 0,
+ 'Errno' => 0
+ }
+)
;
diff --git a/lib/IO/Socket/INET6.pm b/lib/IO/Socket/INET6.pm
index 502dbc1..565e032 100644
--- a/lib/IO/Socket/INET6.pm
+++ b/lib/IO/Socket/INET6.pm
@@ -41,7 +41,7 @@ use Carp;
use Errno;
@ISA = qw(IO::Socket);
-$VERSION = "2.67";
+$VERSION = "2.69";
#Purpose: allow protocol independent protocol and original interface.
my $EINVAL = exists(&Errno::EINVAL) ? Errno::EINVAL() : 1;
diff --git a/t/io_multihomed6.t b/t/io_multihomed6.t
index 804c6dd..8d637e7 100644
--- a/t/io_multihomed6.t
+++ b/t/io_multihomed6.t
@@ -40,8 +40,22 @@ BEGIN {
# check that localhost resolves to 127.0.0.1 and ::1
# otherwise the test will not work
-use Socket;
-use Socket6;
+
+use Socket (qw(
+ AF_INET6 PF_INET6 SOCK_RAW SOCK_STREAM INADDR_ANY SOCK_DGRAM
+ AF_INET SO_REUSEADDR SO_REUSEPORT AF_UNSPEC SO_BROADCAST
+ sockaddr_in unpack_sockaddr_in
+ )
+);
+
+# IO::Socket and Socket already import stuff here - possibly AF_INET6
+# and PF_INET6 so selectively import things from Socket6.
+use Socket6 (
+ qw(AI_PASSIVE getaddrinfo
+ sockaddr_in6 unpack_sockaddr_in6 pack_sockaddr_in6_all in6addr_any
+ inet_ntop
+ )
+);
{
my %resolved_addresses;
@@ -70,7 +84,9 @@ use Socket6;
}
}
-use IO::Socket::INET6;
+# IO::Socket has an import method that is inherited by IO::Socket::INET6 ,
+# and so we should instruct it not to import anything.
+use IO::Socket::INET6 ();
$| = 1;
print "1..8\n";
--
Packaging of IO::Socket::INET6 in Debian
More information about the Pkg-perl-cvs-commits
mailing list