In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/13975bd150072e4fd78d50cd9468bb92cf184f70?hp=044255daec5f194efc6dddea40775e10196ec9cc>
- Log ----------------------------------------------------------------- commit 13975bd150072e4fd78d50cd9468bb92cf184f70 Author: Chris 'BinGOs' Williams <[email protected]> Date: Fri Sep 16 21:18:45 2011 +0100 Update CPAN-Meta to CPAN version 2.112580 [DELTA] 2.112580 2011-09-15 10:53:59 America/New_York [BUGFIX] - Use UTF-8 mode for internal structure cloning to avoid bugs in Perl <= 5.8.6 (RT #70936) [Dagfinn Ilmari Mannsåker] M MANIFEST M Porting/Maintainers.pl M cpan/CPAN-Meta/Changes M cpan/CPAN-Meta/lib/CPAN/Meta.pm M cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm M cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm M cpan/CPAN-Meta/lib/CPAN/Meta/History.pm M cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm M cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm M cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm M cpan/CPAN-Meta/t/converter.t A cpan/CPAN-Meta/t/data/unicode.yml M pod/perldelta.pod commit 891b5d1e801a71f1f19eca67ec985b7b55f74aa1 Author: Chris 'BinGOs' Williams <[email protected]> Date: Fri Sep 16 21:02:58 2011 +0100 Update CPANPLUS to CPAN version 0.9111 [DELTA] Changes for 0.9111 Fri Sep 16 10:15:06 2011 ================================================ * Enhance CPANPLUS::Dist::MM Makefile/Makefile.PL age checking code to resolve some issues. M Porting/Maintainers.pl M cpan/CPANPLUS/lib/CPANPLUS.pm M cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm M cpan/CPANPLUS/lib/CPANPLUS/Internals.pm M cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm M pod/perldelta.pod ----------------------------------------------------------------------- Summary of changes: MANIFEST | 1 + Porting/Maintainers.pl | 4 ++-- cpan/CPAN-Meta/Changes | 13 ++++++++++--- cpan/CPAN-Meta/lib/CPAN/Meta.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm | 8 ++++---- cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/History.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm | 4 ++-- cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm | 4 ++-- cpan/CPAN-Meta/t/converter.t | 11 +++++++++++ .../CPAN-Meta/t/data/{META-1_4.yml => unicode.yml} | 2 +- cpan/CPANPLUS/lib/CPANPLUS.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm | 8 ++++++-- cpan/CPANPLUS/lib/CPANPLUS/Internals.pm | 2 +- cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm | 2 +- pod/perldelta.pod | 6 +++++- 17 files changed, 55 insertions(+), 28 deletions(-) copy cpan/CPAN-Meta/t/data/{META-1_4.yml => unicode.yml} (98%) diff --git a/MANIFEST b/MANIFEST index b952745..eee925c 100644 --- a/MANIFEST +++ b/MANIFEST @@ -362,6 +362,7 @@ cpan/CPAN-Meta/t/data/META-2.json cpan/CPAN-Meta/t/data/resources.yml cpan/CPAN-Meta/t/data/restricted-2.json cpan/CPAN-Meta/t/data/restrictive-1_4.yml +cpan/CPAN-Meta/t/data/unicode.yml cpan/CPAN-Meta/t/load-bad.t cpan/CPAN-Meta/t/meta-obj.t cpan/CPAN-Meta/t/no-index.t diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 8e06b40..bc386f1 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -462,7 +462,7 @@ use File::Glob qw(:case); 'CPANPLUS' => { 'MAINTAINER' => 'kane', - 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9110.tar.gz', + 'DISTRIBUTION' => 'BINGOS/CPANPLUS-0.9111.tar.gz', 'FILES' => q[cpan/CPANPLUS], 'EXCLUDED' => [ qr{^inc/}, qr{^t/dummy-.*\.hidden$}, @@ -496,7 +496,7 @@ use File::Glob qw(:case); 'CPAN::Meta' => { 'MAINTAINER' => 'dagolden', - 'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.112150.tar.gz', + 'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.112580.tar.gz', 'FILES' => q[cpan/CPAN-Meta], 'EXCLUDED' => [ qr/^xt/, diff --git a/cpan/CPAN-Meta/Changes b/cpan/CPAN-Meta/Changes index f91f71d..210cb49 100644 --- a/cpan/CPAN-Meta/Changes +++ b/cpan/CPAN-Meta/Changes @@ -1,5 +1,12 @@ Revision history for CPAN-Meta +2.112580 2011-09-15 10:53:59 America/New_York + + [BUGFIX] + + - Use UTF-8 mode for internal structure cloning to avoid bugs + in Perl <= 5.8.6 (RT #70936) [Dagfinn Ilmari Mannsåker] + 2.112150 2011-08-02 22:25:41 America/New_York [BUGFIX] @@ -124,7 +131,7 @@ Revision history for CPAN-Meta 2.110240 2011-01-24 16:28:25 EST5EDT - Reading JSON/YAML is delegated entirely to Parse::CPAN::Meta (1.4200) - + - JSON.pm is dropped as a prerequisite and JSON::PP is added to prepare for CPAN::Meta to be added to the Perl core @@ -138,7 +145,7 @@ Revision history for CPAN-Meta 2.102160 2010-08-04 12:27:10 EST5EDT - Fix bugtracker conversion bug (RT#60017) - + 2.101670 2010-06-15 21:02:42 EST5EDT - converting 1.x 'repository' field now puts converted url into the @@ -170,7 +177,7 @@ Revision history for CPAN-Meta 2.101590 2010-06-07 21:49:36 EST5EDT - - won't automatically add 'unknown' as repository type when converting; + - won't automatically add 'unknown' as repository type when converting; instead, will only add a repository type if a repository 'url' is present and it is of the 'svn:' or 'git:' scheme. diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta.pm b/cpan/CPAN-Meta/lib/CPAN/Meta.pm index 36f26d8..83feb31 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta; -our $VERSION = '2.112150'; # VERSION +our $VERSION = '2.112580'; # VERSION use Carp qw(carp croak); @@ -346,7 +346,7 @@ CPAN::Meta - the distribution metadata for a CPAN dist =head1 VERSION -version 2.112150 +version 2.112580 =head1 SYNOPSIS diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm index 9fedacb..e2c66ef 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Converter.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Converter; -our $VERSION = '2.112150'; # VERSION +our $VERSION = '2.112580'; # VERSION use CPAN::Meta::Validator; @@ -20,8 +20,8 @@ sub _dclone { local *UNIVERSAL::TO_JSON = sub { return "$_[0]" }; my $backend = Parse::CPAN::Meta->json_backend(); - return $backend->new->decode( - $backend->new->allow_blessed->convert_blessed->encode($ref) + return $backend->new->utf8->decode( + $backend->new->utf8->allow_blessed->convert_blessed->encode($ref) ); } @@ -1260,7 +1260,7 @@ CPAN::Meta::Converter - Convert CPAN distribution metadata structures =head1 VERSION -version 2.112150 +version 2.112580 =head1 SYNOPSIS diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm index fdec692..2ffd6e2 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Feature.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Feature; -our $VERSION = '2.112150'; # VERSION +our $VERSION = '2.112580'; # VERSION use CPAN::Meta::Prereqs; @@ -42,7 +42,7 @@ CPAN::Meta::Feature - an optional feature provided by a CPAN distribution =head1 VERSION -version 2.112150 +version 2.112580 =head1 DESCRIPTION diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm index 49a614b..8b6710e 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/History.pm @@ -3,7 +3,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::History; -our $VERSION = '2.112150'; # VERSION +our $VERSION = '2.112580'; # VERSION 1; @@ -20,7 +20,7 @@ CPAN::Meta::History - history of CPAN Meta Spec changes =head1 VERSION -version 2.112150 +version 2.112580 =head1 DESCRIPTION diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm index 5d1d1f0..4aae48f 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Prereqs.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Prereqs; -our $VERSION = '2.112150'; # VERSION +our $VERSION = '2.112580'; # VERSION use Carp qw(confess); @@ -149,7 +149,7 @@ CPAN::Meta::Prereqs - a set of distribution prerequisites by phase and type =head1 VERSION -version 2.112150 +version 2.112580 =head1 DESCRIPTION diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm index c5f8213..ed60a19 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm @@ -3,7 +3,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Spec; -our $VERSION = '2.112150'; # VERSION +our $VERSION = '2.112580'; # VERSION 1; @@ -20,7 +20,7 @@ CPAN::Meta::Spec - specification for CPAN distribution metadata =head1 VERSION -version 2.112150 +version 2.112580 =head1 SYNOPSIS diff --git a/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm b/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm index b9f9868..30acb9c 100644 --- a/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm +++ b/cpan/CPAN-Meta/lib/CPAN/Meta/Validator.pm @@ -2,7 +2,7 @@ use 5.006; use strict; use warnings; package CPAN::Meta::Validator; -our $VERSION = '2.112150'; # VERSION +our $VERSION = '2.112580'; # VERSION #--------------------------------------------------------------------------# @@ -838,7 +838,7 @@ CPAN::Meta::Validator - validate CPAN distribution metadata structures =head1 VERSION -version 2.112150 +version 2.112580 =head1 SYNOPSIS diff --git a/cpan/CPAN-Meta/t/converter.t b/cpan/CPAN-Meta/t/converter.t index 4bab817..372fd55 100644 --- a/cpan/CPAN-Meta/t/converter.t +++ b/cpan/CPAN-Meta/t/converter.t @@ -1,6 +1,7 @@ use strict; use warnings; use Test::More 0.88; +use utf8; use CPAN::Meta; use CPAN::Meta::Validator; @@ -174,4 +175,14 @@ for my $f ( reverse sort @files ) { ok( my $converted = $cmc->convert( version => 2 ), "conversion successful" ); } +# specific test for UTF-8 handling +{ + my $path = File::Spec->catfile('t','data','unicode.yml'); + my $original = CPAN::Meta->load_file( $path ) + or die "Couldn't load $path"; + ok( $original, "unicode.yml" ); + my @authors = $original->authors; + like( $authors[0], qr/Williåms/, "Unicode characters preserved in authors" ); +} + done_testing; diff --git a/cpan/CPAN-Meta/t/data/META-1_4.yml b/cpan/CPAN-Meta/t/data/unicode.yml similarity index 98% copy from cpan/CPAN-Meta/t/data/META-1_4.yml copy to cpan/CPAN-Meta/t/data/unicode.yml index 801f579..8aa5bca 100644 --- a/cpan/CPAN-Meta/t/data/META-1_4.yml +++ b/cpan/CPAN-Meta/t/data/unicode.yml @@ -1,7 +1,7 @@ --- abstract: 'Build and install Perl modules' author: - - 'Ken Williams <[email protected]>' + - 'Ken Williåms <[email protected]>' - "Development questions, bug reports, and patches should be sent to the\nModule-Build mailing list at <[email protected]>." build_requires: File::Temp: 0.15 diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm index 715be77..6a37717 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS.pm @@ -13,7 +13,7 @@ BEGIN { use vars qw( @EXPORT @ISA $VERSION ); @EXPORT = qw( shell fetch get install ); @ISA = qw( Exporter ); - $VERSION = "0.9110"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.9111"; #have to hardcode or cpan.org gets unhappy } ### purely for backward compatibility, so we can call it from the commandline: diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm index f031e2b..de3d138 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm @@ -418,8 +418,12 @@ sub prepare { ### Make (haha) sure that Makefile.PL is older than the Makefile ### we just generated. eval { - my $ftime = time - 4; - utime $ftime, $ftime, MAKEFILE_PL->( $cb->_safe_path( path => $dir ) ); + my $makestat = ( stat MAKEFILE->( $dir ) )[9]; + my $mplstat = ( stat MAKEFILE_PL->( $cb->_safe_path( path => $dir ) ) )[9]; + if ( $makestat < $mplstat ) { + my $ftime = $makestat - 60; + utime $ftime, $ftime, MAKEFILE_PL->( $cb->_safe_path( path => $dir ) ); + } }; ### start resolving prereqs ### diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm index 647da5a..f070b14 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm @@ -42,7 +42,7 @@ use vars qw[@ISA $VERSION]; CPANPLUS::Internals::Report ]; -$VERSION = "0.9110"; +$VERSION = "0.9111"; =pod diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm index d8ec275..2350615 100644 --- a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm +++ b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm @@ -26,7 +26,7 @@ local $Data::Dumper::Indent = 1; # for dumpering from ! BEGIN { use vars qw[ $VERSION @ISA ]; @ISA = qw[ CPANPLUS::Shell::_Base::ReadLine ]; - $VERSION = "0.9110"; + $VERSION = "0.9111"; } load CPANPLUS::Shell; diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 9c3de2d..352ae42 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -172,11 +172,15 @@ L<Archive::Tar> has been upgraded from version 1.76 to version 1.78. =item * +L<CPAN::Meta> has been upgraded from version 2.112150 to version 2.112580. + +=item * + L<CPAN::Meta::YAML> has been upgraded from version 0.003 to version 0.004. =item * -L<CPANPLUS> has been upgraded from version 0.9109 to version 0.9110. +L<CPANPLUS> has been upgraded from version 0.9109 to version 0.9111. =item * -- Perl5 Master Repository
