This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Sort the list of IGNORABLES in Porting/Maintainers.pl
[perl5.git] / Porting / Maintainers.pl
index 0b95b1b..f48c124 100755 (executable)
@@ -103,11 +103,11 @@ use File::Glob qw(:case);
 @IGNORABLE = qw(
     .cvsignore .dualLivedDiffConfig .gitignore
     ANNOUNCE Announce Artistic AUTHORS BENCHMARK BUGS Build.PL
-    CHANGELOG ChangeLog Changelog CHANGES Changes COPYING Copying CREDITS
-    dist.ini GOALS HISTORY INSTALL INSTALL.SKIP LICENSE Makefile.PL
-    MANIFEST MANIFEST.SKIP META.yml MYMETA.yml META.json MYMETA.json
+    CHANGELOG ChangeLog Changelog CHANGES Changes CONTRIBUTING COPYING Copying
+    CREDITS dist.ini GOALS HISTORY INSTALL INSTALL.SKIP LICENSE Makefile.PL
+    MANIFEST MANIFEST.SKIP META.json META.yml MYMETA.json MYMETA.yml
     NEW NOTES perlcritic.rc ppport.h README README.PATCHING SIGNATURE
-    THANKS TODO Todo VERSION WHATSNEW CONTRIBUTING
+    THANKS TODO Todo VERSION WHATSNEW
 );
 
 # Each entry in the  %Modules hash roughly represents a distribution,
@@ -155,7 +155,10 @@ use File::Glob qw(:case);
 # If the file in blead matches the file in the tarball from CPAN,
 # Porting/core-cpan-diff will warn about it, as it indicates an expected
 # customization might have been lost when updating from upstream.  The
-# path should be relative to the distribution directory.
+# path should be relative to the distribution directory.  If the upstream
+# distribution should be modified to incorporate the change then be sure
+# to raise a ticket for it on rt.cpan.org and add a comment alongside the
+# list of CUSTOMIZED files noting the ticket number.
 
 # DEPRECATED contains the *first* version of Perl in which the module
 # was considered deprecated.  It should only be present if the module is
@@ -201,9 +204,8 @@ use File::Glob qw(:case);
 
     'Archive::Tar' => {
         'MAINTAINER'   => 'kane',
-        'DISTRIBUTION' => 'BINGOS/Archive-Tar-1.90.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/Archive-Tar-1.92.tar.gz',
         'FILES'        => q[cpan/Archive-Tar],
-        'EXCLUDED'     => ['Makefile.PL'],
         'UPSTREAM'     => 'cpan',
         'BUGS'         => 'bug-archive-tar@rt.cpan.org',
     },
@@ -223,7 +225,7 @@ use File::Glob qw(:case);
 
     'autodie' => {
         'MAINTAINER'   => 'pjf',
-        'DISTRIBUTION' => 'PJF/autodie-2.19.tar.gz',
+        'DISTRIBUTION' => 'PJF/autodie-2.20.tar.gz',
         'FILES'        => q[cpan/autodie],
         'EXCLUDED'     => [
             qr{^inc/Module/},
@@ -246,6 +248,12 @@ use File::Glob qw(:case);
                 t/system.t
                 )
         ],
+        'CUSTOMIZED'   => [
+            # Waiting to be merged upstream: see CPAN RT#88076
+            qw(        t/backcompat.t ),
+            # Waiting to be merged upstream: see CPAN RT#88444
+            qw(        t/utime.t ),
+        ],
         'UPSTREAM'   => 'cpan',
     },
 
@@ -324,7 +332,7 @@ use File::Glob qw(:case);
 
     'Carp' => {
         'MAINTAINER'   => 'zefram',
-        'DISTRIBUTION' => 'ZEFRAM/Carp-1.26.tar.gz',
+        'DISTRIBUTION' => 'ZEFRAM/Carp-1.32.tar.gz',
         'FILES'        => q[dist/Carp],
         'UPSTREAM'     => 'blead',
     },
@@ -351,7 +359,7 @@ use File::Glob qw(:case);
 
     'Compress::Raw::Bzip2' => {
         'MAINTAINER'   => 'pmqs',
-        'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.061.tar.gz',
+        'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.062.tar.gz',
         'FILES'        => q[cpan/Compress-Raw-Bzip2],
         'EXCLUDED'     => [
             qr{^t/Test/},
@@ -362,7 +370,7 @@ use File::Glob qw(:case);
 
     'Compress::Raw::Zlib' => {
         'MAINTAINER'   => 'pmqs',
-        'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.061.tar.gz',
+        'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.062.tar.gz',
 
         'FILES'    => q[cpan/Compress-Raw-Zlib],
         'EXCLUDED' => [
@@ -376,7 +384,7 @@ use File::Glob qw(:case);
 
     'Config::Perl::V' => {
         'MAINTAINER'   => 'hmbrand',
-        'DISTRIBUTION' => 'HMBRAND/Config-Perl-V-0.18.tgz',
+        'DISTRIBUTION' => 'HMBRAND/Config-Perl-V-0.19.tgz',
         'FILES'        => q[cpan/Config-Perl-V],
         'EXCLUDED'     => ['examples/show-v.pl'],
         'UPSTREAM'     => 'cpan',
@@ -406,7 +414,6 @@ use File::Glob qw(:case);
             qr{^inc/Test/},
             qr{^t/CPAN/authors/},
             qw( lib/CPAN/Admin.pm
-                Makefile.PL
                 scripts/cpan-mirrors
                 SlayMakefile
                 t/00signature.t
@@ -446,9 +453,11 @@ use File::Glob qw(:case);
         'UPSTREAM' => 'cpan',
     },
 
+    # Note: When updating CPAN-Meta the META.* files will need to be regenerated
+    # perl -Icpan/CPAN-Meta/lib Porting/makemeta
     'CPAN::Meta' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.131560.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.132140.tar.gz',
         'FILES'        => q[cpan/CPAN-Meta],
         'EXCLUDED'     => [
             qw(t/00-compile.t),
@@ -461,7 +470,7 @@ use File::Glob qw(:case);
 
     'CPAN::Meta::Requirements' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-Requirements-2.122.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-Requirements-2.123.tar.gz',
         'FILES'        => q[cpan/CPAN-Meta-Requirements],
         'EXCLUDED'     => [
             qw(t/00-compile.t),
@@ -492,7 +501,7 @@ use File::Glob qw(:case);
 
     'DB_File' => {
         'MAINTAINER'   => 'pmqs',
-        'DISTRIBUTION' => 'PMQS/DB_File-1.828.tar.gz',
+        'DISTRIBUTION' => 'PMQS/DB_File-1.829.tar.gz',
         'FILES'        => q[cpan/DB_File],
         'EXCLUDED'     => [
             qr{^patches/},
@@ -526,10 +535,10 @@ use File::Glob qw(:case);
 
     'Devel::PPPort' => {
         'MAINTAINER'   => 'mhx',
-        'DISTRIBUTION' => 'MHX/Devel-PPPort-3.20.tar.gz',
+        'DISTRIBUTION' => 'MHX/Devel-PPPort-3.21.tar.gz',
         'FILES'        => q[cpan/Devel-PPPort],
-        'EXCLUDED' => ['PPPort.pm'],    # we use PPPort_pm.PL instead
-        'UPSTREAM' => 'cpan',
+        'EXCLUDED'     => ['PPPort.pm'],    # we use PPPort_pm.PL instead
+        'UPSTREAM'     => undef, # rjbs has asked mhx to have blead be upstream
     },
 
     'diagnostics' => {
@@ -548,7 +557,7 @@ use File::Glob qw(:case);
 
     'Digest::MD5' => {
         'MAINTAINER'   => 'gaas',
-        'DISTRIBUTION' => 'GAAS/Digest-MD5-2.52.tar.gz',
+        'DISTRIBUTION' => 'GAAS/Digest-MD5-2.53.tar.gz',
         'FILES'        => q[cpan/Digest-MD5],
         'EXCLUDED'     => ['rfc1321.txt'],
         'UPSTREAM'     => "cpan",
@@ -556,7 +565,7 @@ use File::Glob qw(:case);
 
     'Digest::SHA' => {
         'MAINTAINER'   => 'mshelor',
-        'DISTRIBUTION' => 'MSHELOR/Digest-SHA-5.84.tar.gz',
+        'DISTRIBUTION' => 'MSHELOR/Digest-SHA-5.85.tar.gz',
         'FILES'        => q[cpan/Digest-SHA],
         'EXCLUDED'     => [
             qw( t/pod.t
@@ -589,7 +598,7 @@ use File::Glob qw(:case);
 
     'Encode' => {
         'MAINTAINER'   => 'dankogai',
-        'DISTRIBUTION' => 'DANKOGAI/Encode-2.51.tar.gz',
+        'DISTRIBUTION' => 'DANKOGAI/Encode-2.54.tar.gz',
         'FILES'        => q[cpan/Encode],
         'UPSTREAM'     => 'cpan',
     },
@@ -600,13 +609,7 @@ use File::Glob qw(:case);
         'FILES'        => q[cpan/encoding-warnings],
         'EXCLUDED'     => [
             qr{^inc/Module/},
-            qw( t/0-signature.t
-                Makefile.PL
-                MANIFEST
-                META.yml
-                README
-                SIGNATURE
-                ),
+            qw(t/0-signature.t),
         ],
         'UPSTREAM' => undef,
     },
@@ -634,25 +637,18 @@ use File::Glob qw(:case);
     'Exporter' => {
         'MAINTAINER'   => 'ferreira',
         'DISTRIBUTION' => 'TODDR/Exporter-5.68.tar.gz',
-        'FILES'        => q[lib/Exporter.pm
-                            lib/Exporter.t
-                            lib/Exporter/Heavy.pm
-                           ],
+        'FILES'        => q[dist/Exporter],
         'EXCLUDED' => [
             qw( t/pod.t
                 t/use.t
                 ),
         ],
-        'MAP' => {
-            't/'   => 'lib/',
-            'lib/' => 'lib/',
-        },
         'UPSTREAM' => 'blead',
     },
 
     'ExtUtils::CBuilder' => {
         'MAINTAINER'   => 'ambs',
-        'DISTRIBUTION' => 'DAGOLDEN/ExtUtils-CBuilder-0.280205.tar.gz',
+        'DISTRIBUTION' => 'AMBS/ExtUtils/ExtUtils-CBuilder-0.280210.tar.gz',
         'FILES'        => q[dist/ExtUtils-CBuilder],
         'UPSTREAM'     => 'blead',
     },
@@ -700,7 +696,7 @@ use File::Glob qw(:case);
 
     'ExtUtils::MakeMaker' => {
         'MAINTAINER'   => 'mschwern',
-        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-6.68.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-6.76.tar.gz',
         'FILES'        => q[cpan/ExtUtils-MakeMaker],
         'EXCLUDED'     => [
             qr{^t/lib/Test/},
@@ -714,7 +710,7 @@ use File::Glob qw(:case);
 
     'ExtUtils::Manifest' => {
         'MAINTAINER'   => 'p5p',
-        'DISTRIBUTION' => 'FLORA/ExtUtils-Manifest-1.61.tar.gz',
+        'DISTRIBUTION' => 'FLORA/ExtUtils-Manifest-1.63.tar.gz',
         'FILES'        => q[dist/ExtUtils-Manifest],
         'EXCLUDED'     => [qr(t/release-.*\.t)],
         'UPSTREAM'     => 'blead',
@@ -722,7 +718,7 @@ use File::Glob qw(:case);
 
     'ExtUtils::ParseXS' => {
         'MAINTAINER'   => 'smueller',
-        'DISTRIBUTION' => 'SMUELLER/ExtUtils-ParseXS-3.18.tar.gz',
+        'DISTRIBUTION' => 'SMUELLER/ExtUtils-ParseXS-3.22.tar.gz',
         'FILES'        => q[dist/ExtUtils-ParseXS],
         'UPSTREAM'     => 'blead',
     },
@@ -773,7 +769,7 @@ use File::Glob qw(:case);
 
     'File::Find' => {
         'MAINTAINER' => 'p5p',
-        'FILES'      => q[lib/File/Find.pm lib/File/Find],
+        'FILES'      => q[ext/File-Find],
         'UPSTREAM'   => 'blead',
     },
 
@@ -837,7 +833,6 @@ use File::Glob qw(:case);
         'DISTRIBUTION' => 'SMUELLER/Filter-Simple-0.88.tar.gz',
         'FILES'        => q[dist/Filter-Simple],
         'EXCLUDED'     => [
-            'Makefile.PL',
             qr{^demo/}
         ],
         'UPSTREAM' => 'blead',
@@ -866,6 +861,11 @@ use File::Glob qw(:case);
                 t/pod.t
                 t/sh.t
                 t/tee.t
+                t/z_kwalitee.t
+                t/z_meta.t
+                t/z_perl_minimum_version.t
+                t/z_pod-coverage.t
+                t/z_pod.t
                 ),
         ],
         'MAP' => {
@@ -897,7 +897,7 @@ use File::Glob qw(:case);
 
     'Getopt::Long' => {
         'MAINTAINER'   => 'jv',
-        'DISTRIBUTION' => 'JV/Getopt-Long-2.40.tar.gz',
+        'DISTRIBUTION' => 'JV/Getopt-Long-2.41.tar.gz',
         'FILES'        => q[cpan/Getopt-Long],
         'EXCLUDED'     => [
             qr{^examples/},
@@ -929,7 +929,7 @@ use File::Glob qw(:case);
 
     'HTTP::Tiny' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/HTTP-Tiny-0.030.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/HTTP-Tiny-0.034.tar.gz',
         'FILES'        => q[cpan/HTTP-Tiny],
         'EXCLUDED'     => [
             't/00-report-prereqs.t',
@@ -956,12 +956,8 @@ use File::Glob qw(:case);
         'UPSTREAM'   => 'blead',
     },
 
-    # Sean has donated it to us.
-    # Nothing has changed since his last CPAN release.
-    # (not strictly true: there have been some trivial typo fixes; DAPM 6/2009)
     'I18N::LangTags' => {
         'MAINTAINER'   => 'p5p',
-        'DISTRIBUTION' => 'SBURKE/I18N-LangTags-0.35.tar.gz',
         'FILES'        => q[dist/I18N-LangTags],
         'UPSTREAM'     => 'blead',
     },
@@ -983,7 +979,7 @@ use File::Glob qw(:case);
 
     'IO-Compress' => {
         'MAINTAINER'   => 'pmqs',
-        'DISTRIBUTION' => 'PMQS/IO-Compress-2.061.tar.gz',
+        'DISTRIBUTION' => 'PMQS/IO-Compress-2.062.tar.gz',
         'FILES'        => q[cpan/IO-Compress],
         'EXCLUDED'     => [qr{t/Test/}],
         'UPSTREAM'     => 'cpan',
@@ -998,7 +994,7 @@ use File::Glob qw(:case);
 
     'IPC::Cmd' => {
         'MAINTAINER'   => 'kane',
-        'DISTRIBUTION' => 'BINGOS/IPC-Cmd-0.80.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/IPC-Cmd-0.84.tar.gz',
         'FILES'        => q[cpan/IPC-Cmd],
         'UPSTREAM'     => 'cpan',
     },
@@ -1011,7 +1007,7 @@ use File::Glob qw(:case);
 
     'IPC::SysV' => {
         'MAINTAINER'   => 'mhx',
-        'DISTRIBUTION' => 'MHX/IPC-SysV-2.03.tar.gz',
+        'DISTRIBUTION' => 'MHX/IPC-SysV-2.04.tar.gz',
         'FILES'        => q[cpan/IPC-SysV],
         'EXCLUDED'     => [
             qw( const-c.inc
@@ -1045,21 +1041,22 @@ use File::Glob qw(:case);
 
     'libnet' => {
         'MAINTAINER'   => 'gbarr',
-        'DISTRIBUTION' => 'GBARR/libnet-1.22.tar.gz',
+        'DISTRIBUTION' => 'SHAY/libnet-1.23.tar.gz',
         'FILES'        => q[cpan/libnet],
         'EXCLUDED'     => [
             qw( Configure
                 install-nomake
-                Makefile.PL
                 ),
         ],
+        # Customized for perl since we cannot use either an auto-generated
+        # script or the version in the CPAN distro.
         'CUSTOMIZED' => ['Makefile.PL'],
-        'UPSTREAM'   => undef,
+        'UPSTREAM'   => 'cpan',
     },
 
     'Locale-Codes' => {
         'MAINTAINER'   => 'sbeck',
-        'DISTRIBUTION' => 'SBECK/Locale-Codes-3.26.tar.gz',
+        'DISTRIBUTION' => 'SBECK/Locale-Codes-3.27.tar.gz',
         'FILES'        => q[cpan/Locale-Codes],
         'EXCLUDED'     => [
             qw( t/pod_coverage.t
@@ -1178,7 +1175,7 @@ use File::Glob qw(:case);
 
     'MIME::Base64' => {
         'MAINTAINER'   => 'gaas',
-        'DISTRIBUTION' => 'GAAS/MIME-Base64-3.13.tar.gz',
+        'DISTRIBUTION' => 'GAAS/MIME-Base64-3.14.tar.gz',
         'FILES'        => q[cpan/MIME-Base64],
         'EXCLUDED'     => ['t/bad-sv.t'],
         'UPSTREAM'     => 'cpan',
@@ -1191,7 +1188,7 @@ use File::Glob qw(:case);
 
     'Module::Build' => {
         'MAINTAINER'   => 'kwilliams',
-        'DISTRIBUTION' => 'LEONT/Module-Build-0.4005.tar.gz',
+        'DISTRIBUTION' => 'LEONT/Module-Build-0.4007.tar.gz',
         'FILES'        => q[cpan/Module-Build],
         'EXCLUDED'     => [
             qw( t/par.t
@@ -1200,13 +1197,15 @@ use File::Glob qw(:case);
             qr{^contrib/},
             qr{^inc},
         ],
+        # Generated file, not part of the CPAN distro:
         'CUSTOMIZED' => ['lib/Module/Build/ConfigData.pm'],
+        'DEPRECATED' => '5.019000',
         'UPSTREAM'   => 'cpan',
     },
 
     'Module::CoreList' => {
         'MAINTAINER'   => 'bingos',
-        'DISTRIBUTION' => 'BINGOS/Module-CoreList-2.91.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/Module-CoreList-2.97.tar.gz',
         'FILES'        => q[dist/Module-CoreList],
         'UPSTREAM'     => 'blead',
     },
@@ -1220,7 +1219,7 @@ use File::Glob qw(:case);
 
     'Module::Load::Conditional' => {
         'MAINTAINER'   => 'kane',
-        'DISTRIBUTION' => 'BINGOS/Module-Load-Conditional-0.54.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/Module-Load-Conditional-0.58.tar.gz',
         'FILES'        => q[cpan/Module-Load-Conditional],
         'UPSTREAM'     => 'cpan',
     },
@@ -1234,7 +1233,7 @@ use File::Glob qw(:case);
 
     'Module::Metadata' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'BOBTFISH/Module-Metadata-1.000014.tar.gz',
+        'DISTRIBUTION' => 'ETHER/Module-Metadata-1.000016.tar.gz',
         'FILES'        => q[cpan/Module-Metadata],
         'EXCLUDED'     => [
             qr{^maint},
@@ -1301,7 +1300,7 @@ use File::Glob qw(:case);
 
     'Params::Check' => {
         'MAINTAINER'   => 'kane',
-        'DISTRIBUTION' => 'BINGOS/Params-Check-0.36.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/Params-Check-0.38.tar.gz',
         'EXCLUDED'     => ['Params-Check-0.26.tar.gz'],
         'FILES'        => q[cpan/Params-Check],
         'UPSTREAM'     => 'cpan',
@@ -1309,15 +1308,20 @@ use File::Glob qw(:case);
 
     'parent' => {
         'MAINTAINER'   => 'corion',
-        'DISTRIBUTION' => 'CORION/parent-0.225.tar.gz',
+        'DISTRIBUTION' => 'CORION/parent-0.227.tar.gz',
         'FILES'        => q[cpan/parent],
         'UPSTREAM'     => undef,
     },
 
     'Parse::CPAN::Meta' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/Parse-CPAN-Meta-1.4404.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/Parse-CPAN-Meta-1.4405.tar.gz',
         'FILES'        => q[cpan/Parse-CPAN-Meta],
+        'EXCLUDED'     => [
+            qw(t/00-compile.t),
+            qw[t/00-report-prereqs.t],
+            qr{^xt},
+        ],
         'UPSTREAM'     => 'cpan',
     },
 
@@ -1380,12 +1384,19 @@ use File::Glob qw(:case);
         'MAINTAINER'   => 'elizabeth',
         'DISTRIBUTION' => 'ELIZABETH/PerlIO-via-QuotedPrint-0.07.tar.gz',
         'FILES'        => q[cpan/PerlIO-via-QuotedPrint],
+
+        # Waiting to be merged upstream: see CPAN RT#54047
+        'CUSTOMIZED'   => [
+            qw( t/QuotedPrint.t
+                ),
+        ],
+
         'UPSTREAM'     => undef,
     },
 
     'Perl::OSType' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/Perl-OSType-1.003.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/Perl-OSType-1.004.tar.gz',
         'FILES'        => q[cpan/Perl-OSType],
         'EXCLUDED'     => [qr/^xt/, qr{^t/00-}],
         'UPSTREAM'     => 'cpan',
@@ -1501,6 +1512,10 @@ use File::Glob qw(:case);
             qw( scripts/pod2man.PL
                 scripts/pod2text.PL
                 ),
+
+            # Waiting to be merged upstream: see CPAN RT#87440
+            qw( pod/perlpodstyle.pod
+                ),
         ],
         'MAP' => {
             ''                 => 'cpan/podlators/',
@@ -1534,9 +1549,7 @@ use File::Glob qw(:case);
 
     'Scalar-List-Utils' => {
         'MAINTAINER'   => 'gbarr',
-        'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.27.tar.gz',
-
-        # Note that perl uses its own version of Makefile.PL
+        'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.32.tar.gz',
         'FILES'    => q[cpan/List-Util],
         'EXCLUDED' => [
             qr{^inc/Module/},
@@ -1576,14 +1589,14 @@ use File::Glob qw(:case);
 
     'Socket' => {
         'MAINTAINER'   => 'pevans',
-        'DISTRIBUTION' => 'PEVANS/Socket-2.009.tar.gz',
+        'DISTRIBUTION' => 'PEVANS/Socket-2.012.tar.gz',
         'FILES'        => q[cpan/Socket],
         'UPSTREAM'     => 'cpan',
     },
 
     'Storable' => {
         'MAINTAINER'   => 'ams',
-        'DISTRIBUTION' => 'AMS/Storable-2.39.tar.gz',
+        'DISTRIBUTION' => 'AMS/Storable-2.45.tar.gz',
         'FILES'        => q[dist/Storable],
         'EXCLUDED'     => [qr{^t/Test/}],
         'UPSTREAM'     => 'blead',
@@ -1638,6 +1651,14 @@ use File::Glob qw(:case);
         'MAINTAINER'   => 'jstowe',
         'DISTRIBUTION' => 'JSTOWE/Term-Cap-1.12.tar.gz',
         'FILES'        => q[cpan/Term-Cap],
+
+        # Waiting to be merged upstream: see CPAN RT#73447
+        'CUSTOMIZED'   => [
+            qw( Cap.pm
+                test.pl
+                ),
+        ],
+
         'UPSTREAM'     => undef,
     },
 
@@ -1651,7 +1672,7 @@ use File::Glob qw(:case);
 
     'Term::ReadLine' => {
         'MAINTAINER'   => 'p5p',
-        'DISTRIBUTION' => 'FLORA/Term-ReadLine-1.10.tar.gz',
+        'DISTRIBUTION' => 'FLORA/Term-ReadLine-1.14.tar.gz',
         'FILES'        => q[dist/Term-ReadLine],
         'EXCLUDED'     => [qr{^t/release-.*\.t}],
         'UPSTREAM'     => 'blead',
@@ -1680,7 +1701,10 @@ use File::Glob qw(:case);
                 t/lib/if.pm
                 ),
         ],
+
+        # Waiting to be merged upstream: see CPAN RT#64353
         'CUSTOMIZED' => [ 't/source.t' ],
+
         'UPSTREAM'   => 'cpan',
     },
 
@@ -1698,6 +1722,10 @@ use File::Glob qw(:case);
                 lib/Test/Builder/IO/Scalar.pm
                 ),
         ],
+
+        # Waiting to be merged upstream: see CPAN RT#79762
+        'CUSTOMIZED' =>  [ 't/fail-more.t' ],
+
         'UPSTREAM' => 'cpan',
     },
 
@@ -1719,6 +1747,8 @@ use File::Glob qw(:case);
                 t/99_pmv.t
                 ),
         ],
+
+        # Waiting to be merged upstream: see CPAN RT#87788
         'CUSTOMIZED'   => [
             qw( t/01_compile.t
                 t/02_extbrk.t
@@ -1731,15 +1761,23 @@ use File::Glob qw(:case);
                 t/09_gentag.t
                 ),
         ],
+
         'UPSTREAM' => 'cpan',
     },
 
     'Text::ParseWords' => {
         'MAINTAINER'   => 'chorny',
-        'DISTRIBUTION' => 'CHORNY/Text-ParseWords-3.28.tar.gz',
+        'DISTRIBUTION' => 'CHORNY/Text-ParseWords-3.29.tar.gz',
         'FILES'        => q[cpan/Text-ParseWords],
         'EXCLUDED'     => ['t/pod.t'],
 
+        # Waiting to be merged upstream: see CPAN RT#50929
+        'CUSTOMIZED'   => [
+            qw( t/ParseWords.t
+                t/taint.t
+                ),
+        ],
+
         # For the benefit of make_ext.pl, we have to have this accessible:
         'MAP' => {
             'ParseWords.pm' => 'cpan/Text-ParseWords/lib/Text/ParseWords.pm',
@@ -1854,7 +1892,7 @@ use File::Glob qw(:case);
 
     'Time::HiRes' => {
         'MAINTAINER'   => 'zefram',
-        'DISTRIBUTION' => 'ZEFRAM/Time-HiRes-1.9725.tar.gz',
+        'DISTRIBUTION' => 'ZEFRAM/Time-HiRes-1.9726.tar.gz',
         'FILES'        => q[cpan/Time-HiRes],
         'UPSTREAM'     => 'cpan',
     },
@@ -1874,14 +1912,14 @@ use File::Glob qw(:case);
 
     'Time::Piece' => {
         'MAINTAINER'   => 'msergeant',
-        'DISTRIBUTION' => 'MSERGEANT/Time-Piece-1.20.tar.gz',
+        'DISTRIBUTION' => 'RJBS/Time-Piece-1.23.tar.gz',
         'FILES'        => q[cpan/Time-Piece],
         'UPSTREAM'     => undef,
     },
 
     'Unicode::Collate' => {
         'MAINTAINER'   => 'sadahiro',
-        'DISTRIBUTION' => 'SADAHIRO/Unicode-Collate-0.98.tar.gz',
+        'DISTRIBUTION' => 'SADAHIRO/Unicode-Collate-0.99.tar.gz',
         'FILES'        => q[cpan/Unicode-Collate],
         'EXCLUDED'     => [
             qr{N$},
@@ -1917,19 +1955,23 @@ use File::Glob qw(:case);
 
     'version' => {
         'MAINTAINER'   => 'jpeacock',
-        'DISTRIBUTION' => 'JPEACOCK/version-0.9902.tar.gz',
-        'FILES'        => q[lib/version.pm lib/version.pod lib/version],
+        'DISTRIBUTION' => 'JPEACOCK/version-0.9904.tar.gz',
+        'FILES'        => q[cpan/version],
         'EXCLUDED' => [
-            qr{^t/.*\.t$},
             qr{^vutil/},
             'lib/version/typemap',
             't/survey_locales',
             'vperl/vpp.pm',
         ],
-        'MAP' => {
-            'lib/'           => 'lib/',
-            't/'             => 'lib/version/t/'
-        },
+
+        # Waiting to be merged upstream: see CPAN RT#87513
+        'CUSTOMIZED'   => [
+            qw( lib/version.pm
+                t/07locale.t
+                t/08_corelist.t
+                ),
+        ],
+
         'UPSTREAM' => undef,
     },
 
@@ -1945,6 +1987,12 @@ use File::Glob qw(:case);
         'UPSTREAM'   => undef,
     },
 
+    'VMS::Filespec' => {
+        'MAINTAINER' => 'p5p',
+        'FILES'      => q[ext/VMS-Filespec],
+        'UPSTREAM'   => undef,
+    },
+
     'VMS::Stdio' => {
         'MAINTAINER' => 'craig',
         'FILES'      => q[ext/VMS-Stdio],
@@ -1997,7 +2045,10 @@ use File::Glob qw(:case);
         'FILES'        => q[dist/XSLoader],
         'EXCLUDED'     => [
             qr{^eg/},
-            qw( t/pod.t
+            qw( t/00-load.t
+                t/01-api.t
+                t/distchk.t
+                t/pod.t
                 t/podcover.t
                 t/portfs.t
                 ),
@@ -2025,6 +2076,7 @@ use File::Glob qw(:case);
         'MAINTAINER' => 'p5p',
         'FILES'      => q[
                 ext/arybase/
+                ext/ExtUtils-Miniperl/
                 ext/XS-APItest/
                 lib/CORE.pod
                 lib/Config.t