Sync up with Digest-MD5-2.38 from CPAN

p4raw-id: //depot/perl@34854

5 files changed, 30 insertions, 11 deletions

diff --git a/ext/Digest/MD5/Changes b/ext/Digest/MD5/Changes
index c4d7d1fa6f..3d1c72390f 100644
--- a/ext/Digest/MD5/Changes
+++ b/ext/Digest/MD5/Changes
@@ -1,3 +1,16 @@
+2008-11-14   Gisle Aas <gisle@ActiveState.com>
+
+   Release 2.38
+
+   The 2.37 tarball was infected by various '._*' files.
+   Thank you, Mac OS X!
+
+   Applied warning fix from Geoff Richards [RT#19643]
+
+   Applied compatiblity fix from Alexandr Ciornii [RT#30348]
+
+
+
 2008-11-12   Gisle Aas <gisle@ActiveState.com>
 
    Release 2.37
diff --git a/ext/Digest/MD5/MD5.pm b/ext/Digest/MD5/MD5.pm
index 32fc1aa965..0f536bb20a 100644
--- a/ext/Digest/MD5/MD5.pm
+++ b/ext/Digest/MD5/MD5.pm
@@ -3,7 +3,7 @@ package Digest::MD5;
 use strict;
 use vars qw($VERSION @ISA @EXPORT_OK);
 
-$VERSION = '2.37';
+$VERSION = '2.38';
 
 require Exporter;
 *import = \&Exporter::import;
diff --git a/ext/Digest/MD5/MD5.xs b/ext/Digest/MD5/MD5.xs
index 9f3689d66a..a743b05a69 100644
--- a/ext/Digest/MD5/MD5.xs
+++ b/ext/Digest/MD5/MD5.xs
@@ -709,6 +709,11 @@ md5(...)
 		if (len == 11 && memEQ("Digest::MD5", data, 11)) {
 		    msg = "probably called as class method";
 		}
+		else if (SvROK(ST(0))) {
+		    SV* sv = SvRV(ST(0));
+		    if (SvOBJECT(sv) && strEQ(HvNAME(SvSTASH(sv)), "Digest::MD5"))
+		        msg = "probably called as method";
+		}
 	    }
 	    if (msg) {
 	        const char *f = (ix == F_BIN) ? "md5" :
diff --git a/ext/Digest/MD5/Makefile.PL b/ext/Digest/MD5/Makefile.PL
index a3f79dadfc..7ce7da5b8c 100644
--- a/ext/Digest/MD5/Makefile.PL
+++ b/ext/Digest/MD5/Makefile.PL
@@ -1,6 +1,5 @@
 #!perl -w
 
-BEGIN { require 5.006 }
 use strict;
 use Config qw(%Config);
 use ExtUtils::MakeMaker;
@@ -21,12 +20,14 @@ if ($^O eq 'VMS') {
 
 push(@extra, 'INSTALLDIRS'  => 'perl') if $] >= 5.008;
 push(@extra, 'MAN3PODS' => {}) if $PERL_CORE; # Pods built by installman.
+push @extra, 'LICENSE' => 'perl' if $ExtUtils::MakeMaker::VERSION >= "6.30";
 
 WriteMakefile(
     'NAME'	   => 'Digest::MD5',
     'VERSION_FROM' => 'MD5.pm',
     'PREREQ_PM'    => { 'File::Spec' => 0,
 			'Digest::base' => '1.00',
+			'XSLoader' => 0,
 		      },
     @extra,
     'dist'         => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
diff --git a/ext/Digest/MD5/t/files.t b/ext/Digest/MD5/t/files.t
index 4c41b3279e..5f2f7926e3 100644
--- a/ext/Digest/MD5/t/files.t
+++ b/ext/Digest/MD5/t/files.t
@@ -20,27 +20,27 @@ use Digest::MD5 qw(md5 md5_hex md5_base64);
 my $EXPECT;
 if (ord "A" == 193) { # EBCDIC
     $EXPECT = <<EOT;
-f383935aa6f80a5eada3a365e0240db5  Changes
+0b24bb575ac412fcb1754132d1a61996  Changes
 11e8028ee426273db6b6db270a8bb38c  README
-4c1cbf9fd2ca3611f8f76c0bc559bb91  MD5.pm
-a6763f297e6346a0c541de105819b01c  MD5.xs
+9fe023c06a5fe656107519eb59dd51ab  MD5.pm
+6e556382813f67120863f4f91b7fcdc2  MD5.xs
 276da0aa4e9a08b7fe09430c9c5690aa  rfc1321.txt
 EOT
 } elsif ("\n" eq "\015") { # MacOS
     $EXPECT = <<EOT;
-531c4466c0d2e510628584f47fc5a589  Changes
+cac133d6a295c650bd31af946919c72c  Changes
 c95549c6c5e1e1c078b27042f1dc850f  README
-58437b1015d43f47d78c37a2e06bc70c  MD5.pm
-dd630942214a791a56d18f477f8e423e  MD5.xs
+95fe334a197cbb038728ea17fae9896d  MD5.pm
+7aa380c810bc7c1a0bec22cf32bc50d4  MD5.xs
 754b9db19f79dbc4992f7166eb0f37ce  rfc1321.txt
 EOT
 } else {
     # This is the output of: 'md5sum Changes README MD5.pm MD5.xs rfc1321.txt'
     $EXPECT = <<EOT;
-b3fdcedb2f50b051c2a9a9009b36ae57  Changes
+1a3a086dfdcf13dd940ac88e0f57aad8  Changes
 c95549c6c5e1e1c078b27042f1dc850f  README
-58437b1015d43f47d78c37a2e06bc70c  MD5.pm
-dd630942214a791a56d18f477f8e423e  MD5.xs
+95fe334a197cbb038728ea17fae9896d  MD5.pm
+7aa380c810bc7c1a0bec22cf32bc50d4  MD5.xs
 754b9db19f79dbc4992f7166eb0f37ce  rfc1321.txt
 EOT
 }