In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/7e9deda3926b2444b9d169a6fcbb8dd4444c9b56?hp=0a660800cec9a8840a32154f6d5191c619c1c49d>
- Log ----------------------------------------------------------------- commit 7e9deda3926b2444b9d169a6fcbb8dd4444c9b56 Author: Chris 'BinGOs' Williams <[email protected]> Date: Wed Dec 3 13:46:27 2014 +0000 Update IO-Socket-IP to CPAN version 0.34 [DELTA] 0.34 2014/12/03 00:04:56 [BUGFIXES] * Don't select() for read-readiness when waiting for non-blocking connect() because it upsets VMS (RT100654) M Porting/Maintainers.pl M cpan/IO-Socket-IP/lib/IO/Socket/IP.pm commit e8cc621e772e485dae710515a75d4e738b21e194 Author: Chris 'BinGOs' Williams <[email protected]> Date: Wed Dec 3 13:44:45 2014 +0000 Update Encode to CPAN version 2.66 [DELTA] $Revision: 2.66 $ $Date: 2014/12/02 23:30:34 $ ! bin/enc2xs Resolved RT#100656: enc2xs -C fails if URL::Encode::XS is installed https://rt.cpan.org/Ticket/Display.html?id=100656 M Porting/Maintainers.pl M cpan/Encode/Encode.pm M cpan/Encode/Encode.xs M cpan/Encode/bin/enc2xs ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 4 ++-- cpan/Encode/Encode.pm | 4 ++-- cpan/Encode/Encode.xs | 2 +- cpan/Encode/bin/enc2xs | 8 ++++---- cpan/IO-Socket-IP/lib/IO/Socket/IP.pm | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 5caeab2..03e73ee 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -390,7 +390,7 @@ use File::Glob qw(:case); }, 'Encode' => { - 'DISTRIBUTION' => 'DANKOGAI/Encode-2.65.tar.gz', + 'DISTRIBUTION' => 'DANKOGAI/Encode-2.66.tar.gz', 'FILES' => q[cpan/Encode], 'CUSTOMIZED' => [ qw( encoding.pm ) ], }, @@ -635,7 +635,7 @@ use File::Glob qw(:case); }, 'IO::Socket::IP' => { - 'DISTRIBUTION' => 'PEVANS/IO-Socket-IP-0.33.tar.gz', + 'DISTRIBUTION' => 'PEVANS/IO-Socket-IP-0.34.tar.gz', 'FILES' => q[cpan/IO-Socket-IP], 'EXCLUDED' => [ qr{^examples/}, diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm index aea332e..dd9a042 100644 --- a/cpan/Encode/Encode.pm +++ b/cpan/Encode/Encode.pm @@ -1,10 +1,10 @@ # -# $Id: Encode.pm,v 2.65 2014/11/27 14:02:45 dankogai Exp $ +# $Id: Encode.pm,v 2.66 2014/12/02 23:30:00 dankogai Exp $ # package Encode; use strict; use warnings; -our $VERSION = sprintf "%d.%02d", q$Revision: 2.65 $ =~ /(\d+)/g; +our $VERSION = sprintf "%d.%02d", q$Revision: 2.66 $ =~ /(\d+)/g; use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG}; use XSLoader (); XSLoader::load( __PACKAGE__, $VERSION ); diff --git a/cpan/Encode/Encode.xs b/cpan/Encode/Encode.xs index 8463cce..0f12a7c 100644 --- a/cpan/Encode/Encode.xs +++ b/cpan/Encode/Encode.xs @@ -1,5 +1,5 @@ /* - $Id: Encode.xs,v 2.32 2014/11/27 14:08:33 dankogai Exp dankogai $ + $Id: Encode.xs,v 2.32 2014/11/27 14:08:33 dankogai Exp $ */ #define PERL_NO_GET_CONTEXT diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs index bed415e..276a204 100644 --- a/cpan/Encode/bin/enc2xs +++ b/cpan/Encode/bin/enc2xs @@ -10,7 +10,7 @@ use warnings; use Getopt::Std; use Config; my @orig_ARGV = @ARGV; -our $VERSION = do { my @r = (q$Revision: 2.15 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +our $VERSION = do { my @r = (q$Revision: 2.16 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # These may get re-ordered. # RAW is a do_now as inserted by &enter @@ -1006,9 +1006,9 @@ sub make_configlocal_pm { $mod =~ s/.*\bEncode\b/Encode/o; $mod =~ s/\.pm\z//o; $mod =~ s,/,::,og; - warn qq{ require $mod;\n}; eval qq{ require $mod; }; - $@ and die "Can't require $mod: $@\n"; + return if $@; + warn qq{ require $mod;\n}; for my $enc ( Encode->encodings() ) { no warnings; $in_core{$enc} and next; @@ -1022,7 +1022,7 @@ sub make_configlocal_pm { $_ModLines .= qq(\$Encode::ExtModule{'$enc'} = "$LocalMod{$enc}";\n); } - warn $_ModLines; + warn $_ModLines if $_ModLines; $_LocalVer = _mkversion(); $_E2X = find_e2x(); $_Inc = $INC{"Encode.pm"}; diff --git a/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm b/cpan/IO-Socket-IP/lib/IO/Socket/IP.pm index d28f1de..a929fcd 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.33'; + $VERSION = '0.34'; } use strict; @@ -684,7 +684,7 @@ sub connect } my $vec = ''; vec( $vec, $self->fileno, 1 ) = 1; - if( !select( $vec, $vec, $vec, $timeout ) ) { + if( !select( undef, $vec, $vec, $timeout ) ) { $! = ETIMEDOUT; return undef; } -- Perl5 Master Repository
