In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/b645f34b48106e987fe160514a9283f50958f0ed?hp=515cd85501e76e0c8589149b947b4df800dd9cb3>
- Log ----------------------------------------------------------------- commit b645f34b48106e987fe160514a9283f50958f0ed Author: Chris 'BinGOs' Williams <[email protected]> Date: Sun Jul 4 20:02:28 2010 +0100 Fix Digest-MD5 tests to run properly under core M cpan/Digest-MD5/t/align.t M cpan/Digest-MD5/t/files.t M cpan/Digest-MD5/t/md5-aaa.t commit 326fafaa3831cf61bbca838de6cca26aea3cacbe Author: Chris 'BinGOs' Williams <[email protected]> Date: Sun Jul 4 16:46:01 2010 +0100 Update Digest-MD5 to CPAN version 2.40 [DELTA] 2010-07-03 Gisle Aas <[email protected]> Release 2.40 Marc Pignat (1): Safer alignment test [RT#35823] Robin Barker (1): consting in new ext/ Gisle Aas (1): Remove the MacOS branch of this test M Porting/Maintainers.pl M cpan/Digest-MD5/Changes M cpan/Digest-MD5/MD5.pm M cpan/Digest-MD5/MD5.xs M cpan/Digest-MD5/Makefile.PL M cpan/Digest-MD5/t/align.t M cpan/Digest-MD5/t/files.t M cpan/Digest-MD5/t/md5-aaa.t ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- cpan/Digest-MD5/Changes | 15 +++++++++++++++ cpan/Digest-MD5/MD5.pm | 2 +- cpan/Digest-MD5/MD5.xs | 2 +- cpan/Digest-MD5/Makefile.PL | 34 +++++++++++++++++++++++++++++++--- cpan/Digest-MD5/t/files.t | 19 +++---------------- 6 files changed, 52 insertions(+), 22 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 5395d4b..95a15ec 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -467,7 +467,7 @@ use File::Glob qw(:case); 'Digest::MD5' => { 'MAINTAINER' => 'gaas', - 'DISTRIBUTION' => 'GAAS/Digest-MD5-2.39.tar.gz', + 'DISTRIBUTION' => 'GAAS/Digest-MD5-2.40.tar.gz', 'FILES' => q[cpan/Digest-MD5], 'EXCLUDED' => [ qw{rfc1321.txt} ], 'UPSTREAM' => undef, diff --git a/cpan/Digest-MD5/Changes b/cpan/Digest-MD5/Changes index 277a27e..756716c 100644 --- a/cpan/Digest-MD5/Changes +++ b/cpan/Digest-MD5/Changes @@ -1,3 +1,18 @@ +2010-07-03 Gisle Aas <[email protected]> + + Release 2.40 + + Marc Pignat (1): + Safer alignment test [RT#35823] + + Robin Barker (1): + consting in new ext/ + + Gisle Aas (1): + Remove the MacOS branch of this test + + + 2009-06-09 Gisle Aas <[email protected]> Release 2.39 diff --git a/cpan/Digest-MD5/MD5.pm b/cpan/Digest-MD5/MD5.pm index 4e2adbe..ca17ad4 100644 --- a/cpan/Digest-MD5/MD5.pm +++ b/cpan/Digest-MD5/MD5.pm @@ -3,7 +3,7 @@ package Digest::MD5; use strict; use vars qw($VERSION @ISA @EXPORT_OK); -$VERSION = '2.39'; +$VERSION = '2.40'; require Exporter; *import = \&Exporter::import; diff --git a/cpan/Digest-MD5/MD5.xs b/cpan/Digest-MD5/MD5.xs index a743b05..89e39d2 100644 --- a/cpan/Digest-MD5/MD5.xs +++ b/cpan/Digest-MD5/MD5.xs @@ -694,7 +694,7 @@ md5(...) MD5Init(&ctx); if (DOWARN) { - char *msg = 0; + const char *msg = 0; if (items == 1) { if (SvROK(ST(0))) { SV* sv = SvRV(ST(0)); diff --git a/cpan/Digest-MD5/Makefile.PL b/cpan/Digest-MD5/Makefile.PL index 0a3a016..f8fd182 100644 --- a/cpan/Digest-MD5/Makefile.PL +++ b/cpan/Digest-MD5/Makefile.PL @@ -17,15 +17,21 @@ if ($^O eq 'VMS') { } push(@extra, 'INSTALLDIRS' => 'perl') if $] >= 5.008; -push @extra, 'LICENSE' => 'perl' if eval($ExtUtils::MakeMaker::VERSION) >= "6.30"; WriteMakefile( 'NAME' => 'Digest::MD5', 'VERSION_FROM' => 'MD5.pm', + 'ABSTRACT' => 'Perl interface to the MD-5 algorithm', + 'AUTHOR' => 'Gisle Aas <[email protected]>', + 'LICENSE' => 'perl', + 'MIN_PERL_VERSION' => 5.006, 'PREREQ_PM' => { 'File::Spec' => 0, 'Digest::base' => '1.00', 'XSLoader' => 0, }, + 'META_MERGE' => { + repository => 'http://github.com/gisle/digest-md5', + }, @extra, 'dist' => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', }, ); @@ -73,8 +79,8 @@ sub free_u32_alignment int main(int argc, char** argv, char** env) { #if BYTEORDER == 0x1234 || BYTEORDER == 0x4321 - U8 buf[] = "\0\0\0\1\0\0\0\0"; - U32 *up; + volatile U8 buf[] = "\0\0\0\1\0\0\0\0"; + volatile U32 *up; int i; if (sizeof(U32) != 4) { @@ -144,3 +150,25 @@ EOT print "signal $rc\n" if $rc && $rc < 0x80; return 0; } + +BEGIN { + # compatibility with older versions of MakeMaker + my $developer = -d ".git"; + my %mm_req = ( + LICENCE => 6.31, + META_MERGE => 6.45, + META_ADD => 6.45, + MIN_PERL_VERSION => 6.48, + ); + undef(*WriteMakefile); + *WriteMakefile = sub { + my %arg = @_; + for (keys %mm_req) { + unless (eval { ExtUtils::MakeMaker->VERSION($mm_req{$_}) }) { + warn "$_ $@" if $developer; + delete $arg{$_}; + } + } + ExtUtils::MakeMaker::WriteMakefile(%arg); + }; +} diff --git a/cpan/Digest-MD5/t/files.t b/cpan/Digest-MD5/t/files.t index 9da8895..54cf4f4 100644 --- a/cpan/Digest-MD5/t/files.t +++ b/cpan/Digest-MD5/t/files.t @@ -1,3 +1,4 @@ + print "1..3\n"; use strict; @@ -8,26 +9,19 @@ use Digest::MD5 qw(md5 md5_hex md5_base64); # (You'll need to have Perl 5.7.3 or later, to have the Encode installed.) # (And remember that under the Perl core distribution you should # also have the $ENV{PERL_CORE} set to a true value.) -# Similarly, to update MacOS section, run with $ENV{MAC_MD5SUM} set. my $EXPECT; if (ord "A" == 193) { # EBCDIC $EXPECT = <<EOT; 11e8028ee426273db6b6db270a8bb38c README -6e556382813f67120863f4f91b7fcdc2 MD5.xs +c13b305ff761095dea11ea1e74e5c7ec MD5.xs 276da0aa4e9a08b7fe09430c9c5690aa rfc1321.txt EOT -} elsif ("\n" eq "\015") { # MacOS - $EXPECT = <<EOT; -c95549c6c5e1e1c078b27042f1dc850f README -7aa380c810bc7c1a0bec22cf32bc50d4 MD5.xs -754b9db19f79dbc4992f7166eb0f37ce rfc1321.txt -EOT } else { # This is the output of: 'md5sum README MD5.xs rfc1321.txt' $EXPECT = <<EOT; c95549c6c5e1e1c078b27042f1dc850f README -7aa380c810bc7c1a0bec22cf32bc50d4 MD5.xs +4ae6c261478df35a192cc1bdffd5211f MD5.xs 754b9db19f79dbc4992f7166eb0f37ce rfc1321.txt EOT } @@ -67,13 +61,6 @@ for (split /^/, $EXPECT) { print md5_hex($data), " $base\n"; next; } - if ($ENV{MAC_MD5SUM}) { - require Encode; - my $data = cat_file($file); - Encode::from_to($data, 'latin1', 'MacRoman'); - print md5_hex($data), " $base\n"; - next; - } my $md5bin = pack("H*", $md5hex); my $md5b64; if ($B64) { -- Perl5 Master Repository
