r51780 - in /branches/upstream/libsocket-getaddrinfo-perl/current: Build.PL Changes LICENSE META.yml Makefile.PL README lib/Socket/GetAddrInfo.pm
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Jan 30 01:29:14 UTC 2010
Author: jawnsy-guest
Date: Sat Jan 30 01:29:08 2010
New Revision: 51780
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=51780
Log:
[svn-upgrade] Integrating new upstream version, libsocket-getaddrinfo-perl (0.15)
Modified:
branches/upstream/libsocket-getaddrinfo-perl/current/Build.PL
branches/upstream/libsocket-getaddrinfo-perl/current/Changes
branches/upstream/libsocket-getaddrinfo-perl/current/LICENSE
branches/upstream/libsocket-getaddrinfo-perl/current/META.yml
branches/upstream/libsocket-getaddrinfo-perl/current/Makefile.PL
branches/upstream/libsocket-getaddrinfo-perl/current/README
branches/upstream/libsocket-getaddrinfo-perl/current/lib/Socket/GetAddrInfo.pm
Modified: branches/upstream/libsocket-getaddrinfo-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocket-getaddrinfo-perl/current/Build.PL?rev=51780&op=diff
==============================================================================
--- branches/upstream/libsocket-getaddrinfo-perl/current/Build.PL (original)
+++ branches/upstream/libsocket-getaddrinfo-perl/current/Build.PL Sat Jan 30 01:29:08 2010
@@ -3,56 +3,10 @@
use Module::Build;
-eval { require ExtUtils::CBuilder; 1 } or
- die "OS unsupported - missing ExtUtils::CBuilder";
+eval { require ExtUtils::CChecker; 1 } or
+ die "OS unsupported - missing ExtUtils::CChecker";
my $HAVE_SOCKADDR_SA_LEN;
-
-sub try_compile_run
-{
- my ( $cbuilder, $name, $source ) = @_;
-
- my $test_source = "test-$name.c";
-
- open( my $test_source_fh, "> $test_source" ) or die "Cannot write $test_source - $!";
-
- print $test_source_fh $source;
-
- close $test_source_fh;
-
- my $test_obj = eval { $cbuilder->compile( source => $test_source ) };
-
- unlink $test_source;
-
- if( not defined $test_obj ) {
- print "\nFailed to compile $test_source\n";
- return 0;
- }
-
- print "Compiled $test_source to $test_obj\n\n";
-
- my $test_exe = eval { $cbuilder->link_executable( objects => $test_obj ) };
- END { defined $test_exe and -f $test_exe and unlink $test_exe; }
-
- unlink $test_obj;
-
- if( not defined $test_exe ) {
- print "\nFailed to link $test_obj to an executable\n";
- return 0;
- }
-
- print "Linked $test_obj to $test_exe\n\n";
-
- if( system( "./$test_exe" ) != 0 ) {
- print "\nFailed to run $test_exe\n";
- unlink $test_exe;
- return 0;
- }
-
- unlink $test_exe;
-
- return 1;
-}
sub Configure
{
@@ -61,10 +15,7 @@
return 0;
}
- my $cbuilder = ExtUtils::CBuilder->new();
-
- print "Detecting if the environment has a C compiler...\n";
- return 0 unless $cbuilder->have_compiler;
+ my $cc = ExtUtils::CChecker->new();
print "\nDetecting if libc supports getaddrinfo()...\n";
@@ -84,7 +35,7 @@
}
EOF
- return 0 unless try_compile_run( $cbuilder, "getaddrinfo", $gai_test );
+ return 0 unless $cc->try_compile_run( source => $gai_test );
print "\nLooks like the libc supports getaddrinfo()\n";
@@ -101,7 +52,7 @@
}
EOF
- $HAVE_SOCKADDR_SA_LEN = try_compile_run( $cbuilder, "sa_len", $sa_len_test );
+ $HAVE_SOCKADDR_SA_LEN = $cc->try_compile_run( source => $sa_len_test );
return 1;
}
@@ -114,21 +65,20 @@
dist_version_from => 'lib/Socket/GetAddrInfo.pm',
extra_compiler_flags => [ "-DHAVE_SOCKADDR_SA_LEN=$HAVE_SOCKADDR_SA_LEN" ],
requires => {
- },
- recommends => {
- },
+ 'XSLoader' => 0,
+ },
configure_requires => {
- 'ExtUtils::CBuilder' => 0,
+ 'ExtUtils::CChecker' => 0,
},
build_requires => {
- 'ExtUtils::CBuilder' => 0,
- 'Module::Build' => 0,
- 'Module::Build::Compat' => 0,
- 'Scalar::Util' => 0,
- 'Test::More' => 0,
- 'Test::Exception' => 0,
- 'Test::Warn' => 0,
- },
+ 'ExtUtils::CChecker' => 0,
+ 'Module::Build' => 0,
+ 'Module::Build::Compat' => 0,
+ 'Scalar::Util' => 0,
+ 'Test::More' => 0,
+ 'Test::Exception' => 0,
+ 'Test::Warn' => 0,
+ },
license => 'perl',
create_makefile_pl => 'small',
create_license => 1,
Modified: branches/upstream/libsocket-getaddrinfo-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocket-getaddrinfo-perl/current/Changes?rev=51780&op=diff
==============================================================================
--- branches/upstream/libsocket-getaddrinfo-perl/current/Changes (original)
+++ branches/upstream/libsocket-getaddrinfo-perl/current/Changes Sat Jan 30 01:29:08 2010
@@ -1,4 +1,9 @@
Revision history for Socket-GetAddrInfo
+
+0.15 CHANGES:
+ * Use XSLoader instead of DynaLoader
+ * import Exporter::import instead of @ISAing it
+ * Use ExtUtils::CChecker for build checking
0.14 BUGFIXES:
* Don't leak memory on getnameinfo() failures
Modified: branches/upstream/libsocket-getaddrinfo-perl/current/LICENSE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocket-getaddrinfo-perl/current/LICENSE?rev=51780&op=diff
==============================================================================
--- branches/upstream/libsocket-getaddrinfo-perl/current/LICENSE (original)
+++ branches/upstream/libsocket-getaddrinfo-perl/current/LICENSE Sat Jan 30 01:29:08 2010
@@ -1,5 +1,4 @@
-This software is copyright (c) 2009 by Paul Evans <leonerd at leonerd.org.uk> & With thanks to Zefram <zefram at fysh.org> for help with fixing some bugs in the
-XS code..
+This software is copyright (c) 2010 by Paul Evans <leonerd at leonerd.org.uk>.
This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
@@ -13,8 +12,7 @@
--- The GNU General Public License, Version 1, February 1989 ---
-This software is Copyright (c) 2009 by Paul Evans <leonerd at leonerd.org.uk> & With thanks to Zefram <zefram at fysh.org> for help with fixing some bugs in the
-XS code..
+This software is Copyright (c) 2010 by Paul Evans <leonerd at leonerd.org.uk>.
This is free software, licensed under:
@@ -272,8 +270,7 @@
--- The Artistic License 1.0 ---
-This software is Copyright (c) 2009 by Paul Evans <leonerd at leonerd.org.uk> & With thanks to Zefram <zefram at fysh.org> for help with fixing some bugs in the
-XS code..
+This software is Copyright (c) 2010 by Paul Evans <leonerd at leonerd.org.uk>.
This is free software, licensed under:
Modified: branches/upstream/libsocket-getaddrinfo-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocket-getaddrinfo-perl/current/META.yml?rev=51780&op=diff
==============================================================================
--- branches/upstream/libsocket-getaddrinfo-perl/current/META.yml (original)
+++ branches/upstream/libsocket-getaddrinfo-perl/current/META.yml Sat Jan 30 01:29:08 2010
@@ -1,19 +1,10 @@
---
-name: Socket-GetAddrInfo
-version: 0.14
+abstract: "RFC 2553's C<getaddrinfo> and C<getnameinfo>\nfunctions."
author:
- 'Paul Evans <leonerd at leonerd.org.uk>'
- - |-
- With thanks to Zefram <zefram at fysh.org> for help with fixing some bugs in the
- XS code.
-abstract: |-
- RFC 2553's C<getaddrinfo> and C<getnameinfo>
- functions.
-license: perl
-resources:
- license: http://dev.perl.org/licenses/
build_requires:
ExtUtils::CBuilder: 0
+ ExtUtils::CChecker: 0
Module::Build: 0
Module::Build::Compat: 0
Scalar::Util: 0
@@ -21,13 +12,20 @@
Test::More: 0
Test::Warn: 0
configure_requires:
- ExtUtils::CBuilder: 0
- Module::Build: 0.35
+ ExtUtils::CChecker: 0
+ Module::Build: 0.36
+generated_by: 'Module::Build version 0.3601'
+license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
+name: Socket-GetAddrInfo
provides:
Socket::GetAddrInfo:
file: lib/Socket/GetAddrInfo.pm
- version: 0.14
-generated_by: Module::Build version 0.35
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ version: 0.15
+requires:
+ XSLoader: 0
+resources:
+ license: http://dev.perl.org/licenses/
+version: 0.15
Modified: branches/upstream/libsocket-getaddrinfo-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocket-getaddrinfo-perl/current/Makefile.PL?rev=51780&op=diff
==============================================================================
--- branches/upstream/libsocket-getaddrinfo-perl/current/Makefile.PL (original)
+++ branches/upstream/libsocket-getaddrinfo-perl/current/Makefile.PL Sat Jan 30 01:29:08 2010
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.35
+# Note: this file was auto-generated by Module::Build::Compat version 0.3601
use Module::Build::Compat 0.02;
Module::Build::Compat->run_build_pl(args => \@ARGV);
Modified: branches/upstream/libsocket-getaddrinfo-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocket-getaddrinfo-perl/current/README?rev=51780&op=diff
==============================================================================
--- branches/upstream/libsocket-getaddrinfo-perl/current/README (original)
+++ branches/upstream/libsocket-getaddrinfo-perl/current/README Sat Jan 30 01:29:08 2010
@@ -194,9 +194,10 @@
* <http://tools.ietf.org/html/rfc2553> - Basic Socket Interface
Extensions for IPv6
+ACKNOWLEDGEMENTS
+ With thanks to Zefram <zefram at fysh.org> for help with fixing some bugs
+ in the XS code.
+
AUTHOR
Paul Evans <leonerd at leonerd.org.uk>
- With thanks to Zefram <zefram at fysh.org> for help with fixing some bugs
- in the XS code.
-
Modified: branches/upstream/libsocket-getaddrinfo-perl/current/lib/Socket/GetAddrInfo.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsocket-getaddrinfo-perl/current/lib/Socket/GetAddrInfo.pm?rev=51780&op=diff
==============================================================================
--- branches/upstream/libsocket-getaddrinfo-perl/current/lib/Socket/GetAddrInfo.pm (original)
+++ branches/upstream/libsocket-getaddrinfo-perl/current/lib/Socket/GetAddrInfo.pm Sat Jan 30 01:29:08 2010
@@ -8,32 +8,24 @@
use strict;
use warnings;
-use Exporter;
-use DynaLoader;
-
use Carp;
+
use Scalar::Util qw( dualvar );
my %errstr;
BEGIN {
- our @ISA = qw( Exporter );
- our $VERSION = "0.14";
+ our $VERSION = "0.15";
our @EXPORT = qw(
getaddrinfo
getnameinfo
);
- push @ISA, qw( DynaLoader ); # Must be last so we can pop it if necessary
-
- if( not $ENV{NO_GETADDRINFO_XS} and eval { __PACKAGE__->DynaLoader::bootstrap( $VERSION ); 1 } ) {
+ if( not $ENV{NO_GETADDRINFO_XS} and eval { require XSLoader; XSLoader::load( __PACKAGE__, $VERSION ); 1 } ) {
# Do nothing
}
else {
- # Not a DynaLoader any more
- pop @ISA;
-
*getaddrinfo = \&fake_getaddrinfo;
*getnameinfo = \&fake_getnameinfo;
@@ -160,8 +152,10 @@
return unless keys %symbols;
+ require Exporter;
+
local $Exporter::ExportLevel = $Exporter::ExportLevel + 1;
- $class->SUPER::import( keys %symbols );
+ Exporter::import( $class, keys %symbols );
}
=head1 FUNCTIONS
@@ -557,9 +551,11 @@
=back
-=head1 AUTHOR
-
-Paul Evans <leonerd at leonerd.org.uk>
+=head1 ACKNOWLEDGEMENTS
With thanks to Zefram <zefram at fysh.org> for help with fixing some bugs in the
XS code.
+
+=head1 AUTHOR
+
+Paul Evans <leonerd at leonerd.org.uk>
More information about the Pkg-perl-cvs-commits
mailing list