Merge branch 'sawyer/storable' into blead

7 files changed, 105 insertions, 6 deletions

diff --git a/dist/Storable/ChangeLog b/dist/Storable/ChangeLog
index 3f3076ac60..1e5e266344 100644
--- a/dist/Storable/ChangeLog
+++ b/dist/Storable/ChangeLog
@@ -1,3 +1,25 @@
+2018-04-27 20:40:00 xsawyerx
+    version 3.11
+        * Fix Strawberry Perl build failures.
+
+2018-04-21 22:00:00 xsawyerx
+    Version 3.10
+        * Fix binary artifacts from distribution.
+
+2018-04-21 16:49:00 xsawyerx
+    Version 3.09
+        * Fix "provides" in metadata (META.yml/META.json) to use the Storable
+          template instead of a small other file (which also didn't exist).
+
+2018-04-21 11:23:00 xsawyerx
+    Version 3.08
+        * (perl #132849) try to disable core files when deliberatly segfaulting.
+        * (perl #127743) don't probe Storable limits so much.
+        * (perl #132893) don't probe for Storable recursion limits on old Win32.
+        * (perl #132870) workaround VC2017 compiler bug.
+        * (perl #127743) re-work for debugging builds with MSVC.
+        * (perl #133039) dont build a Storable.so/.dll with a static perl build.
+
 2018-02-07 15:08:00 tonyc
     Version 3.06
 
diff --git a/dist/Storable/MANIFEST b/dist/Storable/MANIFEST
new file mode 100644
index 0000000000..144fe1b50b
--- /dev/null
+++ b/dist/Storable/MANIFEST
@@ -0,0 +1,66 @@
+__Storable__.pm
+ChangeLog
+hints/gnukfreebsd.pl
+hints/gnuknetbsd.pl
+hints/hpux.pl
+hints/linux.pl
+Makefile.PL
+MANIFEST			This list of files
+META.yml			Module meta-data (added by MakeMaker)
+ppport.h
+README
+stacksize
+Storable.pm.PL
+Storable.xs
+t/attach.t
+t/attach_errors.t
+t/attach_singleton.t
+t/blessed.t
+t/canonical.t
+t/circular_hook.t
+t/code.t
+t/compat01.t
+t/compat06.t
+t/croak.t
+t/CVE-2015-1592.inc
+t/CVE-2015-1592.t
+t/dclone.t
+t/destroy.t
+t/downgrade.t
+t/file_magic.t
+t/flags.t
+t/forgive.t
+t/freeze.t
+t/HAS_ATTACH.pm
+t/HAS_HOOK.pm
+t/HAS_OVERLOAD.pm
+t/huge.t
+t/hugeids.t
+t/integer.t
+t/interwork56.t
+t/just_plain_nasty.t
+t/leaks.t
+t/lock.t
+t/make_56_interwork.pl
+t/make_downgrade.pl
+t/make_overload.pl
+t/malice.t
+t/overload.t
+t/recurse.t
+t/regexp.t
+t/restrict.t
+t/retrieve.t
+t/robust.t
+t/sig_die.t
+t/st-dump.pl
+t/store.t
+t/testlib.pl
+t/threads.t
+t/tied.t
+t/tied_hook.t
+t/tied_items.t
+t/tied_reify.t
+t/tied_store.t
+t/utf8.t
+t/utf8hash.t
+t/weak.t
diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL
index 697750566d..a5d9e66891 100644
--- a/dist/Storable/Makefile.PL
+++ b/dist/Storable/Makefile.PL
@@ -7,21 +7,26 @@
 #
 
 use strict;
-use ExtUtils::MakeMaker;
+use warnings;
+use ExtUtils::MakeMaker 6.31;
 use Config;
 use File::Copy qw(move copy);
 use File::Spec;
 
 unlink "lib/Storable/Limit.pm";
 
+my $limit_pm = File::Spec->catfile('lib', 'Storable', 'Limit.pm');
+
 my $pm = { 'Storable.pm' => '$(INST_ARCHLIB)/Storable.pm' };
 unless ($ENV{PERL_CORE}) {
     # the core Makefile takes care of this for core builds
-    $pm->{"lib/Storable/Limit.pm"} = '$(INST_ARCHLIB)/Storable/Limit.pm';
+    $pm->{$limit_pm} = '$(INST_ARCHLIB)/Storable/Limit.pm';
 }
 
 WriteMakefile(
     NAME                => 'Storable',
+    AUTHOR              => 'Perl 5 Porters',
+    LICENSE             => 'perl',
     DISTNAME            => "Storable",
 # We now ship this in t/
 #    PREREQ_PM           => { 'Test::More' => '0.41' },
@@ -36,7 +41,7 @@ WriteMakefile(
                                { bugtracker => 'http://rt.perl.org/perlbug/' },
                             provides    => {
                                 'Storable'  => {
-                                    file        => 'Storable_pm.PL',
+                                    file        => '__Storable__.pm',
                                     version     => MM->parse_version('__Storable__.pm'),
                                 },
                             },
@@ -91,7 +96,6 @@ sub depend {
         $extra_deps = ' Storable.pm';
     }
     my $linktype = uc($_[0]->{LINKTYPE});
-    my $limit_pm = File::Spec->catfile('lib', 'Storable', 'Limit.pm');
     "
 $limit_pm : stacksize \$(INST_$linktype)$extra_deps
 	\$(MKPATH) \$(INST_LIB)
@@ -111,7 +115,7 @@ sub test {
     my $out = $self->SUPER::test(%attr);
 
     if ($ENV{PERL_CORE}) {
-        $out =~ s!^(test(?:db)?_(?:static|dynamic)\b.*)!$1 lib/Storable/Limit.pm!gm;
+        $out =~ s!^(test(?:db)?_(?:static|dynamic)\b.*)!$1 $limit_pm!gm;
     }
 
     $out;
diff --git a/dist/Storable/__Storable__.pm b/dist/Storable/__Storable__.pm
index 71c669daaf..48e6f452dc 100644
--- a/dist/Storable/__Storable__.pm
+++ b/dist/Storable/__Storable__.pm
@@ -27,7 +27,7 @@ our @EXPORT_OK = qw(
 
 our ($canonical, $forgive_me);
 
-our $VERSION = '3.08';
+our $VERSION = '3.11';
 
 our $recursion_limit;
 our $recursion_limit_hash;
diff --git a/dist/Storable/t/dclone.t b/dist/Storable/t/dclone.t
index af3d7f6abf..ce6c756a19 100644
--- a/dist/Storable/t/dclone.t
+++ b/dist/Storable/t/dclone.t
@@ -87,6 +87,8 @@ SKIP: {
 # Do not fail if Tie::Hash and/or Tie::StdHash is not available
     skip 'No Tie::StdHash available', 2
 	unless eval { require Tie::Hash; scalar keys %Tie::StdHash:: };
+    skip 'This version of perl has problems with Tie::StdHash', 2
+	if $] eq "5.008";
     tie my %tie, "Tie::StdHash" or die $!;
     $tie{array} = [1,2,3,4];
     $tie{hash} = {1,2,3,4};
diff --git a/dist/Storable/t/threads.t b/dist/Storable/t/threads.t
index 0bc2486991..0b34334cff 100644
--- a/dist/Storable/t/threads.t
+++ b/dist/Storable/t/threads.t
@@ -28,6 +28,10 @@ sub BEGIN {
         print "1..0 # Skip: no threads\n";
         exit 0;
     }
+    if ($] eq "5.008" || $] eq "5.010000") {
+        print "1..0 # Skip: threads unreliable in perl-$]\n";
+        exit 0;
+    }
     # - is \W, so can't use \b at start. Negative look ahead and look behind
     # works at start/end of string, or where preceded/followed by spaces
     if ($] == 5.008002 and eval q{ $Config{'ccflags'} =~ /(?<!\S)-DDEBUGGING(?!\S)/ }) {
diff --git a/mkppport.lst b/mkppport.lst
index a443daca1f..b3992c85a6 100644
--- a/mkppport.lst
+++ b/mkppport.lst
@@ -12,3 +12,4 @@ cpan/Win32API-File
 dist/IO
 dist/PathTools
 dist/Time-HiRes
+dist/Storable