This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Remove double blank lines from the RMG
[perl5.git] / Porting / Maintainers.pl
index eaf210d..7d4482c 100755 (executable)
@@ -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,22 +225,25 @@ use File::Glob qw(:case);
 
     'autodie' => {
         'MAINTAINER'   => 'pjf',
-        'DISTRIBUTION' => 'PJF/autodie-2.13.tar.gz',
+        'DISTRIBUTION' => 'PJF/autodie-2.20.tar.gz',
         'FILES'        => q[cpan/autodie],
         'EXCLUDED'     => [
             qr{^inc/Module/},
-
+            qr{benchmarks},
             # All these tests depend upon external
             # modules that don't exist when we're
             # building the core.  Hence, they can
             # never run, and should not be merged.
             qw( t/boilerplate.t
+                t/author-critic.t
                 t/critic.t
                 t/fork.t
                 t/kwalitee.t
                 t/lex58.t
                 t/pod-coverage.t
                 t/pod.t
+                t/release-pod-coverage.t
+                t/release-pod-syntax.t
                 t/socket.t
                 t/system.t
                 )
@@ -348,7 +353,7 @@ use File::Glob qw(:case);
 
     'Compress::Raw::Bzip2' => {
         'MAINTAINER'   => 'pmqs',
-        'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.060.tar.gz',
+        'DISTRIBUTION' => 'PMQS/Compress-Raw-Bzip2-2.062.tar.gz',
         'FILES'        => q[cpan/Compress-Raw-Bzip2],
         'EXCLUDED'     => [
             qr{^t/Test/},
@@ -359,7 +364,7 @@ use File::Glob qw(:case);
 
     'Compress::Raw::Zlib' => {
         'MAINTAINER'   => 'pmqs',
-        'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.060.tar.gz',
+        'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.062.tar.gz',
 
         'FILES'    => q[cpan/Compress-Raw-Zlib],
         'EXCLUDED' => [
@@ -373,7 +378,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',
@@ -403,7 +408,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
@@ -443,12 +447,15 @@ 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.120921.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/CPAN-Meta-2.132140.tar.gz',
         'FILES'        => q[cpan/CPAN-Meta],
         'EXCLUDED'     => [
             qw(t/00-compile.t),
+            qw[t/00-report-prereqs.t],
             qr{^xt},
             qr{^history},
         ],
@@ -488,7 +495,7 @@ use File::Glob qw(:case);
 
     'DB_File' => {
         'MAINTAINER'   => 'pmqs',
-        'DISTRIBUTION' => 'PMQS/DB_File-1.827.tar.gz',
+        'DISTRIBUTION' => 'PMQS/DB_File-1.829.tar.gz',
         'FILES'        => q[cpan/DB_File],
         'EXCLUDED'     => [
             qr{^patches/},
@@ -524,8 +531,18 @@ use File::Glob qw(:case);
         'MAINTAINER'   => 'mhx',
         'DISTRIBUTION' => 'MHX/Devel-PPPort-3.20.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
+
+        # Waiting to be merged upstream: see CPAN RT#81796,87870
+        'CUSTOMIZED'   => [
+            qw( parts/inc/misc
+                parts/inc/SvPV
+                t/misc.t
+                t/SvPV.t
+                ),
+        ],
+
+        'UPSTREAM' => undef, # rjbs has asked mhx to have blead be upstream
     },
 
     'diagnostics' => {
@@ -544,7 +561,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",
@@ -552,7 +569,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
@@ -585,7 +602,7 @@ use File::Glob qw(:case);
 
     'Encode' => {
         'MAINTAINER'   => 'dankogai',
-        'DISTRIBUTION' => 'DANKOGAI/Encode-2.51.tar.gz',
+        'DISTRIBUTION' => 'DANKOGAI/Encode-2.52.tar.gz',
         'FILES'        => q[cpan/Encode],
         'UPSTREAM'     => 'cpan',
     },
@@ -596,13 +613,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,
     },
@@ -630,19 +641,12 @@ 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',
     },
 
@@ -696,7 +700,7 @@ use File::Glob qw(:case);
 
     'ExtUtils::MakeMaker' => {
         'MAINTAINER'   => 'mschwern',
-        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-6.66.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-6.72.tar.gz',
         'FILES'        => q[cpan/ExtUtils-MakeMaker],
         'EXCLUDED'     => [
             qr{^t/lib/Test/},
@@ -718,14 +722,14 @@ use File::Glob qw(:case);
 
     'ExtUtils::ParseXS' => {
         'MAINTAINER'   => 'smueller',
-        'DISTRIBUTION' => 'SMUELLER/ExtUtils-ParseXS-3.18.tar.gz',
+        'DISTRIBUTION' => 'SMUELLER/ExtUtils-ParseXS-3.21.tar.gz',
         'FILES'        => q[dist/ExtUtils-ParseXS],
         'UPSTREAM'     => 'blead',
     },
 
     'perlfaq' => {
         'MAINTAINER'   => 'perlfaq',
-        'DISTRIBUTION' => 'LLAP/perlfaq-5.0150042.tar.gz',
+        'DISTRIBUTION' => 'LLAP/perlfaq-5.0150043.tar.gz',
         'FILES'        => q[cpan/perlfaq],
         'EXCLUDED'     => [
             qw( t/release-pod-syntax.t
@@ -762,14 +766,14 @@ use File::Glob qw(:case);
 
     'File::Fetch' => {
         'MAINTAINER'   => 'kane',
-        'DISTRIBUTION' => 'BINGOS/File-Fetch-0.38.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/File-Fetch-0.42.tar.gz',
         'FILES'        => q[cpan/File-Fetch],
         'UPSTREAM'     => 'cpan',
     },
 
     'File::Find' => {
         'MAINTAINER' => 'p5p',
-        'FILES'      => q[lib/File/Find.pm lib/File/Find],
+        'FILES'      => q[ext/File-Find],
         'UPSTREAM'   => 'blead',
     },
 
@@ -803,12 +807,15 @@ use File::Glob qw(:case);
 
     'File::Temp' => {
         'MAINTAINER'   => 'tjenness',
-        'DISTRIBUTION' => 'TJENNESS/File-Temp-0.23.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/File-Temp-0.2301.tar.gz',
         'FILES'        => q[cpan/File-Temp],
         'EXCLUDED'     => [
             qw( misc/benchmark.pl
                 misc/results.txt
                 ),
+            qw(t/00-compile.t),
+            qw[t/00-report-prereqs.t],
+            qr{^xt},
         ],
         'UPSTREAM' => 'cpan',
     },
@@ -830,7 +837,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',
@@ -838,7 +844,7 @@ use File::Glob qw(:case);
 
     'Filter::Util::Call' => {
         'MAINTAINER'   => 'pmqs',
-        'DISTRIBUTION' => 'RURBAN/Filter-1.45.tar.gz',
+        'DISTRIBUTION' => 'RURBAN/Filter-1.49.tar.gz',
         'FILES'        => q[cpan/Filter-Util-Call
                  pod/perlfilter.pod
                 ],
@@ -859,6 +865,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' => {
@@ -890,7 +901,7 @@ use File::Glob qw(:case);
 
     'Getopt::Long' => {
         'MAINTAINER'   => 'jv',
-        'DISTRIBUTION' => 'JV/Getopt-Long-2.39.tar.gz',
+        'DISTRIBUTION' => 'JV/Getopt-Long-2.41.tar.gz',
         'FILES'        => q[cpan/Getopt-Long],
         'EXCLUDED'     => [
             qr{^examples/},
@@ -922,7 +933,7 @@ use File::Glob qw(:case);
 
     'HTTP::Tiny' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'DAGOLDEN/HTTP-Tiny-0.025.tar.gz',
+        'DISTRIBUTION' => 'DAGOLDEN/HTTP-Tiny-0.034.tar.gz',
         'FILES'        => q[cpan/HTTP-Tiny],
         'EXCLUDED'     => [
             't/00-report-prereqs.t',
@@ -976,7 +987,7 @@ use File::Glob qw(:case);
 
     'IO-Compress' => {
         'MAINTAINER'   => 'pmqs',
-        'DISTRIBUTION' => 'PMQS/IO-Compress-2.060.tar.gz',
+        'DISTRIBUTION' => 'PMQS/IO-Compress-2.062.tar.gz',
         'FILES'        => q[cpan/IO-Compress],
         'EXCLUDED'     => [qr{t/Test/}],
         'UPSTREAM'     => 'cpan',
@@ -991,7 +1002,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',
     },
@@ -1004,7 +1015,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
@@ -1038,21 +1049,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.25.tar.gz',
+        'DISTRIBUTION' => 'SBECK/Locale-Codes-3.26.tar.gz',
         'FILES'        => q[cpan/Locale-Codes],
         'EXCLUDED'     => [
             qw( t/pod_coverage.t
@@ -1171,7 +1183,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',
@@ -1184,7 +1196,7 @@ use File::Glob qw(:case);
 
     'Module::Build' => {
         'MAINTAINER'   => 'kwilliams',
-        'DISTRIBUTION' => 'LEONT/Module-Build-0.4003.tar.gz',
+        'DISTRIBUTION' => 'LEONT/Module-Build-0.4007.tar.gz',
         'FILES'        => q[cpan/Module-Build],
         'EXCLUDED'     => [
             qw( t/par.t
@@ -1193,13 +1205,14 @@ use File::Glob qw(:case);
             qr{^contrib/},
             qr{^inc},
         ],
+        # Generated file, not part of the CPAN distro:
         'CUSTOMIZED' => ['lib/Module/Build/ConfigData.pm'],
         'UPSTREAM'   => 'cpan',
     },
 
     'Module::CoreList' => {
         'MAINTAINER'   => 'bingos',
-        'DISTRIBUTION' => 'BINGOS/Module-CoreList-2.91.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/Module-CoreList-2.96.tar.gz',
         'FILES'        => q[dist/Module-CoreList],
         'UPSTREAM'     => 'blead',
     },
@@ -1227,7 +1240,7 @@ use File::Glob qw(:case);
 
     'Module::Metadata' => {
         'MAINTAINER'   => 'dagolden',
-        'DISTRIBUTION' => 'APEIRON/Module-Metadata-1.000011.tar.gz',
+        'DISTRIBUTION' => 'BOBTFISH/Module-Metadata-1.000014.tar.gz',
         'FILES'        => q[cpan/Module-Metadata],
         'EXCLUDED'     => [
             qr{^maint},
@@ -1294,7 +1307,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',
@@ -1302,15 +1315,20 @@ use File::Glob qw(:case);
 
     'parent' => {
         'MAINTAINER'   => 'corion',
-        'DISTRIBUTION' => 'CORION/parent-0.225.tar.gz',
+        'DISTRIBUTION' => 'CORION/parent-0.226.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',
     },
 
@@ -1373,6 +1391,13 @@ 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,
     },
 
@@ -1449,14 +1474,14 @@ use File::Glob qw(:case);
 
     'Pod::Parser' => {
         'MAINTAINER' => 'marekr',
-        'DISTRIBUTION' => 'MAREKR/Pod-Parser-1.60.tar.gz',
+        'DISTRIBUTION' => 'MAREKR/Pod-Parser-1.61.tar.gz',
         'FILES'        => q[cpan/Pod-Parser],
         'UPSTREAM'     => 'cpan',
     },
 
     'Pod::Perldoc' => {
         'MAINTAINER'   => 'mallen',
-        'DISTRIBUTION' => 'MALLEN/Pod-Perldoc-3.19.tar.gz',
+        'DISTRIBUTION' => 'MALLEN/Pod-Perldoc-3.20.tar.gz',
         'FILES'        => q[cpan/Pod-Perldoc],
 
         # in blead, the perldoc executable is generated by perldoc.PL
@@ -1476,7 +1501,7 @@ use File::Glob qw(:case);
 
     'Pod::Usage' => {
         'MAINTAINER' => 'marekr',
-        'DISTRIBUTION' => 'MAREKR/Pod-Usage-1.61.tar.gz',
+        'DISTRIBUTION' => 'MAREKR/Pod-Usage-1.63.tar.gz',
         'FILES'        => q[cpan/Pod-Usage],
         'UPSTREAM'     => 'cpan',
     },
@@ -1494,6 +1519,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/',
@@ -1527,9 +1556,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.31.tar.gz',
         'FILES'    => q[cpan/List-Util],
         'EXCLUDED' => [
             qr{^inc/Module/},
@@ -1569,14 +1596,14 @@ use File::Glob qw(:case);
 
     'Socket' => {
         'MAINTAINER'   => 'pevans',
-        'DISTRIBUTION' => 'PEVANS/Socket-2.009.tar.gz',
+        'DISTRIBUTION' => 'PEVANS/Socket-2.011.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',
@@ -1590,7 +1617,7 @@ use File::Glob qw(:case);
 
     'Sys::Syslog' => {
         'MAINTAINER'   => 'saper',
-        'DISTRIBUTION' => 'SAPER/Sys-Syslog-0.32.tar.gz',
+        'DISTRIBUTION' => 'SAPER/Sys-Syslog-0.33.tar.gz',
         'FILES'        => q[cpan/Sys-Syslog],
         'EXCLUDED'     => [
             qr{^eg/},
@@ -1631,6 +1658,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,
     },
 
@@ -1673,7 +1708,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',
     },
 
@@ -1691,6 +1729,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',
     },
 
@@ -1712,6 +1754,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
@@ -1724,15 +1768,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',
@@ -1743,7 +1795,7 @@ use File::Glob qw(:case);
 
     'Text-Tabs+Wrap' => {
         'MAINTAINER'   => 'muir',
-        'DISTRIBUTION' => 'MUIR/modules/Text-Tabs+Wrap-2012.0818.tar.gz',
+        'DISTRIBUTION' => 'MUIR/modules/Text-Tabs+Wrap-2013.0523.tar.gz',
         'FILES'        => q[cpan/Text-Tabs],
         'EXCLUDED'   => [
             qr/^lib\.old/,
@@ -1787,7 +1839,7 @@ use File::Glob qw(:case);
 
     'threads' => {
         'MAINTAINER'   => 'jdhedden',
-        'DISTRIBUTION' => 'JDHEDDEN/threads-1.86.tar.gz',
+        'DISTRIBUTION' => 'JDHEDDEN/threads-1.87.tar.gz',
         'FILES'        => q[dist/threads],
         'EXCLUDED'     => [
             qr{^examples/},
@@ -1849,6 +1901,10 @@ use File::Glob qw(:case);
         'MAINTAINER'   => 'zefram',
         'DISTRIBUTION' => 'ZEFRAM/Time-HiRes-1.9725.tar.gz',
         'FILES'        => q[cpan/Time-HiRes],
+
+        # Waiting to be merged upstream: see CPAN RT#87858
+        'CUSTOMIZED'   => [ 'Makefile.PL' ],
+
         'UPSTREAM'     => 'cpan',
     },
 
@@ -1867,14 +1923,14 @@ use File::Glob qw(:case);
 
     'Time::Piece' => {
         'MAINTAINER'   => 'msergeant',
-        'DISTRIBUTION' => 'MSERGEANT/Time-Piece-1.20.tar.gz',
+        'DISTRIBUTION' => 'RJBS/Time-Piece-1.22.tar.gz',
         'FILES'        => q[cpan/Time-Piece],
         'UPSTREAM'     => undef,
     },
 
     'Unicode::Collate' => {
         'MAINTAINER'   => 'sadahiro',
-        'DISTRIBUTION' => 'SADAHIRO/Unicode-Collate-0.97.tar.gz',
+        'DISTRIBUTION' => 'SADAHIRO/Unicode-Collate-0.98.tar.gz',
         'FILES'        => q[cpan/Unicode-Collate],
         'EXCLUDED'     => [
             qr{N$},
@@ -1911,18 +1967,28 @@ 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],
+        '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
+                lib/version/Internals.pod
+                t/01base.t
+                t/02derived.t
+                t/03require.t
+                t/04strict_lax.t
+                t/06noop.t
+                t/07locale.t
+                t/coretests.pm
+                ),
+        ],
+
         'UPSTREAM' => undef,
     },
 
@@ -1938,6 +2004,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],
@@ -1990,7 +2062,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
                 ),
@@ -2018,6 +2093,7 @@ use File::Glob qw(:case);
         'MAINTAINER' => 'p5p',
         'FILES'      => q[
                 ext/arybase/
+                ext/ExtUtils-Miniperl/
                 ext/XS-APItest/
                 lib/CORE.pod
                 lib/Config.t