diff mbox

Help with Perl security update

Message ID 20160725200009.GA1175@jasmine
State New
Headers show

Commit Message

Leo Famulari July 25, 2016, 8 p.m. UTC
I'm trying to patch our Perl package against CVE-2016-1238 and 
CVE-2016-6185:

<https://www.debian.org/security/2016/dsa-3628>

This patch uses a graft to apply new patches which are composed of
commits from the 'maint-5.22' branch of
<http://perl5.git.perl.org/perl.git>.

Unfortunately, some of the changes related to CVE-2016-1238 don't apply
to our Perl source code. There are several '.rej' files that look like
this:


Any advice?

By the way, I found that we never removed (replacement #f) from
perl-boot0 after removing the previous Perl graft.

Leo Famulari (1):
  gnu: perl: Fix CVE-2016-{1238,6185}.

 gnu/local.mk                                  |    2 + 
 gnu/packages/patches/perl-CVE-2016-1238.patch | 3673 +++++++++++++++++++++++++
 gnu/packages/patches/perl-CVE-2016-6185.patch |  208 ++
 gnu/packages/perl.scm                         |   24 +
 4 files changed, 3907 insertions(+)
 create mode 100644 gnu/packages/patches/perl-CVE-2016-1238.patch
 create mode 100644 gnu/packages/patches/perl-CVE-2016-6185.patch

Comments

Tomáš Čech July 25, 2016, 9:23 p.m. UTC | #1
On Mon, Jul 25, 2016 at 04:00:09PM -0400, Leo Famulari wrote:
>I'm trying to patch our Perl package against CVE-2016-1238 and
>CVE-2016-6185:
>
><https://www.debian.org/security/2016/dsa-3628>
>
>This patch uses a graft to apply new patches which are composed of
>commits from the 'maint-5.22' branch of
><http://perl5.git.perl.org/perl.git>.
>
>Unfortunately, some of the changes related to CVE-2016-1238 don't apply
>to our Perl source code. There are several '.rej' files that look like
>this:
>
>--- dist/PathTools/lib/File/Spec.pm
>+++ dist/PathTools/lib/File/Spec.pm
>@@ -3,7 +3,7 @@ package File::Spec;
> use strict;
> use vars qw(@ISA $VERSION);
>
>-$VERSION = '3.56_01';
>+$VERSION = '3.56_02';
> $VERSION =~ tr/_//;
>
> my %module = (MacOS   => 'Mac',
>
>Any advice?

This looks like we're missing some patches. My guess is that this is
consequence of the fact that upstream is on 5.22.2 already and we're
on 5.22.1. I'm not sure what value to choose here as the result won't
be neither 3.56_01 nor 3.56_02. Maybe add extra suffix?

Or we can just skip bfe2dd1e9c3296bebf3ab9adc2ca48d3eb8d105d and let
the version same. Someone with deeper perl experience should decide.

I just verified that source code in 5.22.2 has the version strings
patch expects (I haven't checked them all).

S_W
Leo Famulari July 29, 2016, 9:09 p.m. UTC | #2
On Mon, Jul 25, 2016 at 11:23:37PM +0200, Tomáš Čech wrote:
> This looks like we're missing some patches. My guess is that this is
> consequence of the fact that upstream is on 5.22.2 already and we're
> on 5.22.1. I'm not sure what value to choose here as the result won't
> be neither 3.56_01 nor 3.56_02. Maybe add extra suffix?
> 
> Or we can just skip bfe2dd1e9c3296bebf3ab9adc2ca48d3eb8d105d and let
> the version same. Someone with deeper perl experience should decide.

Thanks for digging in. I agree, someone with deeper knowledge of Perl
should make this choice. I don't understand the implications of omitting
the patch.
diff mbox

Patch

From 10836eb785c99c0eadafdfeb44b955f98a298cf2 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 25 Jul 2016 14:55:25 -0400
Subject: [PATCH] gnu: perl: Fix CVE-2016-{1238,6185}.

* gnu/packages/patches/perl-CVE-2016-1238.patch,
gnu/packages/patches/perl-CVE-2016-6185.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/perl.scm (perl)[replacement]: New field.
(perl/fixed): New variable.
---
 gnu/local.mk                                  |    2 +
 gnu/packages/patches/perl-CVE-2016-1238.patch | 3673 +++++++++++++++++++++++++
 gnu/packages/patches/perl-CVE-2016-6185.patch |  208 ++
 gnu/packages/perl.scm                         |   24 +
 4 files changed, 3907 insertions(+)
 create mode 100644 gnu/packages/patches/perl-CVE-2016-1238.patch
 create mode 100644 gnu/packages/patches/perl-CVE-2016-6185.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ea63453..e4c8364 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -712,7 +712,9 @@  dist_patch_DATA =						\
   %D%/packages/patches/pcre-CVE-2016-3191.patch			\
   %D%/packages/patches/pcre2-CVE-2016-3191.patch		\
   %D%/packages/patches/perl-CVE-2015-8607.patch			\
+  %D%/packages/patches/perl-CVE-2016-1238.patch			\
   %D%/packages/patches/perl-CVE-2016-2381.patch			\
+  %D%/packages/patches/perl-CVE-2016-6185.patch			\
   %D%/packages/patches/perl-autosplit-default-time.patch	\
   %D%/packages/patches/perl-deterministic-ordering.patch	\
   %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
diff --git a/gnu/packages/patches/perl-CVE-2016-1238.patch b/gnu/packages/patches/perl-CVE-2016-1238.patch
new file mode 100644
index 0000000..59a5634
--- /dev/null
+++ b/gnu/packages/patches/perl-CVE-2016-1238.patch
@@ -0,0 +1,3673 @@ 
+From b86ce833e04130ff942834c475aa41d862257987 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Tue, 21 Jun 2016 10:02:02 +1000
+Subject: [PATCH 1/9] (perl #127834) remove . from the end of @INC if complex
+ modules are loaded
+
+While currently Encode and Storable are know to attempt to load modules
+not included in the core, updates to other modules may lead to those
+also attempting to load new modules, so be safe and remove . for those
+as well.
+---
+ cpan/Archive-Tar/bin/ptar                 | 1 +
+ cpan/Archive-Tar/bin/ptardiff             | 1 +
+ cpan/Archive-Tar/bin/ptargrep             | 1 +
+ cpan/CPAN/scripts/cpan                    | 1 +
+ cpan/Digest-SHA/shasum                    | 1 +
+ cpan/Encode/bin/enc2xs                    | 1 +
+ cpan/Encode/bin/encguess                  | 1 +
+ cpan/Encode/bin/piconv                    | 1 +
+ cpan/Encode/bin/ucmlint                   | 1 +
+ cpan/Encode/bin/unidump                   | 1 +
+ cpan/ExtUtils-MakeMaker/bin/instmodsh     | 1 +
+ cpan/IO-Compress/bin/zipdetails           | 1 +
+ cpan/JSON-PP/bin/json_pp                  | 1 +
+ cpan/Test-Harness/bin/prove               | 1 +
+ dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp | 1 +
+ dist/Module-CoreList/corelist             | 1 +
+ ext/Pod-Html/bin/pod2html                 | 1 +
+ utils/c2ph.PL                             | 1 +
+ utils/h2ph.PL                             | 2 ++
+ utils/h2xs.PL                             | 2 ++
+ utils/libnetcfg.PL                        | 1 +
+ utils/perlbug.PL                          | 1 +
+ utils/perldoc.PL                          | 5 ++++-
+ utils/perlivp.PL                          | 2 ++
+ utils/splain.PL                           | 6 ++++++
+ 25 files changed, 36 insertions(+), 1 deletion(-)
+
+diff --git a/cpan/Archive-Tar/bin/ptar b/cpan/Archive-Tar/bin/ptar
+index 0eaffa7..9dc6402 100644
+--- a/cpan/Archive-Tar/bin/ptar
++++ b/cpan/Archive-Tar/bin/ptar
+@@ -1,6 +1,7 @@
+ #!/usr/bin/perl
+ use strict;
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use File::Find;
+ use Getopt::Std;
+ use Archive::Tar;
+diff --git a/cpan/Archive-Tar/bin/ptardiff b/cpan/Archive-Tar/bin/ptardiff
+index 66bd859..4668fa6 100644
+--- a/cpan/Archive-Tar/bin/ptardiff
++++ b/cpan/Archive-Tar/bin/ptardiff
+@@ -1,5 +1,6 @@
+ #!/usr/bin/perl
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use Archive::Tar;
+ use Getopt::Std;
+diff --git a/cpan/Archive-Tar/bin/ptargrep b/cpan/Archive-Tar/bin/ptargrep
+index 1a320f1..8dc6b4f 100644
+--- a/cpan/Archive-Tar/bin/ptargrep
++++ b/cpan/Archive-Tar/bin/ptargrep
+@@ -4,6 +4,7 @@
+ # archive.  See 'ptargrep --help' for more documentation.
+ #
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use warnings;
+ 
+diff --git a/cpan/CPAN/scripts/cpan b/cpan/CPAN/scripts/cpan
+index 5f4320e..ccba47e 100644
+--- a/cpan/CPAN/scripts/cpan
++++ b/cpan/CPAN/scripts/cpan
+@@ -1,5 +1,6 @@
+ #!/usr/local/bin/perl
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use vars qw($VERSION);
+ 
+diff --git a/cpan/Digest-SHA/shasum b/cpan/Digest-SHA/shasum
+index 14ddd60..62a2b0e 100644
+--- a/cpan/Digest-SHA/shasum
++++ b/cpan/Digest-SHA/shasum
+@@ -13,6 +13,7 @@
+ 	## "-0" option for reading bit strings, and
+ 	## "-p" option for portable digests (to be deprecated).
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use warnings;
+ use Fcntl;
+diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
+index 19f2b2b..121e0c2 100644
+--- a/cpan/Encode/bin/enc2xs
++++ b/cpan/Encode/bin/enc2xs
+@@ -4,6 +4,7 @@ BEGIN {
+     # with $ENV{PERL_CORE} set
+     # In case we need it in future...
+     require Config; import Config;
++    pop @INC if $INC[-1] eq '.';
+ }
+ use strict;
+ use warnings;
+diff --git a/cpan/Encode/bin/encguess b/cpan/Encode/bin/encguess
+index 5d7ac80..0be5c7c 100644
+--- a/cpan/Encode/bin/encguess
++++ b/cpan/Encode/bin/encguess
+@@ -1,5 +1,6 @@
+ #!./perl
+ use 5.008001;
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use warnings;
+ use Encode;
+diff --git a/cpan/Encode/bin/piconv b/cpan/Encode/bin/piconv
+index c1dad9e..60b2a59 100644
+--- a/cpan/Encode/bin/piconv
++++ b/cpan/Encode/bin/piconv
+@@ -1,6 +1,7 @@
+ #!./perl
+ # $Id: piconv,v 2.7 2014/05/31 09:48:48 dankogai Exp $
+ #
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use 5.8.0;
+ use strict;
+ use Encode ;
+diff --git a/cpan/Encode/bin/ucmlint b/cpan/Encode/bin/ucmlint
+index 622376d..25e0d67 100644
+--- a/cpan/Encode/bin/ucmlint
++++ b/cpan/Encode/bin/ucmlint
+@@ -3,6 +3,7 @@
+ # $Id: ucmlint,v 2.2 2008/03/12 09:51:11 dankogai Exp $
+ #
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ our  $VERSION = do { my @r = (q$Revision: 2.2 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+ 
+diff --git a/cpan/Encode/bin/unidump b/cpan/Encode/bin/unidump
+index ae0da30..f190827 100644
+--- a/cpan/Encode/bin/unidump
++++ b/cpan/Encode/bin/unidump
+@@ -1,5 +1,6 @@
+ #!./perl
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use Encode;
+ use Getopt::Std;
+diff --git a/cpan/ExtUtils-MakeMaker/bin/instmodsh b/cpan/ExtUtils-MakeMaker/bin/instmodsh
+index 8b9aa95..ab0f9d1 100644
+--- a/cpan/ExtUtils-MakeMaker/bin/instmodsh
++++ b/cpan/ExtUtils-MakeMaker/bin/instmodsh
+@@ -1,5 +1,6 @@
+ #!/usr/bin/perl -w
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use IO::File;
+ use ExtUtils::Packlist;
+diff --git a/cpan/IO-Compress/bin/zipdetails b/cpan/IO-Compress/bin/zipdetails
+index 0249850..1b9c70a 100644
+--- a/cpan/IO-Compress/bin/zipdetails
++++ b/cpan/IO-Compress/bin/zipdetails
+@@ -5,6 +5,7 @@
+ # Display info on the contents of a Zip file
+ #
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use warnings ;
+ 
+diff --git a/cpan/JSON-PP/bin/json_pp b/cpan/JSON-PP/bin/json_pp
+index df9d243..896cd2f 100644
+--- a/cpan/JSON-PP/bin/json_pp
++++ b/cpan/JSON-PP/bin/json_pp
+@@ -1,5 +1,6 @@
+ #!/usr/bin/perl
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use Getopt::Long;
+ 
+diff --git a/cpan/Test-Harness/bin/prove b/cpan/Test-Harness/bin/prove
+index 6637cc4..d71b238 100644
+--- a/cpan/Test-Harness/bin/prove
++++ b/cpan/Test-Harness/bin/prove
+@@ -1,5 +1,6 @@
+ #!/usr/bin/perl -w
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use warnings;
+ use App::Prove;
+diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp b/dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp
+index e2ac71a..d596cdf 100644
+--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp
++++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp
+@@ -1,5 +1,6 @@
+ #!perl
+ use 5.006;
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ eval {
+   require ExtUtils::ParseXS;
+diff --git a/dist/Module-CoreList/corelist b/dist/Module-CoreList/corelist
+index aa4a945..bbe61cc 100644
+--- a/dist/Module-CoreList/corelist
++++ b/dist/Module-CoreList/corelist
+@@ -130,6 +130,7 @@ requested perl versions.
+ 
+ =cut
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use Module::CoreList;
+ use Getopt::Long qw(:config no_ignore_case);
+ use Pod::Usage;
+diff --git a/ext/Pod-Html/bin/pod2html b/ext/Pod-Html/bin/pod2html
+index b022859..7d1d232 100644
+--- a/ext/Pod-Html/bin/pod2html
++++ b/ext/Pod-Html/bin/pod2html
+@@ -216,6 +216,7 @@ This program is distributed under the Artistic License.
+ 
+ =cut
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use Pod::Html;
+ 
+ pod2html @ARGV;
+diff --git a/utils/c2ph.PL b/utils/c2ph.PL
+index 13389ec..cef0b5c 100644
+--- a/utils/c2ph.PL
++++ b/utils/c2ph.PL
+@@ -280,6 +280,7 @@ Anyway, here it is.  Should run on perl v4 or greater.  Maybe less.
+ 
+ $RCSID = '$Id: c2ph,v 1.7 95/10/28 10:41:47 tchrist Exp Locker: tchrist $';
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use File::Temp;
+ 
+ ######################################################################
+diff --git a/utils/h2ph.PL b/utils/h2ph.PL
+index d082f22..2523c0a 100644
+--- a/utils/h2ph.PL
++++ b/utils/h2ph.PL
+@@ -36,6 +36,8 @@ $Config{startperl}
+ 
+ print OUT <<'!NO!SUBS!';
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
++
+ use strict;
+ 
+ use Config;
+diff --git a/utils/h2xs.PL b/utils/h2xs.PL
+index 4cb0943..8fda87b 100644
+--- a/utils/h2xs.PL
++++ b/utils/h2xs.PL
+@@ -35,6 +35,8 @@ $Config{startperl}
+ 
+ print OUT <<'!NO!SUBS!';
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
++
+ use warnings;
+ 
+ =head1 NAME
+diff --git a/utils/libnetcfg.PL b/utils/libnetcfg.PL
+index 59a2de8..26d2f99 100644
+--- a/utils/libnetcfg.PL
++++ b/utils/libnetcfg.PL
+@@ -97,6 +97,7 @@ Jarkko Hietaniemi, conversion into libnetcfg for inclusion into Perl 5.8.
+ 
+ # $Id: Configure,v 1.8 1997/03/04 09:22:32 gbarr Exp $
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use strict;
+ use IO::File;
+ use Getopt::Std;
+diff --git a/utils/perlbug.PL b/utils/perlbug.PL
+index 885785a..ae8c343 100644
+--- a/utils/perlbug.PL
++++ b/utils/perlbug.PL
+@@ -57,6 +57,7 @@ print OUT <<'!NO!SUBS!';
+ my @patches = Config::local_patches();
+ my $patch_tags = join "", map /(\S+)/ ? "+$1 " : (), @patches;
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
+ use warnings;
+ use strict;
+ use Config;
+diff --git a/utils/perldoc.PL b/utils/perldoc.PL
+index e201de9..cd60bd4 100644
+--- a/utils/perldoc.PL
++++ b/utils/perldoc.PL
+@@ -44,7 +44,10 @@ $Config{startperl}
+ # This "$file" file was generated by "$0"
+ 
+ require 5;
+-BEGIN { \$^W = 1 if \$ENV{'PERLDOCDEBUG'} }
++BEGIN {
++    \$^W = 1 if \$ENV{'PERLDOCDEBUG'};
++    pop \@INC if \$INC[-1] eq '.';
++}
+ use Pod::Perldoc;
+ exit( Pod::Perldoc->run() );
+ 
+diff --git a/utils/perlivp.PL b/utils/perlivp.PL
+index c2f0a11..e522913 100644
+--- a/utils/perlivp.PL
++++ b/utils/perlivp.PL
+@@ -39,6 +39,8 @@ print OUT "\n# perlivp $^V\n";
+ 
+ print OUT <<'!NO!SUBS!';
+ 
++BEGIN { pop @INC if $INC[-1] eq '.' }
++
+ sub usage {
+     warn "@_\n" if @_;
+     print << "    EOUSAGE";
+diff --git a/utils/splain.PL b/utils/splain.PL
+index 9c70b61..cae84a0 100644
+--- a/utils/splain.PL
++++ b/utils/splain.PL
+@@ -38,6 +38,12 @@ $Config{startperl}
+ 	if \$running_under_some_shell;
+ !GROK!THIS!
+ 
++print <<'!NO!SUBS!';
++
++BEGIN { pop @INC if $INC[-1] eq '.' }
++
++!NO!SUBS!
++
+ while (<IN>) {
+     print OUT unless /^package diagnostics/;
+ }
+-- 
+2.9.2
+
+From bbf435999781656cb79a49942629989fcf1a2d4d Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Tue, 28 Jun 2016 15:33:39 +1000
+Subject: [PATCH 2/9] (perl #127834) bump versions of modules in dists we
+ updated a utility in
+
+---
+ cpan/Archive-Tar/lib/Archive/Tar.pm                            | 2 +-
+ cpan/Archive-Tar/lib/Archive/Tar/Constant.pm                   | 2 +-
+ cpan/Archive-Tar/lib/Archive/Tar/File.pm                       | 2 +-
+ cpan/CPAN/lib/CPAN.pm                                          | 2 +-
+ cpan/Digest-SHA/lib/Digest/SHA.pm                              | 2 +-
+ cpan/Encode/Encode.pm                                          | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm             | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm                | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm            | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm                     | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm                 | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm                 | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm                | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm              | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm                 | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm              | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm               | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm                 | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm                 | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm                 | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm                | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm                | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm                 | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm                 | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm               | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm               | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm                     | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm              | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm       | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm            | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm             | 2 +-
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm                | 2 +-
+ cpan/IO-Compress/lib/Compress/Zlib.pm                          | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm              | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm            | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm           | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Base.pm                       | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Base/Common.pm                | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Bzip2.pm                      | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Deflate.pm                    | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Gzip.pm                       | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm             | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm                 | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Zip.pm                        | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm              | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm             | 2 +-
+ cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm                 | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm          | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm         | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm          | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm               | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm            | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/Base.pm                     | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm                  | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm                   | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm                  | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm               | 2 +-
+ cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm                    | 2 +-
+ cpan/JSON-PP/lib/JSON/PP.pm                                    | 2 +-
+ cpan/Test-Harness/lib/App/Prove.pm                             | 2 +-
+ cpan/Test-Harness/lib/App/Prove/State.pm                       | 2 +-
+ cpan/Test-Harness/lib/App/Prove/State/Result.pm                | 2 +-
+ cpan/Test-Harness/lib/App/Prove/State/Result/Test.pm           | 2 +-
+ cpan/Test-Harness/lib/TAP/Base.pm                              | 2 +-
+ cpan/Test-Harness/lib/TAP/Formatter/Base.pm                    | 2 +-
+ cpan/Test-Harness/lib/TAP/Formatter/Color.pm                   | 2 +-
+ cpan/Test-Harness/lib/TAP/Formatter/Console.pm                 | 2 +-
+ cpan/Test-Harness/lib/TAP/Formatter/Console/ParallelSession.pm | 2 +-
+ cpan/Test-Harness/lib/TAP/Formatter/Console/Session.pm         | 2 +-
+ cpan/Test-Harness/lib/TAP/Formatter/File.pm                    | 2 +-
+ cpan/Test-Harness/lib/TAP/Formatter/File/Session.pm            | 2 +-
+ cpan/Test-Harness/lib/TAP/Formatter/Session.pm                 | 2 +-
+ cpan/Test-Harness/lib/TAP/Harness.pm                           | 2 +-
+ cpan/Test-Harness/lib/TAP/Harness/Env.pm                       | 2 +-
+ cpan/Test-Harness/lib/TAP/Object.pm                            | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser.pm                            | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Aggregator.pm                 | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Grammar.pm                    | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Iterator.pm                   | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Iterator/Array.pm             | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Iterator/Process.pm           | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Iterator/Stream.pm            | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/IteratorFactory.pm            | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Multiplexer.pm                | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Result.pm                     | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Result/Bailout.pm             | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Result/Comment.pm             | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Result/Plan.pm                | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Result/Pragma.pm              | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Result/Test.pm                | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Result/Unknown.pm             | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Result/Version.pm             | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Result/YAML.pm                | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/ResultFactory.pm              | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Scheduler.pm                  | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Scheduler/Job.pm              | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Scheduler/Spinner.pm          | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/Source.pm                     | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/SourceHandler.pm              | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Executable.pm   | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/SourceHandler/File.pm         | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Handle.pm       | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Perl.pm         | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/SourceHandler/RawTAP.pm       | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm             | 2 +-
+ cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm             | 2 +-
+ cpan/Test-Harness/lib/Test/Harness.pm                          | 2 +-
+ ext/Pod-Html/lib/Pod/Html.pm                                   | 2 +-
+ 108 files changed, 108 insertions(+), 108 deletions(-)
+
+diff --git a/cpan/Archive-Tar/lib/Archive/Tar.pm b/cpan/Archive-Tar/lib/Archive/Tar.pm
+index 1b792df..6a047a3 100644
+--- a/cpan/Archive-Tar/lib/Archive/Tar.pm
++++ b/cpan/Archive-Tar/lib/Archive/Tar.pm
+@@ -31,7 +31,7 @@ use vars qw[$DEBUG $error $VERSION $WARN $FOLLOW_SYMLINK $CHOWN $CHMOD
+ $DEBUG                  = 0;
+ $WARN                   = 1;
+ $FOLLOW_SYMLINK         = 0;
+-$VERSION                = "2.04";
++$VERSION                = "2.04_01";
+ $CHOWN                  = 1;
+ $CHMOD                  = 1;
+ $SAME_PERMISSIONS       = $> == 0 ? 1 : 0;
+diff --git a/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm b/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm
+index 399aaf6..f9557e9 100644
+--- a/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm
++++ b/cpan/Archive-Tar/lib/Archive/Tar/Constant.pm
+@@ -3,7 +3,7 @@ package Archive::Tar::Constant;
+ BEGIN {
+     require Exporter;
+ 
+-    $VERSION    = '2.04';
++    $VERSION    = '2.04_01';
+     @ISA        = qw[Exporter];
+ 
+     require Time::Local if $^O eq "MacOS";
+diff --git a/cpan/Archive-Tar/lib/Archive/Tar/File.pm b/cpan/Archive-Tar/lib/Archive/Tar/File.pm
+index 3aa1b3c..3ecad56 100644
+--- a/cpan/Archive-Tar/lib/Archive/Tar/File.pm
++++ b/cpan/Archive-Tar/lib/Archive/Tar/File.pm
+@@ -13,7 +13,7 @@ use Archive::Tar::Constant;
+ 
+ use vars qw[@ISA $VERSION];
+ #@ISA        = qw[Archive::Tar];
+-$VERSION    = '2.04';
++$VERSION    = '2.04_01';
+ 
+ ### set value to 1 to oct() it during the unpack ###
+ 
+diff --git a/cpan/CPAN/lib/CPAN.pm b/cpan/CPAN/lib/CPAN.pm
+index 6096916..f4544f0 100644
+--- a/cpan/CPAN/lib/CPAN.pm
++++ b/cpan/CPAN/lib/CPAN.pm
+@@ -2,7 +2,7 @@
+ # vim: ts=4 sts=4 sw=4:
+ use strict;
+ package CPAN;
+-$CPAN::VERSION = '2.11';
++$CPAN::VERSION = '2.11_01';
+ $CPAN::VERSION =~ s/_//;
+ 
+ # we need to run chdir all over and we would get at wrong libraries
+diff --git a/cpan/Digest-SHA/lib/Digest/SHA.pm b/cpan/Digest-SHA/lib/Digest/SHA.pm
+index 3abca3d..e696dec 100644
+--- a/cpan/Digest-SHA/lib/Digest/SHA.pm
++++ b/cpan/Digest-SHA/lib/Digest/SHA.pm
+@@ -8,7 +8,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+ use Fcntl;
+ use integer;
+ 
+-$VERSION = '5.95';
++$VERSION = '5.95_01';
+ 
+ require Exporter;
+ require DynaLoader;
+diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
+index 3bb10970..7937dde 100644
+--- a/cpan/Encode/Encode.pm
++++ b/cpan/Encode/Encode.pm
+@@ -4,7 +4,7 @@
+ package Encode;
+ use strict;
+ use warnings;
+-our $VERSION = sprintf "%d.%02d", q$Revision: 2.72 $ =~ /(\d+)/g;
++our $VERSION = sprintf "%d.%02d_01", q$Revision: 2.72 $ =~ /(\d+)/g;
+ use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
+ use XSLoader ();
+ XSLoader::load( __PACKAGE__, $VERSION );
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
+index 203b3aa..ad67aef 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
+@@ -10,7 +10,7 @@ our @ISA = qw(Exporter);
+ 
+ our @EXPORT  = qw(test_harness pod2man perllocal_install uninstall
+                   warn_if_old_packlist test_s cp_nonempty);
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ my $Is_VMS = $^O eq 'VMS';
+ 
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
+index 3df1793..3a4e138 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
+@@ -2,7 +2,7 @@ package ExtUtils::Liblist;
+ 
+ use strict;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ use File::Spec;
+ require ExtUtils::Liblist::Kid;
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+index 37bcfd4..66e4caa 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+@@ -11,7 +11,7 @@ use 5.006;
+ 
+ use strict;
+ use warnings;
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ use ExtUtils::MakeMaker::Config;
+ use Cwd 'cwd';
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
+index f2aa8b4..c137ffa 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
+@@ -3,7 +3,7 @@ package ExtUtils::MM;
+ use strict;
+ use ExtUtils::MakeMaker::Config;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require ExtUtils::Liblist;
+ require ExtUtils::MakeMaker;
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
+index 58ea5b9..a52db81 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
+@@ -1,7 +1,7 @@
+ package ExtUtils::MM_AIX;
+ 
+ use strict;
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require ExtUtils::MM_Unix;
+ our @ISA = qw(ExtUtils::MM_Unix);
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+index 4c00129..5c2f515 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+@@ -1,7 +1,7 @@
+ package ExtUtils::MM_Any;
+ 
+ use strict;
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ use Carp;
+ use File::Spec;
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
+index 35b76c0..d4267c0 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
+@@ -26,7 +26,7 @@ require ExtUtils::MM_Any;
+ require ExtUtils::MM_Unix;
+ 
+ our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ 
+ =item os_flavor
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
+index b504c47..8252651 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
+@@ -9,7 +9,7 @@ require ExtUtils::MM_Unix;
+ require ExtUtils::MM_Win32;
+ our @ISA = qw( ExtUtils::MM_Unix );
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ 
+ =head1 NAME
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
+index 353c54f..ac5bfd5 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
+@@ -2,7 +2,7 @@ package ExtUtils::MM_DOS;
+ 
+ use strict;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require ExtUtils::MM_Any;
+ require ExtUtils::MM_Unix;
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
+index 315d1b4..08431d2 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
+@@ -7,7 +7,7 @@ BEGIN {
+     our @ISA = qw( ExtUtils::MM_Unix );
+ }
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ 
+ =head1 NAME
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
+index bef2c00..ab505fe 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
+@@ -2,7 +2,7 @@ package ExtUtils::MM_MacOS;
+ 
+ use strict;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ sub new {
+     die 'MacOS Classic (MacPerl) is no longer supported by MakeMaker';
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
+index 4e36796..6d189c0 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
+@@ -22,7 +22,7 @@ use strict;
+ use ExtUtils::MakeMaker::Config;
+ use File::Basename;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require ExtUtils::MM_Win32;
+ our @ISA = qw(ExtUtils::MM_Win32);
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
+index c9ace00..441032b 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
+@@ -5,7 +5,7 @@ use strict;
+ use ExtUtils::MakeMaker qw(neatvalue);
+ use File::Spec;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require ExtUtils::MM_Any;
+ require ExtUtils::MM_Unix;
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
+index 13e12c4..82ea50c 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
+@@ -1,7 +1,7 @@
+ package ExtUtils::MM_QNX;
+ 
+ use strict;
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require ExtUtils::MM_Unix;
+ our @ISA = qw(ExtUtils::MM_Unix);
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
+index 4af2909..3d20415 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
+@@ -1,7 +1,7 @@
+ package ExtUtils::MM_UWIN;
+ 
+ use strict;
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require ExtUtils::MM_Unix;
+ our @ISA = qw(ExtUtils::MM_Unix);
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+index f63145c..d4312b0 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -15,7 +15,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue);
+ 
+ # If we make $VERSION an our variable parse_version() breaks
+ use vars qw($VERSION);
+-$VERSION = '7.04_01';
++$VERSION = '7.04_02';
+ $VERSION = eval $VERSION;  ## no critic [BuiltinFunctions::ProhibitStringyEval]
+ 
+ require ExtUtils::MM_Any;
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
+index 45d06b0..f3bfaf9 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
+@@ -15,7 +15,7 @@ BEGIN {
+ 
+ use File::Basename;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require ExtUtils::MM_Any;
+ require ExtUtils::MM_Unix;
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
+index dfec6d5..1f0e455 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
+@@ -1,7 +1,7 @@
+ package ExtUtils::MM_VOS;
+ 
+ use strict;
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require ExtUtils::MM_Unix;
+ our @ISA = qw(ExtUtils::MM_Unix);
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
+index fbd3f49..7edaf8f 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
+@@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw( neatvalue );
+ require ExtUtils::MM_Any;
+ require ExtUtils::MM_Unix;
+ our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ $ENV{EMXSHELL} = 'sh'; # to run `commands`
+ 
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
+index cc37c24..8e03a60 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
+@@ -2,7 +2,7 @@ package ExtUtils::MM_Win95;
+ 
+ use strict;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require ExtUtils::MM_Win32;
+ our @ISA = qw(ExtUtils::MM_Win32);
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
+index f2114f9..c3e6453 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
+@@ -3,7 +3,7 @@ package ExtUtils::MY;
+ use strict;
+ require ExtUtils::MM;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ our @ISA = qw(ExtUtils::MM);
+ 
+ {
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+index fe95b27..d5a1dd7 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+@@ -24,7 +24,7 @@ my %Recognized_Att_Keys;
+ our %macro_fsentity; # whether a macro is a filesystem name
+ our %macro_dep; # whether a macro is a dependency
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ $VERSION = eval $VERSION;  ## no critic [BuiltinFunctions::ProhibitStringyEval]
+ 
+ # Emulate something resembling CVS $Revision$
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
+index 9001cc6..fe56648 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
+@@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Config;
+ 
+ use strict;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ use Config ();
+ 
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
+index 97d4300..3cbaf28 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
+@@ -3,7 +3,7 @@ package ExtUtils::Mkbootstrap;
+ # There's just too much Dynaloader incest here to turn on strict vars.
+ use strict 'refs';
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ require Exporter;
+ our @ISA = ('Exporter');
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
+index 3a9fc71..4ae9e73 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
+@@ -10,7 +10,7 @@ use Config;
+ 
+ our @ISA = qw(Exporter);
+ our @EXPORT = qw(&Mksymlists);
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ sub Mksymlists {
+     my(%spec) = @_;
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
+index 2a5323e..fa7b73c 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
+@@ -3,7 +3,7 @@ package ExtUtils::testlib;
+ use strict;
+ use warnings;
+ 
+-our $VERSION = '7.04_01';
++our $VERSION = '7.04_02';
+ 
+ use Cwd;
+ use File::Spec;
+diff --git a/cpan/IO-Compress/lib/Compress/Zlib.pm b/cpan/IO-Compress/lib/Compress/Zlib.pm
+index d197a34..7819833 100644
+--- a/cpan/IO-Compress/lib/Compress/Zlib.pm
++++ b/cpan/IO-Compress/lib/Compress/Zlib.pm
+@@ -17,7 +17,7 @@ use warnings ;
+ use bytes ;
+ our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $XS_VERSION = $VERSION; 
+ $VERSION = eval $VERSION;
+ 
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
+index 096c753..20fee96 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm
+@@ -9,7 +9,7 @@ use IO::Compress::Base::Common  2.068 qw(:Status);
+ use Compress::Raw::Bzip2  2.068 ;
+ 
+ our ($VERSION);
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ sub mkCompObject
+ {
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
+index a52b623..07cd82a 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm
+@@ -10,7 +10,7 @@ use Compress::Raw::Zlib  2.068 qw( !crc32 !adler32 ) ;
+ require Exporter;                                     
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ @ISA = qw(Exporter);
+ @EXPORT_OK = @Compress::Raw::Zlib::DEFLATE_CONSTANTS;
+ %EXPORT_TAGS = %Compress::Raw::Zlib::DEFLATE_CONSTANTS;
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
+index b001abe..87cfaae 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm
+@@ -7,7 +7,7 @@ use bytes;
+ use IO::Compress::Base::Common  2.068 qw(:Status);
+ our ($VERSION);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ sub mkCompObject
+ {
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm
+index 20adb0e..b101b6f 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Base.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Base.pm
+@@ -20,7 +20,7 @@ use Symbol();
+ our (@ISA, $VERSION);
+ @ISA    = qw(Exporter IO::File);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ #Can't locate object method "SWASHNEW" via package "utf8" (perhaps you forgot to load "utf8"?) at .../ext/Compress-Zlib/Gzip/blib/lib/Compress/Zlib/Common.pm line 16.
+ 
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm b/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm
+index 86bcaa6..cd33982 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm
+@@ -11,7 +11,7 @@ use File::GlobMapper;
+ require Exporter;
+ our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE);
+ @ISA = qw(Exporter);
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ @EXPORT = qw( isaFilehandle isaFilename isaScalar
+               whatIsInput whatIsOutput 
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
+index d6c2d66..ddc1c56 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm
+@@ -14,7 +14,7 @@ use IO::Compress::Adapter::Bzip2 2.068 ;
+ 
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $Bzip2Error = '';
+ 
+ @ISA    = qw(Exporter IO::Compress::Base);
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
+index 4b80953..1091e37 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm
+@@ -17,7 +17,7 @@ use IO::Compress::Base::Common  2.068 qw();
+ 
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $DeflateError = '';
+ 
+ @ISA    = qw(Exporter IO::Compress::RawDeflate);
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
+index 01ee34e..6579319 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm
+@@ -25,7 +25,7 @@ BEGIN
+ 
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $GzipError = '' ;
+ 
+ @ISA    = qw(Exporter IO::Compress::RawDeflate);
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
+index 2b73a3c..f236fcb 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm
+@@ -9,7 +9,7 @@ require Exporter;
+ our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names);
+ our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ @ISA = qw(Exporter);
+ 
+diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
+index 2209952..60e07bb 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm
+@@ -14,7 +14,7 @@ require Exporter ;
+ 
+ our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $RawDeflateError = '';
+ 
+ @ISA = qw(Exporter IO::Compress::Base);
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip.pm b/cpan/IO-Compress/lib/IO/Compress/Zip.pm
+index f8ec20c..9f2d873 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Zip.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Zip.pm
+@@ -36,7 +36,7 @@ require Exporter ;
+ 
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $ZipError = '';
+ 
+ @ISA = qw(Exporter IO::Compress::RawDeflate);
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm
+index bc56966..20b1b31 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm
+@@ -7,7 +7,7 @@ require Exporter;
+ 
+ our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ @ISA = qw(Exporter);
+ 
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
+index f85364d..c569806 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm
+@@ -9,7 +9,7 @@ require Exporter;
+ 
+ our ($VERSION, @ISA, @EXPORT);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ @ISA = qw(Exporter);
+ 
+diff --git a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
+index f99b9ed..6fee229 100644
+--- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
++++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm
+@@ -8,7 +8,7 @@ use bytes;
+ 
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ use IO::Compress::Gzip::Constants 2.068 ;
+ 
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
+index 0161b8f..c31cd10 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
+@@ -9,7 +9,7 @@ use IO::Compress::Base::Common 2.068 qw(:Status);
+ use Compress::Raw::Bzip2 2.068 ;
+ 
+ our ($VERSION, @ISA);
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ sub mkUncompObject
+ {
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
+index ecc66b9..1387a9c 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
+@@ -9,7 +9,7 @@ use IO::Compress::Zip::Constants ;
+ 
+ our ($VERSION);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ use Compress::Raw::Zlib  2.068 ();
+ 
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
+index 2cfe61e..5b7bc2e 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
+@@ -8,7 +8,7 @@ use IO::Compress::Base::Common  2.068 qw(:Status);
+ use Compress::Raw::Zlib  2.068 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
+ 
+ our ($VERSION);
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ 
+ 
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
+index fd0bd69..020af25 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
+@@ -21,7 +21,7 @@ require Exporter ;
+ 
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $AnyInflateError = '';
+ 
+ @ISA = qw( Exporter IO::Uncompress::Base );
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
+index 0d2568e..602178c 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
+@@ -13,7 +13,7 @@ require Exporter ;
+ 
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $AnyUncompressError = '';
+ 
+ @ISA = qw( Exporter IO::Uncompress::Base );
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
+index 04348a2..dd521f5 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
+@@ -9,7 +9,7 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS);
+ @ISA    = qw(Exporter IO::File);
+ 
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ use constant G_EOF => 0 ;
+ use constant G_ERR => -1 ;
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
+index c6e7f46..157b110 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
+@@ -12,7 +12,7 @@ use IO::Uncompress::Adapter::Bunzip2 2.068 ;
+ require Exporter ;
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $Bunzip2Error = '';
+ 
+ @ISA    = qw( Exporter IO::Uncompress::Base );
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
+index 1f33f0b..8655b68 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
+@@ -28,7 +28,7 @@ Exporter::export_ok_tags('all');
+ 
+ $GunzipError = '';
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ 
+ sub new
+ {
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
+index 1330731..fd6f551 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
+@@ -13,7 +13,7 @@ use IO::Uncompress::RawInflate  2.068 ;
+ require Exporter ;
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $InflateError = '';
+ 
+ @ISA    = qw( Exporter IO::Uncompress::RawInflate );
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
+index 3a375a7..7b21821 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
+@@ -14,7 +14,7 @@ use IO::Uncompress::Adapter::Inflate  2.068 ;
+ require Exporter ;
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $RawInflateError = '';
+ 
+ @ISA    = qw( Exporter IO::Uncompress::Base );
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
+index f73313f..132da90 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
+@@ -31,7 +31,7 @@ require Exporter ;
+ 
+ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
+ 
+-$VERSION = '2.068';
++$VERSION = '2.068_001';
+ $UnzipError = '';
+ 
+ @ISA    = qw(Exporter IO::Uncompress::RawInflate);
+diff --git a/cpan/JSON-PP/lib/JSON/PP.pm b/cpan/JSON-PP/lib/JSON/PP.pm
+index 7a011a4..1e29eee 100644
+--- a/cpan/JSON-PP/lib/JSON/PP.pm
++++ b/cpan/JSON-PP/lib/JSON/PP.pm
+@@ -11,7 +11,7 @@ use Carp ();
+ use B ();
+ #use Devel::Peek;
+ 
+-$JSON::PP::VERSION = '2.27300';
++$JSON::PP::VERSION = '2.27300_01';
+ 
+ @JSON::PP::EXPORT = qw(encode_json decode_json from_json to_json);
+ 
+diff --git a/cpan/Test-Harness/lib/App/Prove.pm b/cpan/Test-Harness/lib/App/Prove.pm
+index 4608978..f81a4ae 100644
+--- a/cpan/Test-Harness/lib/App/Prove.pm
++++ b/cpan/Test-Harness/lib/App/Prove.pm
+@@ -22,7 +22,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/App/Prove/State.pm b/cpan/Test-Harness/lib/App/Prove/State.pm
+index 0e237d5..36a231f 100644
+--- a/cpan/Test-Harness/lib/App/Prove/State.pm
++++ b/cpan/Test-Harness/lib/App/Prove/State.pm
+@@ -29,7 +29,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/App/Prove/State/Result.pm b/cpan/Test-Harness/lib/App/Prove/State/Result.pm
+index 6725c5a..e165b0f 100644
+--- a/cpan/Test-Harness/lib/App/Prove/State/Result.pm
++++ b/cpan/Test-Harness/lib/App/Prove/State/Result.pm
+@@ -18,7 +18,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/App/Prove/State/Result/Test.pm b/cpan/Test-Harness/lib/App/Prove/State/Result/Test.pm
+index a776f8f..8ed13ad 100644
+--- a/cpan/Test-Harness/lib/App/Prove/State/Result/Test.pm
++++ b/cpan/Test-Harness/lib/App/Prove/State/Result/Test.pm
+@@ -13,7 +13,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Base.pm b/cpan/Test-Harness/lib/TAP/Base.pm
+index 61c567f..e0ba8e0 100644
+--- a/cpan/Test-Harness/lib/TAP/Base.pm
++++ b/cpan/Test-Harness/lib/TAP/Base.pm
+@@ -16,7 +16,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ use constant GOT_TIME_HIRES => do {
+     eval 'use Time::HiRes qw(time);';
+diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Base.pm b/cpan/Test-Harness/lib/TAP/Formatter/Base.pm
+index a5a78d1..f5254cf 100644
+--- a/cpan/Test-Harness/lib/TAP/Formatter/Base.pm
++++ b/cpan/Test-Harness/lib/TAP/Formatter/Base.pm
+@@ -62,7 +62,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Color.pm b/cpan/Test-Harness/lib/TAP/Formatter/Color.pm
+index 76937b0..d4d1116 100644
+--- a/cpan/Test-Harness/lib/TAP/Formatter/Color.pm
++++ b/cpan/Test-Harness/lib/TAP/Formatter/Color.pm
+@@ -75,7 +75,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Console.pm b/cpan/Test-Harness/lib/TAP/Formatter/Console.pm
+index 01f1a54..3ca4d95 100644
+--- a/cpan/Test-Harness/lib/TAP/Formatter/Console.pm
++++ b/cpan/Test-Harness/lib/TAP/Formatter/Console.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Console/ParallelSession.pm b/cpan/Test-Harness/lib/TAP/Formatter/Console/ParallelSession.pm
+index 9c4b9cf..6c67c29 100644
+--- a/cpan/Test-Harness/lib/TAP/Formatter/Console/ParallelSession.pm
++++ b/cpan/Test-Harness/lib/TAP/Formatter/Console/ParallelSession.pm
+@@ -45,7 +45,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Console/Session.pm b/cpan/Test-Harness/lib/TAP/Formatter/Console/Session.pm
+index 672a083..b741d68 100644
+--- a/cpan/Test-Harness/lib/TAP/Formatter/Console/Session.pm
++++ b/cpan/Test-Harness/lib/TAP/Formatter/Console/Session.pm
+@@ -30,7 +30,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Formatter/File.pm b/cpan/Test-Harness/lib/TAP/Formatter/File.pm
+index 8ee90fc..f7b8af3 100644
+--- a/cpan/Test-Harness/lib/TAP/Formatter/File.pm
++++ b/cpan/Test-Harness/lib/TAP/Formatter/File.pm
+@@ -17,7 +17,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Formatter/File/Session.pm b/cpan/Test-Harness/lib/TAP/Formatter/File/Session.pm
+index 2a92d60..607029c 100644
+--- a/cpan/Test-Harness/lib/TAP/Formatter/File/Session.pm
++++ b/cpan/Test-Harness/lib/TAP/Formatter/File/Session.pm
+@@ -14,7 +14,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Formatter/Session.pm b/cpan/Test-Harness/lib/TAP/Formatter/Session.pm
+index 089c1e6..f0b94f9 100644
+--- a/cpan/Test-Harness/lib/TAP/Formatter/Session.pm
++++ b/cpan/Test-Harness/lib/TAP/Formatter/Session.pm
+@@ -27,7 +27,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 METHODS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Harness.pm b/cpan/Test-Harness/lib/TAP/Harness.pm
+index d9ede6b..53b8e25 100644
+--- a/cpan/Test-Harness/lib/TAP/Harness.pm
++++ b/cpan/Test-Harness/lib/TAP/Harness.pm
+@@ -20,7 +20,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ $ENV{HARNESS_ACTIVE}  = 1;
+ $ENV{HARNESS_VERSION} = $VERSION;
+diff --git a/cpan/Test-Harness/lib/TAP/Harness/Env.pm b/cpan/Test-Harness/lib/TAP/Harness/Env.pm
+index c565b13..dd6bc32 100644
+--- a/cpan/Test-Harness/lib/TAP/Harness/Env.pm
++++ b/cpan/Test-Harness/lib/TAP/Harness/Env.pm
+@@ -7,7 +7,7 @@ use constant IS_VMS => ( $^O eq 'VMS' );
+ use TAP::Object;
+ use Text::ParseWords qw/shellwords/;
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ # Get the parts of @INC which are changed from the stock list AND
+ # preserve reordering of stock directories.
+diff --git a/cpan/Test-Harness/lib/TAP/Object.pm b/cpan/Test-Harness/lib/TAP/Object.pm
+index 84dfe88..948395a 100644
+--- a/cpan/Test-Harness/lib/TAP/Object.pm
++++ b/cpan/Test-Harness/lib/TAP/Object.pm
+@@ -13,7 +13,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser.pm b/cpan/Test-Harness/lib/TAP/Parser.pm
+index 22222c2..8b64f0f 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser.pm
+@@ -31,7 +31,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ my $DEFAULT_TAP_VERSION = 12;
+ my $MAX_TAP_VERSION     = 13;
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Aggregator.pm b/cpan/Test-Harness/lib/TAP/Parser/Aggregator.pm
+index 5745245..93042be 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Aggregator.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Aggregator.pm
+@@ -16,7 +16,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Grammar.pm b/cpan/Test-Harness/lib/TAP/Parser/Grammar.pm
+index 1a0be3c..a978e77 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Grammar.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Grammar.pm
+@@ -18,7 +18,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Iterator.pm b/cpan/Test-Harness/lib/TAP/Parser/Iterator.pm
+index 114aba6..18a5104 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Iterator.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Iterator.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Array.pm b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Array.pm
+index 650adbf..baa2635 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Array.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Array.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Process.pm b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Process.pm
+index 923de9a..ef40ba6 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Process.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Process.pm
+@@ -20,7 +20,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Stream.pm b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Stream.pm
+index bd6a8b7..b90770e 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Iterator/Stream.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Iterator/Stream.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/IteratorFactory.pm b/cpan/Test-Harness/lib/TAP/Parser/IteratorFactory.pm
+index d4e29ff..5681465 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/IteratorFactory.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/IteratorFactory.pm
+@@ -20,7 +20,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Multiplexer.pm b/cpan/Test-Harness/lib/TAP/Parser/Multiplexer.pm
+index d002272..ca0504a 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Multiplexer.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Multiplexer.pm
+@@ -21,7 +21,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result.pm b/cpan/Test-Harness/lib/TAP/Parser/Result.pm
+index efbcfe8..f8a31a3 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Result.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Result.pm
+@@ -28,7 +28,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Bailout.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Bailout.pm
+index c374986..22cf456 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Result/Bailout.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Bailout.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Comment.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Comment.pm
+index bd0f78a..ab9973f 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Result/Comment.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Comment.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Plan.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Plan.pm
+index 900874a..007d2d5 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Result/Plan.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Plan.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Pragma.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Pragma.pm
+index b7b6a43..053e175 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Result/Pragma.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Pragma.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Test.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Test.pm
+index 57219cb..6581a3f 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Result/Test.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Test.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Unknown.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Unknown.pm
+index 8bfeb6c..c4063fc 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Result/Unknown.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Unknown.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/Version.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/Version.pm
+index 68789b5..46205fe 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Result/Version.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Result/Version.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Result/YAML.pm b/cpan/Test-Harness/lib/TAP/Parser/Result/YAML.pm
+index 0775e4a..a4a09e8 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Result/YAML.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Result/YAML.pm
+@@ -15,7 +15,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/ResultFactory.pm b/cpan/Test-Harness/lib/TAP/Parser/ResultFactory.pm
+index 12ecb1c..53f1eb1 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/ResultFactory.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/ResultFactory.pm
+@@ -33,7 +33,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head2 DESCRIPTION
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Scheduler.pm b/cpan/Test-Harness/lib/TAP/Parser/Scheduler.pm
+index ed3ef51..9bd7fb7 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Scheduler.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Scheduler.pm
+@@ -17,7 +17,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Job.pm b/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Job.pm
+index ae0b59b..ceb24be 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Job.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Job.pm
+@@ -14,7 +14,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Spinner.pm b/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Spinner.pm
+index a739164..d8b3b54 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Spinner.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Scheduler/Spinner.pm
+@@ -14,7 +14,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/Source.pm b/cpan/Test-Harness/lib/TAP/Parser/Source.pm
+index 27f6e53..31720e6 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/Source.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/Source.pm
+@@ -18,7 +18,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler.pm
+index a2e943b..24a79b5 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler.pm
+@@ -16,7 +16,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Executable.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Executable.pm
+index 3e0bd6e..975e2be 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Executable.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Executable.pm
+@@ -20,7 +20,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/File.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/File.pm
+index cb117c6..35b94a3 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/File.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/File.pm
+@@ -20,7 +20,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Handle.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Handle.pm
+index d113845..00be841 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Handle.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Handle.pm
+@@ -20,7 +20,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Perl.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Perl.pm
+index 4dc3afb..f09bf08 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Perl.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Perl.pm
+@@ -25,7 +25,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/RawTAP.pm b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/RawTAP.pm
+index 8574e27..5e5abe4 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/RawTAP.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/SourceHandler/RawTAP.pm
+@@ -20,7 +20,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm b/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm
+index a79f728..40292ce 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm
+@@ -5,7 +5,7 @@ use warnings;
+ 
+ use base 'TAP::Object';
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ # TODO:
+ #   Handle blessed object syntax
+diff --git a/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm b/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm
+index 9d68a18..51d6171 100644
+--- a/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm
++++ b/cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm
+@@ -5,7 +5,7 @@ use warnings;
+ 
+ use base 'TAP::Object';
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ my $ESCAPE_CHAR = qr{ [ \x00-\x1f \" ] }x;
+ my $ESCAPE_KEY  = qr{ (?: ^\W ) | $ESCAPE_CHAR }x;
+diff --git a/cpan/Test-Harness/lib/Test/Harness.pm b/cpan/Test-Harness/lib/Test/Harness.pm
+index d375919..f3c9a0f 100644
+--- a/cpan/Test-Harness/lib/Test/Harness.pm
++++ b/cpan/Test-Harness/lib/Test/Harness.pm
+@@ -35,7 +35,7 @@ Version 3.35
+ 
+ =cut
+ 
+-our $VERSION = '3.35';
++our $VERSION = '3.35_01';
+ 
+ # Backwards compatibility for exportable variable names.
+ *verbose  = *Verbose;
+diff --git a/ext/Pod-Html/lib/Pod/Html.pm b/ext/Pod-Html/lib/Pod/Html.pm
+index 34729a9..060ad41 100644
+--- a/ext/Pod-Html/lib/Pod/Html.pm
++++ b/ext/Pod-Html/lib/Pod/Html.pm
+@@ -3,7 +3,7 @@ use strict;
+ require Exporter;
+ 
+ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+-$VERSION = 1.22;
++$VERSION = 1.22_01;
+ @ISA = qw(Exporter);
+ @EXPORT = qw(pod2html htmlify);
+ @EXPORT_OK = qw(anchorify);
+-- 
+2.9.2
+
+From 8b4decb3288f1c5b6acceebf2246fdada0b5af3c Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Thu, 23 Jun 2016 10:41:48 +1000
+Subject: [PATCH 3/9] perl5db.pl: ensure PadWalker is loaded from standard
+ paths
+
+---
+ lib/perl5db.pl | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/lib/perl5db.pl b/lib/perl5db.pl
+index 7e7194e..905e4a7 100644
+--- a/lib/perl5db.pl
++++ b/lib/perl5db.pl
+@@ -1938,7 +1938,10 @@ sub _DB__handle_y_command {
+         = $obj->cmd_args =~ /\A(?:(\d*)\s*(.*))?\z/) {
+ 
+         # See if we've got the necessary support.
+-        if (!eval { require PadWalker; PadWalker->VERSION(0.08) }) {
++        if (!eval {
++            local @INC = @INC;
++            pop @INC if $INC[-1] eq '.';
++            require PadWalker; PadWalker->VERSION(0.08) }) {
+             my $Err = $@;
+             _db_warn(
+                 $Err =~ /locate/
+@@ -9420,7 +9423,10 @@ if PadWalker could be loaded.
+ 
+ =cut
+ 
+-        if (not $text =~ /::/ and eval { require PadWalker } ) {
++        if (not $text =~ /::/ and eval {
++            local @INC = @INC;
++            pop @INC if $INC[-1] eq '.';
++            require PadWalker } ) {
+             my $level = 1;
+             while (1) {
+                 my @info = caller($level);
+-- 
+2.9.2
+
+From 211eea87679bae9960e7e55689ab52dac83a80ee Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Tue, 28 Jun 2016 16:02:59 +1000
+Subject: [PATCH 4/9] perl5db.pl: bump perldb $VERSION
+
+Used _001 instead of _01 since 5.24 has 1.49_04 so presumably
+_01 through _03 has been used.
+---
+ lib/perl5db.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/perl5db.pl b/lib/perl5db.pl
+index 905e4a7..b2d2b96 100644
+--- a/lib/perl5db.pl
++++ b/lib/perl5db.pl
+@@ -528,7 +528,7 @@ BEGIN {
+ # Debugger for Perl 5.00x; perl5db.pl patch level:
+ use vars qw($VERSION $header);
+ 
+-$VERSION = '1.49';
++$VERSION = '1.49_001';
+ 
+ $header = "perl5db.pl version $VERSION";
+ 
+-- 
+2.9.2
+
+From ac5b10a9c5ff29cb2fbb732524e471547414c5f8 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Thu, 23 Jun 2016 14:06:40 +1000
+Subject: [PATCH 5/9] dist/: remove . from @INC when loading optional modules
+
+---
+ cpan/Test/lib/Test.pm                          | 7 ++++++-
+ dist/I18N-LangTags/lib/I18N/LangTags/Detect.pm | 2 ++
+ dist/IO/IO.pm                                  | 2 ++
+ dist/Locale-Maketext/lib/Locale/Maketext.pm    | 2 ++
+ dist/Net-Ping/lib/Net/Ping.pm                  | 6 +++++-
+ dist/PathTools/Cwd.pm                          | 5 ++++-
+ dist/PathTools/lib/File/Spec/Cygwin.pm         | 6 +++++-
+ dist/PathTools/lib/File/Spec/VMS.pm            | 5 ++++-
+ dist/PathTools/lib/File/Spec/Win32.pm          | 6 +++++-
+ dist/Storable/Storable.pm                      | 8 +++++++-
+ dist/base/lib/base.pm                          | 6 +++++-
+ 11 files changed, 47 insertions(+), 8 deletions(-)
+
+diff --git a/cpan/Test/lib/Test.pm b/cpan/Test/lib/Test.pm
+index 108bc10..7c2c9d3 100644
+--- a/cpan/Test/lib/Test.pm
++++ b/cpan/Test/lib/Test.pm
+@@ -480,7 +480,12 @@ sub _diff_complain {
+     my($result, $expected, $detail, $prefix) = @_;
+     return _diff_complain_external(@_) if $ENV{PERL_TEST_DIFF};
+     return _diff_complain_algdiff(@_)
+-     if eval { require Algorithm::Diff; Algorithm::Diff->VERSION(1.15); 1; };
++      if eval {
++          local @INC = @INC;
++          pop @INC if $INC[-1] eq '.';
++          require Algorithm::Diff; Algorithm::Diff->VERSION(1.15);
++          1;
++      };
+ 
+     $told_about_diff++ or print $TESTERR <<"EOT";
+ # $prefix   (Install the Algorithm::Diff module to have differences in multiline
+diff --git a/dist/I18N-LangTags/lib/I18N/LangTags/Detect.pm b/dist/I18N-LangTags/lib/I18N/LangTags/Detect.pm
+index f13d546..e9c3aaa 100644
+--- a/dist/I18N-LangTags/lib/I18N/LangTags/Detect.pm
++++ b/dist/I18N-LangTags/lib/I18N/LangTags/Detect.pm
+@@ -145,6 +145,8 @@ sub _try_use {   # Basically a wrapper around "require Modulename"
+   print " About to use $module ...\n" if DEBUG;
+   {
+     local $SIG{'__DIE__'};
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     eval "require $module"; # used to be "use $module", but no point in that.
+   }
+   if($@) {
+diff --git a/dist/IO/IO.pm b/dist/IO/IO.pm
+index 2762958..982871d 100644
+--- a/dist/IO/IO.pm
++++ b/dist/IO/IO.pm
+@@ -18,6 +18,8 @@ sub import {
+     
+     my @l = @_ ? @_ : qw(Handle Seekable File Pipe Socket Dir);
+ 
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     eval join("", map { "require IO::" . (/(\w+)/)[0] . ";\n" } @l)
+ 	or croak $@;
+ }
+diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm
+index 24c31ea..facc32a 100644
+--- a/dist/Locale-Maketext/lib/Locale/Maketext.pm
++++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm
+@@ -449,6 +449,8 @@ sub _try_use {   # Basically a wrapper around "require Modulename"
+ 
+     local $SIG{'__DIE__'};
+     local $@;
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     eval "require $module"; # used to be "use $module", but no point in that.
+ 
+     if($@) {
+diff --git a/dist/Net-Ping/lib/Net/Ping.pm b/dist/Net-Ping/lib/Net/Ping.pm
+index 2766c9e..c9cbd27 100644
+--- a/dist/Net-Ping/lib/Net/Ping.pm
++++ b/dist/Net-Ping/lib/Net/Ping.pm
+@@ -410,7 +410,11 @@ sub ping_external {
+       $timeout            # Seconds after which ping times out
+      ) = @_;
+ 
+-  eval { require Net::Ping::External; }
++  eval {
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
++    require Net::Ping::External;
++  }
+     or croak('Protocol "external" not supported on your system: Net::Ping::External not found');
+   return Net::Ping::External::ping(ip => $ip, timeout => $timeout);
+ }
+diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
+index b4e80c6..1a58a46 100644
+--- a/dist/PathTools/Cwd.pm
++++ b/dist/PathTools/Cwd.pm
+@@ -40,7 +40,10 @@ if ($^O eq 'os2') {
+ my $use_vms_feature;
+ BEGIN {
+     if ($^O eq 'VMS') {
+-        if (eval { local $SIG{__DIE__}; require VMS::Feature; }) {
++        if (eval { local $SIG{__DIE__};
++                   local @INC = @INC;
++                   pop @INC if $INC[-1] eq '.';
++                   require VMS::Feature; }) {
+             $use_vms_feature = 1;
+         }
+     }
+diff --git a/dist/PathTools/lib/File/Spec/Cygwin.pm b/dist/PathTools/lib/File/Spec/Cygwin.pm
+index e4d55e1..3ae0e99 100644
+--- a/dist/PathTools/lib/File/Spec/Cygwin.pm
++++ b/dist/PathTools/lib/File/Spec/Cygwin.pm
+@@ -137,7 +137,11 @@ sub case_tolerant {
+   if ($mntopts and ($mntopts =~ /,managed/)) {
+     return 0;
+   }
+-  eval { require Win32API::File; } or return 1;
++  eval {
++      local @INC = @INC;
++      pop @INC if $INC[-1] eq '.';
++      require Win32API::File;
++  } or return 1;
+   my $osFsType = "\0"x256;
+   my $osVolName = "\0"x256;
+   my $ouFsFlags = 0;
+diff --git a/dist/PathTools/lib/File/Spec/VMS.pm b/dist/PathTools/lib/File/Spec/VMS.pm
+index 964b26c..0b2ba1f 100644
+--- a/dist/PathTools/lib/File/Spec/VMS.pm
++++ b/dist/PathTools/lib/File/Spec/VMS.pm
+@@ -39,7 +39,10 @@ via the C<DECC$FILENAME_UNIX_REPORT> CRTL feature.
+ 
+ my $use_feature;
+ BEGIN {
+-    if (eval { local $SIG{__DIE__}; require VMS::Feature; }) {
++    if (eval { local $SIG{__DIE__};
++               local @INC = @INC;
++               pop @INC if $INC[-1] eq '.';
++               require VMS::Feature; }) {
+         $use_feature = 1;
+     }
+ }
+diff --git a/dist/PathTools/lib/File/Spec/Win32.pm b/dist/PathTools/lib/File/Spec/Win32.pm
+index 9a36847..5435138 100644
+--- a/dist/PathTools/lib/File/Spec/Win32.pm
++++ b/dist/PathTools/lib/File/Spec/Win32.pm
+@@ -90,7 +90,11 @@ Default: 1
+ =cut
+ 
+ sub case_tolerant {
+-  eval { require Win32API::File; } or return 1;
++  eval {
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
++    require Win32API::File;
++  } or return 1;
+   my $drive = shift || "C:";
+   my $osFsType = "\0"x256;
+   my $osVolName = "\0"x256;
+diff --git a/dist/Storable/Storable.pm b/dist/Storable/Storable.pm
+index bd0632f..7b6e1a0 100644
+--- a/dist/Storable/Storable.pm
++++ b/dist/Storable/Storable.pm
+@@ -25,7 +25,13 @@ use vars qw($canonical $forgive_me $VERSION);
+ $VERSION = '2.53_01';
+ 
+ BEGIN {
+-    if (eval { local $SIG{__DIE__}; require Log::Agent; 1 }) {
++    if (eval {
++        local $SIG{__DIE__};
++        local @INC = @INC;
++        pop @INC if $INC[-1] eq '.';
++        require Log::Agent;
++        1;
++    }) {
+         Log::Agent->import;
+     }
+     #
+diff --git a/dist/base/lib/base.pm b/dist/base/lib/base.pm
+index 5d13787..2b15096 100644
+--- a/dist/base/lib/base.pm
++++ b/dist/base/lib/base.pm
+@@ -96,7 +96,11 @@ sub import {
+             {
+                 local $SIG{__DIE__};
+                 my $fn = _module_to_filename($base);
+-                eval { require $fn };
++                eval {
++                    local @INC = @INC;
++                    pop @INC if $INC[-1] eq '.';
++                    require $fn
++                };
+                 # Only ignore "Can't locate" errors from our eval require.
+                 # Other fatal errors (syntax etc) must be reported.
+                 #
+-- 
+2.9.2
+
+From bfe2dd1e9c3296bebf3ab9adc2ca48d3eb8d105d Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Tue, 28 Jun 2016 16:32:30 +1000
+Subject: [PATCH 6/9] dist/: bump $VERSION as needed
+
+This was originally patched in 5.24 where Test was in dist, hence
+the update to cpan/Test/
+---
+ cpan/Test/lib/Test.pm                          | 2 +-
+ dist/I18N-LangTags/lib/I18N/LangTags/Detect.pm | 2 +-
+ dist/IO/IO.pm                                  | 2 +-
+ dist/Locale-Maketext/lib/Locale/Maketext.pm    | 2 +-
+ dist/Net-Ping/lib/Net/Ping.pm                  | 2 +-
+ dist/PathTools/Cwd.pm                          | 2 +-
+ dist/PathTools/lib/File/Spec.pm                | 2 +-
+ dist/PathTools/lib/File/Spec/Cygwin.pm         | 2 +-
+ dist/PathTools/lib/File/Spec/Epoc.pm           | 2 +-
+ dist/PathTools/lib/File/Spec/Functions.pm      | 2 +-
+ dist/PathTools/lib/File/Spec/Mac.pm            | 2 +-
+ dist/PathTools/lib/File/Spec/OS2.pm            | 2 +-
+ dist/PathTools/lib/File/Spec/Unix.pm           | 2 +-
+ dist/PathTools/lib/File/Spec/VMS.pm            | 2 +-
+ dist/PathTools/lib/File/Spec/Win32.pm          | 2 +-
+ dist/Storable/Storable.pm                      | 2 +-
+ dist/base/lib/base.pm                          | 2 +-
+ 17 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/cpan/Test/lib/Test.pm b/cpan/Test/lib/Test.pm
+index 7c2c9d3..973f8dd 100644
+--- a/cpan/Test/lib/Test.pm
++++ b/cpan/Test/lib/Test.pm
+@@ -20,7 +20,7 @@ sub _reset_globals {
+     $planned    = 0;
+ }
+ 
+-$VERSION = '1.26';
++$VERSION = '1.26_01';
+ require Exporter;
+ @ISA=('Exporter');
+ 
+diff --git a/dist/I18N-LangTags/lib/I18N/LangTags/Detect.pm b/dist/I18N-LangTags/lib/I18N/LangTags/Detect.pm
+index e9c3aaa..a877fbf 100644
+--- a/dist/I18N-LangTags/lib/I18N/LangTags/Detect.pm
++++ b/dist/I18N-LangTags/lib/I18N/LangTags/Detect.pm
+@@ -11,7 +11,7 @@ use vars qw( @ISA $VERSION $MATCH_SUPERS $USING_LANGUAGE_TAGS
+ BEGIN { unless(defined &DEBUG) { *DEBUG = sub () {0} } }
+  # define the constant 'DEBUG' at compile-time
+ 
+-$VERSION = "1.05";
++$VERSION = "1.05_01";
+ @ISA = ();
+ use I18N::LangTags qw(alternate_language_tags locale2language_tag);
+ 
+diff --git a/dist/IO/IO.pm b/dist/IO/IO.pm
+index 982871d..4b39c7a 100644
+--- a/dist/IO/IO.pm
++++ b/dist/IO/IO.pm
+@@ -7,7 +7,7 @@ use Carp;
+ use strict;
+ use warnings;
+ 
+-our $VERSION = "1.35";
++our $VERSION = "1.35_01";
+ XSLoader::load 'IO', $VERSION;
+ 
+ sub import {
+diff --git a/dist/Locale-Maketext/lib/Locale/Maketext.pm b/dist/Locale-Maketext/lib/Locale/Maketext.pm
+index facc32a..e73c149 100644
+--- a/dist/Locale-Maketext/lib/Locale/Maketext.pm
++++ b/dist/Locale-Maketext/lib/Locale/Maketext.pm
+@@ -27,7 +27,7 @@ BEGIN {
+ }
+ 
+ 
+-$VERSION = '1.26';
++$VERSION = '1.26_01';
+ @ISA = ();
+ 
+ $MATCH_SUPERS = 1;
+diff --git a/dist/Net-Ping/lib/Net/Ping.pm b/dist/Net-Ping/lib/Net/Ping.pm
+index c9cbd27..86b0dfd 100644
+--- a/dist/Net-Ping/lib/Net/Ping.pm
++++ b/dist/Net-Ping/lib/Net/Ping.pm
+@@ -17,7 +17,7 @@ use Time::HiRes;
+ 
+ @ISA = qw(Exporter);
+ @EXPORT = qw(pingecho);
+-$VERSION = "2.43";
++$VERSION = "2.43_01";
+ 
+ # Constants
+ 
+diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm
+index 1a58a46..6164f1a 100644
+--- a/dist/PathTools/Cwd.pm
++++ b/dist/PathTools/Cwd.pm
+@@ -3,7 +3,7 @@ use strict;
+ use Exporter;
+ use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
+ 
+-$VERSION = '3.56_01';
++$VERSION = '3.56_02';
+ my $xs_version = $VERSION;
+ $VERSION =~ tr/_//;
+ 
+diff --git a/dist/PathTools/lib/File/Spec.pm b/dist/PathTools/lib/File/Spec.pm
+index 584a1d0..4e05e35 100644
+--- a/dist/PathTools/lib/File/Spec.pm
++++ b/dist/PathTools/lib/File/Spec.pm
+@@ -3,7 +3,7 @@ package File::Spec;
+ use strict;
+ use vars qw(@ISA $VERSION);
+ 
+-$VERSION = '3.56_01';
++$VERSION = '3.56_02';
+ $VERSION =~ tr/_//;
+ 
+ my %module = (MacOS   => 'Mac',
+diff --git a/dist/PathTools/lib/File/Spec/Cygwin.pm b/dist/PathTools/lib/File/Spec/Cygwin.pm
+index 3ae0e99..5ab8953 100644
+--- a/dist/PathTools/lib/File/Spec/Cygwin.pm
++++ b/dist/PathTools/lib/File/Spec/Cygwin.pm
+@@ -4,7 +4,7 @@ use strict;
+ use vars qw(@ISA $VERSION);
+ require File::Spec::Unix;
+ 
+-$VERSION = '3.56_01';
++$VERSION = '3.56_02';
+ $VERSION =~ tr/_//;
+ 
+ @ISA = qw(File::Spec::Unix);
+diff --git a/dist/PathTools/lib/File/Spec/Epoc.pm b/dist/PathTools/lib/File/Spec/Epoc.pm
+index d9f2126..3004774 100644
+--- a/dist/PathTools/lib/File/Spec/Epoc.pm
++++ b/dist/PathTools/lib/File/Spec/Epoc.pm
+@@ -3,7 +3,7 @@ package File::Spec::Epoc;
+ use strict;
+ use vars qw($VERSION @ISA);
+ 
+-$VERSION = '3.56_01';
++$VERSION = '3.56_02';
+ $VERSION =~ tr/_//;
+ 
+ require File::Spec::Unix;
+diff --git a/dist/PathTools/lib/File/Spec/Functions.pm b/dist/PathTools/lib/File/Spec/Functions.pm
+index f34966b..0aed504 100644
+--- a/dist/PathTools/lib/File/Spec/Functions.pm
++++ b/dist/PathTools/lib/File/Spec/Functions.pm
+@@ -5,7 +5,7 @@ use strict;
+ 
+ use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
+ 
+-$VERSION = '3.56_01';
++$VERSION = '3.56_02';
+ $VERSION =~ tr/_//;
+ 
+ require Exporter;
+diff --git a/dist/PathTools/lib/File/Spec/Mac.pm b/dist/PathTools/lib/File/Spec/Mac.pm
+index 20e8374..426c151 100644
+--- a/dist/PathTools/lib/File/Spec/Mac.pm
++++ b/dist/PathTools/lib/File/Spec/Mac.pm
+@@ -4,7 +4,7 @@ use strict;
+ use vars qw(@ISA $VERSION);
+ require File::Spec::Unix;
+ 
+-$VERSION = '3.56_01';
++$VERSION = '3.56_02';
+ $VERSION =~ tr/_//;
+ 
+ @ISA = qw(File::Spec::Unix);
+diff --git a/dist/PathTools/lib/File/Spec/OS2.pm b/dist/PathTools/lib/File/Spec/OS2.pm
+index 727032f..9ad4c86 100644
+--- a/dist/PathTools/lib/File/Spec/OS2.pm
++++ b/dist/PathTools/lib/File/Spec/OS2.pm
+@@ -4,7 +4,7 @@ use strict;
+ use vars qw(@ISA $VERSION);
+ require File::Spec::Unix;
+ 
+-$VERSION = '3.56_01';
++$VERSION = '3.56_02';
+ $VERSION =~ tr/_//;
+ 
+ @ISA = qw(File::Spec::Unix);
+diff --git a/dist/PathTools/lib/File/Spec/Unix.pm b/dist/PathTools/lib/File/Spec/Unix.pm
+index 3525f16..11367ea 100644
+--- a/dist/PathTools/lib/File/Spec/Unix.pm
++++ b/dist/PathTools/lib/File/Spec/Unix.pm
+@@ -3,7 +3,7 @@ package File::Spec::Unix;
+ use strict;
+ use vars qw($VERSION);
+ 
+-$VERSION = '3.56_01';
++$VERSION = '3.56_02';
+ my $xs_version = $VERSION;
+ $VERSION =~ tr/_//;
+ 
+diff --git a/dist/PathTools/lib/File/Spec/VMS.pm b/dist/PathTools/lib/File/Spec/VMS.pm
+index 0b2ba1f..b0a1f2f 100644
+--- a/dist/PathTools/lib/File/Spec/VMS.pm
++++ b/dist/PathTools/lib/File/Spec/VMS.pm
+@@ -4,7 +4,7 @@ use strict;
+ use vars qw(@ISA $VERSION);
+ require File::Spec::Unix;
+ 
+-$VERSION = '3.56_01';
++$VERSION = '3.56_02';
+ $VERSION =~ tr/_//;
+ 
+ @ISA = qw(File::Spec::Unix);
+diff --git a/dist/PathTools/lib/File/Spec/Win32.pm b/dist/PathTools/lib/File/Spec/Win32.pm
+index 5435138..48ab9eb 100644
+--- a/dist/PathTools/lib/File/Spec/Win32.pm
++++ b/dist/PathTools/lib/File/Spec/Win32.pm
+@@ -5,7 +5,7 @@ use strict;
+ use vars qw(@ISA $VERSION);
+ require File::Spec::Unix;
+ 
+-$VERSION = '3.56_01';
++$VERSION = '3.56_02';
+ $VERSION =~ tr/_//;
+ 
+ @ISA = qw(File::Spec::Unix);
+diff --git a/dist/Storable/Storable.pm b/dist/Storable/Storable.pm
+index 7b6e1a0..c8cbbcb 100644
+--- a/dist/Storable/Storable.pm
++++ b/dist/Storable/Storable.pm
+@@ -22,7 +22,7 @@ package Storable; @ISA = qw(Exporter);
+ 
+ use vars qw($canonical $forgive_me $VERSION);
+ 
+-$VERSION = '2.53_01';
++$VERSION = '2.53_02';
+ 
+ BEGIN {
+     if (eval {
+diff --git a/dist/base/lib/base.pm b/dist/base/lib/base.pm
+index 2b15096..ff1a16c 100644
+--- a/dist/base/lib/base.pm
++++ b/dist/base/lib/base.pm
+@@ -2,7 +2,7 @@ package base;
+ 
+ use strict 'vars';
+ use vars qw($VERSION);
+-$VERSION = '2.22';
++$VERSION = '2.22_01';
+ $VERSION = eval $VERSION;
+ 
+ # constant.pm is slow
+-- 
+2.9.2
+
+From 0eae8f5acce3629731cd463ed7d4ec6e218a28e3 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Mon, 27 Jun 2016 16:21:21 +1000
+Subject: [PATCH 7/9] cpan/: remove . from @INC when loading optional modules
+
+This was originally against maint-5.24 where bignum is in cpan/, but
+in maint-5.22 it was in dist/
+---
+ cpan/CPAN/lib/App/Cpan.pm                           | 21 ++++++++++++++++-----
+ cpan/CPAN/lib/CPAN.pm                               |  4 ++++
+ cpan/Digest/Digest.pm                               |  6 +++++-
+ cpan/Encode/Encode.pm                               |  2 ++
+ cpan/ExtUtils-Command/lib/ExtUtils/Command.pm       |  5 ++++-
+ cpan/File-Fetch/lib/File/Fetch.pm                   | 10 ++++++++++
+ cpan/HTTP-Tiny/lib/HTTP/Tiny.pm                     |  2 ++
+ cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm |  2 ++
+ cpan/IPC-Cmd/lib/IPC/Cmd.pm                         |  4 ++++
+ .../lib/Locale/Maketext/Simple.pm                   |  7 ++++++-
+ cpan/Memoize/Memoize.pm                             |  6 +++++-
+ cpan/Pod-Perldoc/lib/Pod/Perldoc.pm                 |  5 +++++
+ cpan/Sys-Syslog/Syslog.pm                           |  2 ++
+ cpan/libnet/lib/Net/Config.pm                       |  7 ++++++-
+ dist/bignum/lib/bigint.pm                           |  2 ++
+ dist/bignum/lib/bignum.pm                           |  2 ++
+ dist/bignum/lib/bigrat.pm                           |  2 ++
+ 17 files changed, 79 insertions(+), 10 deletions(-)
+
+diff --git a/cpan/CPAN/lib/App/Cpan.pm b/cpan/CPAN/lib/App/Cpan.pm
+index e8c9bb7..3fac04d 100644
+--- a/cpan/CPAN/lib/App/Cpan.pm
++++ b/cpan/CPAN/lib/App/Cpan.pm
+@@ -530,9 +530,20 @@ sub AUTOLOAD { 1 }
+ sub DESTROY { 1 }
+ }
+ 
++# load a module without searching the default entry for the current
++# directory
++sub _safe_load_module {
++  my $name = shift;
++
++  local @INC = @INC;
++  pop @INC if $INC[-1] eq '.';
++
++  eval "require $name; 1";
++}
++
+ sub _init_logger
+ 	{
+-	my $log4perl_loaded = eval "require Log::Log4perl; 1";
++	my $log4perl_loaded = _safe_load_module("Log::Log4perl");
+ 
+     unless( $log4perl_loaded )
+         {
+@@ -993,7 +1004,7 @@ sub _load_local_lib # -I
+ 	{
+ 	$logger->debug( "Loading local::lib" );
+ 
+-	my $rc = eval { require local::lib; 1; };
++	my $rc = _safe_load_module("local::lib");
+ 	unless( $rc ) {
+ 		$logger->die( "Could not load local::lib" );
+ 		}
+@@ -1121,7 +1132,7 @@ sub _get_file
+ 	{
+ 	my $path = shift;
+ 
+-	my $loaded = eval "require LWP::Simple; 1;";
++	my $loaded = _safe_load_module("LWP::Simple");
+ 	croak "You need LWP::Simple to use features that fetch files from CPAN\n"
+ 		unless $loaded;
+ 
+@@ -1143,7 +1154,7 @@ sub _gitify
+ 	{
+ 	my $args = shift;
+ 
+-	my $loaded = eval "require Archive::Extract; 1;";
++	my $loaded = _safe_load_module("Archive::Extract");
+ 	croak "You need Archive::Extract to use features that gitify distributions\n"
+ 		unless $loaded;
+ 
+@@ -1207,7 +1218,7 @@ sub _show_Changes
+ sub _get_changes_file
+ 	{
+ 	croak "Reading Changes files requires LWP::Simple and URI\n"
+-		unless eval "require LWP::Simple; require URI; 1";
++		unless _safe_load_module("LWP::Simple") && _safe_load_module("URI");
+ 
+     my $url = shift;
+ 
+diff --git a/cpan/CPAN/lib/CPAN.pm b/cpan/CPAN/lib/CPAN.pm
+index f4544f0..25bf349 100644
+--- a/cpan/CPAN/lib/CPAN.pm
++++ b/cpan/CPAN/lib/CPAN.pm
+@@ -1104,6 +1104,8 @@ sub has_usable {
+                                ]
+               };
+     if ($usable->{$mod}) {
++        local @INC = @INC;
++        pop @INC if $INC[-1] eq '.';
+         for my $c (0..$#{$usable->{$mod}}) {
+             my $code = $usable->{$mod}[$c];
+             my $ret = eval { &$code() };
+@@ -1146,6 +1148,8 @@ sub has_inst {
+       $CPAN::META->{dontload_hash}{$mod}||=1; # unsafe meta access, ok
+       return 0;
+     }
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     my $file = $mod;
+     my $obj;
+     $file =~ s|::|/|g;
+diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm
+index c3355a8..299e25e 100644
+--- a/cpan/Digest/Digest.pm
++++ b/cpan/Digest/Digest.pm
+@@ -38,7 +38,11 @@ sub new
+         unless (exists ${"$class\::"}{"VERSION"}) {
+             my $pm_file = $class . ".pm";
+             $pm_file =~ s{::}{/}g;
+-            eval { require $pm_file };
++            eval {
++                local @INC = @INC;
++                pop @INC if $INC[-1] eq '.';
++                require $pm_file
++	    };
+             if ($@) {
+                 $err ||= $@;
+                 next;
+diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
+index 7937dde..874cbc6 100644
+--- a/cpan/Encode/Encode.pm
++++ b/cpan/Encode/Encode.pm
+@@ -56,6 +56,8 @@ require Encode::Config;
+ eval {
+     local $SIG{__DIE__};
+     local $SIG{__WARN__};
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     require Encode::ConfigLocal;
+ };
+ 
+diff --git a/cpan/ExtUtils-Command/lib/ExtUtils/Command.pm b/cpan/ExtUtils-Command/lib/ExtUtils/Command.pm
+index 7f3161a..421cf08 100644
+--- a/cpan/ExtUtils-Command/lib/ExtUtils/Command.pm
++++ b/cpan/ExtUtils-Command/lib/ExtUtils/Command.pm
+@@ -19,7 +19,10 @@ if( $Is_VMS ) {
+     my $vms_efs;
+     my $vms_case;
+ 
+-    if (eval { local $SIG{__DIE__}; require VMS::Feature; }) {
++    if (eval { local $SIG{__DIE__};
++               local @INC = @INC;
++               pop @INC if $INC[-1] eq '.';
++               require VMS::Feature; }) {
+         $vms_unix_rpt = VMS::Feature::current("filename_unix_report");
+         $vms_efs = VMS::Feature::current("efs_charset");
+         $vms_case = VMS::Feature::current("efs_case_preserve");
+diff --git a/cpan/File-Fetch/lib/File/Fetch.pm b/cpan/File-Fetch/lib/File/Fetch.pm
+index 7d6a263..5a8799b 100644
+--- a/cpan/File-Fetch/lib/File/Fetch.pm
++++ b/cpan/File-Fetch/lib/File/Fetch.pm
+@@ -567,6 +567,8 @@ sub _lwp_fetch {
+ 
+     };
+ 
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     unless( can_load( modules => $use_list ) ) {
+         $METHOD_FAIL->{'lwp'} = 1;
+         return;
+@@ -619,6 +621,8 @@ sub _httptiny_fetch {
+ 
+     };
+ 
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     unless( can_load(modules => $use_list) ) {
+         $METHOD_FAIL->{'httptiny'} = 1;
+         return;
+@@ -658,6 +662,8 @@ sub _httplite_fetch {
+ 
+     };
+ 
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     unless( can_load(modules => $use_list) ) {
+         $METHOD_FAIL->{'httplite'} = 1;
+         return;
+@@ -733,6 +739,8 @@ sub _iosock_fetch {
+         'IO::Select'       => '0.0',
+     };
+ 
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     unless( can_load(modules => $use_list) ) {
+         $METHOD_FAIL->{'iosock'} = 1;
+         return;
+@@ -814,6 +822,8 @@ sub _netftp_fetch {
+     check( $tmpl, \%hash ) or return;
+ 
+     ### required modules ###
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     my $use_list = { 'Net::FTP' => 0 };
+ 
+     unless( can_load( modules => $use_list ) ) {
+diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
+index 878cce8..40d948f 100644
+--- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
++++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
+@@ -1392,6 +1392,8 @@ sub _find_CA_file {
+     return $self->{SSL_options}->{SSL_ca_file}
+         if $self->{SSL_options}->{SSL_ca_file} and -e $self->{SSL_options}->{SSL_ca_file};
+ 
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     return Mozilla::CA::SSL_ca_file()
+         if eval { require Mozilla::CA };
+ 
+diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
+index 602178c..cec47cb 100644
+--- a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
++++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
+@@ -27,6 +27,8 @@ Exporter::export_ok_tags('all');
+ 
+ BEGIN
+ {
++   local @INC = @INC;
++   pop @INC if $INC[-1] eq '.';
+    eval ' use IO::Uncompress::Adapter::Inflate 2.068 ;';
+    eval ' use IO::Uncompress::Adapter::Bunzip2 2.068 ;';
+    eval ' use IO::Uncompress::Adapter::LZO 2.068 ;';
+diff --git a/cpan/IPC-Cmd/lib/IPC/Cmd.pm b/cpan/IPC-Cmd/lib/IPC/Cmd.pm
+index 6a82bdf..84ad0a0 100644
+--- a/cpan/IPC-Cmd/lib/IPC/Cmd.pm
++++ b/cpan/IPC-Cmd/lib/IPC/Cmd.pm
+@@ -142,6 +142,8 @@ sub can_use_ipc_run     {
+     return if IS_WIN98;
+ 
+     ### if we don't have ipc::run, we obviously can't use it.
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     return unless can_load(
+                         modules => { 'IPC::Run' => '0.55' },
+                         verbose => ($WARN && $verbose),
+@@ -169,6 +171,8 @@ sub can_use_ipc_open3   {
+ 
+     ### IPC::Open3 works on every non-VMS platform, but it can't
+     ### capture buffers on win32 :(
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     return unless can_load(
+         modules => { map {$_ => '0.0'} qw|IPC::Open3 IO::Select Symbol| },
+         verbose => ($WARN && $verbose),
+diff --git a/cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm b/cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm
+index 30760f3..9465c52 100644
+--- a/cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm
++++ b/cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm
+@@ -134,7 +134,12 @@ sub load_loc {
+     my $pkg = join('::', grep { defined and length } $args{Class}, $args{Subclass});
+     return $Loc{$pkg} if exists $Loc{$pkg};
+ 
+-    eval { require Locale::Maketext::Lexicon; 1 }   or return;
++    eval {
++        local @INC = @INC;
++        pop @INC if $INC[-1] eq '.';
++        require Locale::Maketext::Lexicon;
++        1
++    } or return;
+     $Locale::Maketext::Lexicon::VERSION > 0.20	    or return;
+     eval { require File::Spec; 1 }		    or return;
+ 
+diff --git a/cpan/Memoize/Memoize.pm b/cpan/Memoize/Memoize.pm
+index 9a58c4a..b566f21 100644
+--- a/cpan/Memoize/Memoize.pm
++++ b/cpan/Memoize/Memoize.pm
+@@ -184,7 +184,11 @@ sub _my_tie {
+   }
+   my $modulefile = $module . '.pm';
+   $modulefile =~ s{::}{/}g;
+-  eval { require $modulefile };
++  eval {
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
++    require $modulefile
++  };
+   if ($@) {
+     croak "Memoize: Couldn't load hash tie module `$module': $@; aborting";
+   }
+diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
+index 969019d..f7d10d6 100644
+--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
++++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
+@@ -573,6 +573,9 @@ sub find_good_formatter_class {
+   my @class_list = @{ $self->{'formatter_classes'} || [] };
+   $self->die( "WHAT?  Nothing in the formatter class list!?" ) unless @class_list;
+ 
++  local @INC = @INC;
++  pop @INC if $INC[-1] eq '.';
++
+   my $good_class_found;
+   foreach my $c (@class_list) {
+     DEBUG > 4 and print "Trying to load $c...\n";
+@@ -1004,6 +1007,8 @@ sub new_translator { # $tr = $self->new_translator($lang);
+     my $self = shift;
+     my $lang = shift;
+ 
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     my $pack = 'POD2::' . uc($lang);
+     eval "require $pack";
+     if ( !$@ && $pack->can('new') ) {
+diff --git a/cpan/Sys-Syslog/Syslog.pm b/cpan/Sys-Syslog/Syslog.pm
+index 25164af..eed224a 100644
+--- a/cpan/Sys-Syslog/Syslog.pm
++++ b/cpan/Sys-Syslog/Syslog.pm
+@@ -888,6 +888,8 @@ sub silent_eval (&) {
+ sub can_load {
+     my ($module, $verbose) = @_;
+     local($SIG{__DIE__}, $SIG{__WARN__}, $@);
++    local @INC = @INC;
++    pop @INC if $INC[-1] eq '.';
+     my $loaded = eval "use $module; 1";
+     warn $@ if not $loaded and $verbose;
+     return $loaded
+diff --git a/cpan/libnet/lib/Net/Config.pm b/cpan/libnet/lib/Net/Config.pm
+index 953a826..5c97504 100644
+--- a/cpan/libnet/lib/Net/Config.pm
++++ b/cpan/libnet/lib/Net/Config.pm
+@@ -23,7 +23,12 @@ our $VERSION = "3.05";
+ 
+ our($CONFIGURE, $LIBNET_CFG);
+ 
+-eval { local $SIG{__DIE__}; require Net::LocalCfg };
++eval {
++  local @INC = @INC;
++  pop @INC if $INC[-1] eq '.';
++  local $SIG{__DIE__};
++  require Net::LocalCfg;
++};
+ 
+ our %NetConfig = (
+   nntp_hosts      => [],
+diff --git a/dist/bignum/lib/bigint.pm b/dist/bignum/lib/bigint.pm
+index 3bcf15a..5400c7a 100644
+--- a/dist/bignum/lib/bigint.pm
++++ b/dist/bignum/lib/bigint.pm
+@@ -248,6 +248,8 @@ sub import
+     # see if we can find Math::BigInt::Lite
+     if (!defined $a && !defined $p)		# rounding won't work to well
+       {
++      local @INC = @INC;
++      pop @INC if $INC[-1] eq '.';
+       if (eval { require Math::BigInt::Lite; 1 })
+         {
+         @import = ( );				# :constant in Lite, not MBI
+diff --git a/dist/bignum/lib/bignum.pm b/dist/bignum/lib/bignum.pm
+index 67b9ede..b41e022 100644
+--- a/dist/bignum/lib/bignum.pm
++++ b/dist/bignum/lib/bignum.pm
+@@ -155,6 +155,8 @@ sub import
+     # see if we can find Math::BigInt::Lite
+     if (!defined $a && !defined $p)		# rounding won't work to well
+       {
++      local @INC = @INC;
++      pop @INC if $INC[-1] eq '.';
+       if (eval { require Math::BigInt::Lite; 1 })
+         {
+         @import = ( );				# :constant in Lite, not MBI
+diff --git a/dist/bignum/lib/bigrat.pm b/dist/bignum/lib/bigrat.pm
+index b02831b..f49b15d 100644
+--- a/dist/bignum/lib/bigrat.pm
++++ b/dist/bignum/lib/bigrat.pm
+@@ -148,6 +148,8 @@ sub import
+     # see if we can find Math::BigInt::Lite
+     if (!defined $a && !defined $p)             # rounding won't work to well
+       {
++      local @INC = @INC;
++      pop @INC if $INC[-1] eq '.';
+       if (eval { require Math::BigInt::Lite; 1 })
+         {
+         @import = ( );                          # :constant in Lite, not MBI
+-- 
+2.9.2
+
+From 85a4b6451d06b0a13b5d1f8dc68744c72587438e Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Wed, 29 Jun 2016 11:12:10 +1000
+Subject: [PATCH 8/9] cpan/: bump $VERSION as needed
+
+---
+ cpan/CPAN/lib/App/Cpan.pm                                 | 2 +-
+ cpan/Digest/Digest.pm                                     | 2 +-
+ cpan/ExtUtils-Command/lib/ExtUtils/Command.pm             | 2 +-
+ cpan/File-Fetch/lib/File/Fetch.pm                         | 2 +-
+ cpan/HTTP-Tiny/lib/HTTP/Tiny.pm                           | 2 +-
+ cpan/IPC-Cmd/lib/IPC/Cmd.pm                               | 2 +-
+ cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm | 2 +-
+ cpan/Memoize/Memoize.pm                                   | 2 +-
+ cpan/Pod-Perldoc/lib/Pod/Perldoc.pm                       | 2 +-
+ cpan/Sys-Syslog/Syslog.pm                                 | 2 +-
+ cpan/libnet/lib/Net/Cmd.pm                                | 2 +-
+ cpan/libnet/lib/Net/Config.pm                             | 2 +-
+ cpan/libnet/lib/Net/Domain.pm                             | 2 +-
+ cpan/libnet/lib/Net/FTP.pm                                | 2 +-
+ cpan/libnet/lib/Net/FTP/A.pm                              | 2 +-
+ cpan/libnet/lib/Net/FTP/E.pm                              | 2 +-
+ cpan/libnet/lib/Net/FTP/I.pm                              | 2 +-
+ cpan/libnet/lib/Net/FTP/L.pm                              | 2 +-
+ cpan/libnet/lib/Net/FTP/dataconn.pm                       | 2 +-
+ cpan/libnet/lib/Net/NNTP.pm                               | 2 +-
+ cpan/libnet/lib/Net/Netrc.pm                              | 2 +-
+ cpan/libnet/lib/Net/POP3.pm                               | 2 +-
+ cpan/libnet/lib/Net/SMTP.pm                               | 2 +-
+ cpan/libnet/lib/Net/Time.pm                               | 2 +-
+ dist/bignum/lib/bigint.pm                                 | 2 +-
+ dist/bignum/lib/bignum.pm                                 | 2 +-
+ dist/bignum/lib/bigrat.pm                                 | 2 +-
+ 27 files changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/cpan/CPAN/lib/App/Cpan.pm b/cpan/CPAN/lib/App/Cpan.pm
+index 3fac04d..94607d9 100644
+--- a/cpan/CPAN/lib/App/Cpan.pm
++++ b/cpan/CPAN/lib/App/Cpan.pm
+@@ -6,7 +6,7 @@ use vars qw($VERSION);
+ 
+ use if $] < 5.008 => 'IO::Scalar';
+ 
+-$VERSION = '1.63';
++$VERSION = '1.63_01';
+ 
+ =head1 NAME
+ 
+diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm
+index 299e25e..16dae9d 100644
+--- a/cpan/Digest/Digest.pm
++++ b/cpan/Digest/Digest.pm
+@@ -3,7 +3,7 @@ package Digest;
+ use strict;
+ use vars qw($VERSION %MMAP $AUTOLOAD);
+ 
+-$VERSION = "1.17";
++$VERSION = "1.17_01";
+ 
+ %MMAP = (
+   "SHA-1"      => [["Digest::SHA", 1], "Digest::SHA1", ["Digest::SHA2", 1]],
+diff --git a/cpan/ExtUtils-Command/lib/ExtUtils/Command.pm b/cpan/ExtUtils-Command/lib/ExtUtils/Command.pm
+index 421cf08..01432dc 100644
+--- a/cpan/ExtUtils-Command/lib/ExtUtils/Command.pm
++++ b/cpan/ExtUtils-Command/lib/ExtUtils/Command.pm
+@@ -7,7 +7,7 @@ use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
+ @ISA       = qw(Exporter);
+ @EXPORT    = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod
+                 dos2unix);
+-$VERSION = '1.20';
++$VERSION = '1.20_01';
+ 
+ my $Is_VMS   = $^O eq 'VMS';
+ my $Is_VMS_mode = $Is_VMS;
+diff --git a/cpan/File-Fetch/lib/File/Fetch.pm b/cpan/File-Fetch/lib/File/Fetch.pm
+index 5a8799b..de2ab12 100644
+--- a/cpan/File-Fetch/lib/File/Fetch.pm
++++ b/cpan/File-Fetch/lib/File/Fetch.pm
+@@ -22,7 +22,7 @@ use vars    qw[ $VERBOSE $PREFER_BIN $FROM_EMAIL $USER_AGENT
+                 $FTP_PASSIVE $TIMEOUT $DEBUG $WARN $FORCEIPV4
+             ];
+ 
+-$VERSION        = '0.48';
++$VERSION        = '0.48_01';
+ $VERSION        = eval $VERSION;    # avoid warnings with development releases
+ $PREFER_BIN     = 0;                # XXX TODO implement
+ $FROM_EMAIL     = 'File-Fetch@example.com';
+diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
+index 40d948f..e162e76 100644
+--- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
++++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
+@@ -4,7 +4,7 @@ use strict;
+ use warnings;
+ # ABSTRACT: A small, simple, correct HTTP/1.1 client
+ 
+-our $VERSION = '0.054';
++our $VERSION = '0.054_01';
+ 
+ use Carp ();
+ 
+diff --git a/cpan/IPC-Cmd/lib/IPC/Cmd.pm b/cpan/IPC-Cmd/lib/IPC/Cmd.pm
+index 84ad0a0..4705f04 100644
+--- a/cpan/IPC-Cmd/lib/IPC/Cmd.pm
++++ b/cpan/IPC-Cmd/lib/IPC/Cmd.pm
+@@ -18,7 +18,7 @@ BEGIN {
+                         $HAVE_MONOTONIC
+                     ];
+ 
+-    $VERSION        = '0.92';
++    $VERSION        = '0.92_01';
+     $VERBOSE        = 0;
+     $DEBUG          = 0;
+     $WARN           = 1;
+diff --git a/cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm b/cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm
+index 9465c52..9e61670 100644
+--- a/cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm
++++ b/cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm
+@@ -1,5 +1,5 @@
+ package Locale::Maketext::Simple;
+-$Locale::Maketext::Simple::VERSION = '0.21';
++$Locale::Maketext::Simple::VERSION = '0.21_01';
+ 
+ use strict;
+ use 5.005;
+diff --git a/cpan/Memoize/Memoize.pm b/cpan/Memoize/Memoize.pm
+index b566f21..f4e6522 100644
+--- a/cpan/Memoize/Memoize.pm
++++ b/cpan/Memoize/Memoize.pm
+@@ -9,7 +9,7 @@
+ # write to mjd-perl-memoize+@plover.com for a license.
+ 
+ package Memoize;
+-$VERSION = '1.03';
++$VERSION = '1.03_01';
+ 
+ # Compile-time constants
+ sub SCALAR () { 0 } 
+diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
+index f7d10d6..52ae015 100644
+--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
++++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
+@@ -12,7 +12,7 @@ use File::Spec::Functions qw(catfile catdir splitdir);
+ use vars qw($VERSION @Pagers $Bindir $Pod2man
+   $Temp_Files_Created $Temp_File_Lifetime
+ );
+-$VERSION = '3.25';
++$VERSION = '3.25_01';
+ 
+ #..........................................................................
+ 
+diff --git a/cpan/Sys-Syslog/Syslog.pm b/cpan/Sys-Syslog/Syslog.pm
+index eed224a..28f36c7 100644
+--- a/cpan/Sys-Syslog/Syslog.pm
++++ b/cpan/Sys-Syslog/Syslog.pm
+@@ -11,7 +11,7 @@ require 5.005;
+ 
+ 
+ {   no strict 'vars';
+-    $VERSION = '0.33';
++    $VERSION = '0.33_01';
+ 
+     %EXPORT_TAGS = (
+         standard => [qw(openlog syslog closelog setlogmask)],
+diff --git a/cpan/libnet/lib/Net/Cmd.pm b/cpan/libnet/lib/Net/Cmd.pm
+index 2614e69..0c9d72f 100644
+--- a/cpan/libnet/lib/Net/Cmd.pm
++++ b/cpan/libnet/lib/Net/Cmd.pm
+@@ -41,7 +41,7 @@ BEGIN {
+   }
+ }
+ 
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ our @ISA     = qw(Exporter);
+ our @EXPORT  = qw(CMD_INFO CMD_OK CMD_MORE CMD_REJECT CMD_ERROR CMD_PENDING);
+ 
+diff --git a/cpan/libnet/lib/Net/Config.pm b/cpan/libnet/lib/Net/Config.pm
+index 5c97504..1781c74 100644
+--- a/cpan/libnet/lib/Net/Config.pm
++++ b/cpan/libnet/lib/Net/Config.pm
+@@ -19,7 +19,7 @@ use Socket qw(inet_aton inet_ntoa);
+ 
+ our @EXPORT  = qw(%NetConfig);
+ our @ISA     = qw(Net::LocalCfg Exporter);
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ our($CONFIGURE, $LIBNET_CFG);
+ 
+diff --git a/cpan/libnet/lib/Net/Domain.pm b/cpan/libnet/lib/Net/Domain.pm
+index 3b274a6..2b67884 100644
+--- a/cpan/libnet/lib/Net/Domain.pm
++++ b/cpan/libnet/lib/Net/Domain.pm
+@@ -20,7 +20,7 @@ use Net::Config;
+ 
+ our @ISA       = qw(Exporter);
+ our @EXPORT_OK = qw(hostname hostdomain hostfqdn domainname);
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ my ($host, $domain, $fqdn) = (undef, undef, undef);
+ 
+diff --git a/cpan/libnet/lib/Net/FTP.pm b/cpan/libnet/lib/Net/FTP.pm
+index c791fac..715009f 100644
+--- a/cpan/libnet/lib/Net/FTP.pm
++++ b/cpan/libnet/lib/Net/FTP.pm
+@@ -24,7 +24,7 @@ use Net::Config;
+ use Socket;
+ use Time::Local;
+ 
+-our $VERSION = '3.05';
++our $VERSION = '3.05_01';
+ 
+ our $IOCLASS;
+ BEGIN {
+diff --git a/cpan/libnet/lib/Net/FTP/A.pm b/cpan/libnet/lib/Net/FTP/A.pm
+index 9f83e6c..e5dfaf3 100644
+--- a/cpan/libnet/lib/Net/FTP/A.pm
++++ b/cpan/libnet/lib/Net/FTP/A.pm
+@@ -13,7 +13,7 @@ use Carp;
+ use Net::FTP::dataconn;
+ 
+ our @ISA     = qw(Net::FTP::dataconn);
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ our $buf;
+ 
+diff --git a/cpan/libnet/lib/Net/FTP/E.pm b/cpan/libnet/lib/Net/FTP/E.pm
+index 1984a0e..fb905c7 100644
+--- a/cpan/libnet/lib/Net/FTP/E.pm
++++ b/cpan/libnet/lib/Net/FTP/E.pm
+@@ -8,6 +8,6 @@ use warnings;
+ use Net::FTP::I;
+ 
+ our @ISA = qw(Net::FTP::I);
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ 1;
+diff --git a/cpan/libnet/lib/Net/FTP/I.pm b/cpan/libnet/lib/Net/FTP/I.pm
+index c388d8f..38a959e 100644
+--- a/cpan/libnet/lib/Net/FTP/I.pm
++++ b/cpan/libnet/lib/Net/FTP/I.pm
+@@ -13,7 +13,7 @@ use Carp;
+ use Net::FTP::dataconn;
+ 
+ our @ISA     = qw(Net::FTP::dataconn);
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ our $buf;
+ 
+diff --git a/cpan/libnet/lib/Net/FTP/L.pm b/cpan/libnet/lib/Net/FTP/L.pm
+index dda51c4..c432220 100644
+--- a/cpan/libnet/lib/Net/FTP/L.pm
++++ b/cpan/libnet/lib/Net/FTP/L.pm
+@@ -8,6 +8,6 @@ use warnings;
+ use Net::FTP::I;
+ 
+ our @ISA = qw(Net::FTP::I);
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ 1;
+diff --git a/cpan/libnet/lib/Net/FTP/dataconn.pm b/cpan/libnet/lib/Net/FTP/dataconn.pm
+index eaa769d..87bcaca 100644
+--- a/cpan/libnet/lib/Net/FTP/dataconn.pm
++++ b/cpan/libnet/lib/Net/FTP/dataconn.pm
+@@ -13,7 +13,7 @@ use Carp;
+ use Errno;
+ use Net::Cmd;
+ 
+-our $VERSION = '3.05';
++our $VERSION = '3.05_01';
+ 
+ $Net::FTP::IOCLASS or die "please load Net::FTP before Net::FTP::dataconn";
+ our @ISA = $Net::FTP::IOCLASS;
+diff --git a/cpan/libnet/lib/Net/NNTP.pm b/cpan/libnet/lib/Net/NNTP.pm
+index 3796798..1a00cd7 100644
+--- a/cpan/libnet/lib/Net/NNTP.pm
++++ b/cpan/libnet/lib/Net/NNTP.pm
+@@ -20,7 +20,7 @@ use Net::Cmd;
+ use Net::Config;
+ use Time::Local;
+ 
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ # Code for detecting if we can use SSL
+ my $ssl_class = eval {
+diff --git a/cpan/libnet/lib/Net/Netrc.pm b/cpan/libnet/lib/Net/Netrc.pm
+index 9cf06b1..8983372 100644
+--- a/cpan/libnet/lib/Net/Netrc.pm
++++ b/cpan/libnet/lib/Net/Netrc.pm
+@@ -17,7 +17,7 @@ use warnings;
+ use Carp;
+ use FileHandle;
+ 
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ our $TESTING;
+ 
+diff --git a/cpan/libnet/lib/Net/POP3.pm b/cpan/libnet/lib/Net/POP3.pm
+index 0c6c4b1..9fda83e 100644
+--- a/cpan/libnet/lib/Net/POP3.pm
++++ b/cpan/libnet/lib/Net/POP3.pm
+@@ -19,7 +19,7 @@ use IO::Socket;
+ use Net::Cmd;
+ use Net::Config;
+ 
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ # Code for detecting if we can use SSL
+ my $ssl_class = eval {
+diff --git a/cpan/libnet/lib/Net/SMTP.pm b/cpan/libnet/lib/Net/SMTP.pm
+index afd017a..36c3617 100644
+--- a/cpan/libnet/lib/Net/SMTP.pm
++++ b/cpan/libnet/lib/Net/SMTP.pm
+@@ -20,7 +20,7 @@ use Net::Cmd;
+ use Net::Config;
+ use Socket;
+ 
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ # Code for detecting if we can use SSL
+ my $ssl_class = eval {
+diff --git a/cpan/libnet/lib/Net/Time.pm b/cpan/libnet/lib/Net/Time.pm
+index da25942..60e553c 100644
+--- a/cpan/libnet/lib/Net/Time.pm
++++ b/cpan/libnet/lib/Net/Time.pm
+@@ -23,7 +23,7 @@ use Net::Config;
+ our @ISA       = qw(Exporter);
+ our @EXPORT_OK = qw(inet_time inet_daytime);
+ 
+-our $VERSION = "3.05";
++our $VERSION = "3.05_01";
+ 
+ our $TIMEOUT = 120;
+ 
+diff --git a/dist/bignum/lib/bigint.pm b/dist/bignum/lib/bigint.pm
+index 5400c7a..7aff4da 100644
+--- a/dist/bignum/lib/bigint.pm
++++ b/dist/bignum/lib/bigint.pm
+@@ -1,7 +1,7 @@
+ package bigint;
+ use 5.006;
+ 
+-$VERSION = '0.39';
++$VERSION = '0.39_01';
+ use Exporter;
+ @ISA		= qw( Exporter );
+ @EXPORT_OK	= qw( PI e bpi bexp hex oct );
+diff --git a/dist/bignum/lib/bignum.pm b/dist/bignum/lib/bignum.pm
+index b41e022..91f7030 100644
+--- a/dist/bignum/lib/bignum.pm
++++ b/dist/bignum/lib/bignum.pm
+@@ -1,7 +1,7 @@
+ package bignum;
+ use 5.006;
+ 
+-$VERSION = '0.39';
++$VERSION = '0.39_01';
+ use Exporter;
+ @ISA 		= qw( bigint );
+ @EXPORT_OK	= qw( PI e bexp bpi hex oct ); 
+diff --git a/dist/bignum/lib/bigrat.pm b/dist/bignum/lib/bigrat.pm
+index f49b15d..72b7c57 100644
+--- a/dist/bignum/lib/bigrat.pm
++++ b/dist/bignum/lib/bigrat.pm
+@@ -1,7 +1,7 @@
+ package bigrat;
+ use 5.006;
+ 
+-$VERSION = '0.39';
++$VERSION = '0.39_01';
+ require Exporter;
+ @ISA		= qw( bigint );
+ @EXPORT_OK 	= qw( PI e bpi bexp hex oct );
+-- 
+2.9.2
+
+From 94c781b3ce20124dcde1f0cce0086cf3fdf51a46 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Wed, 29 Jun 2016 15:56:53 +1000
+Subject: [PATCH 9/9] (perl #127834) update CUSTOMIZED entries
+
+---
+ Porting/Maintainers.pl   | 163 +++++++++++++++++++++++++++++++++++++++++++-
+ t/porting/customized.dat | 174 +++++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 308 insertions(+), 29 deletions(-)
+
+diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
+index fbf81f1..058676b 100755
+--- a/Porting/Maintainers.pl
++++ b/Porting/Maintainers.pl
+@@ -125,6 +125,13 @@ use File::Glob qw(:case);
+         'EXCLUDED'     => [
+             qw(t/07_ptardiff.t),
+         ],
++        'CUSTOMIZED'   => [
++            qw(
++               bin/ptar bin/ptardiff bin/ptargrep
++               lib/Archive/Tar.pm lib/Archive/Tar/Constant.pm
++               lib/Archive/Tar/File.pm
++            )
++        ],
+     },
+ 
+     'Attribute::Handlers' => {
+@@ -179,6 +186,10 @@ use File::Glob qw(:case);
+     'base' => {
+         'DISTRIBUTION' => 'RGARCIA/base-2.18.tar.gz',
+         'FILES'        => q[dist/base],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( lib/base.pm )
++        ],
+     },
+ 
+     'bignum' => {
+@@ -278,6 +289,8 @@ use File::Glob qw(:case);
+         ],
+         'CUSTOMIZED'   => [
+             qw( lib/CPAN.pm ),
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( lib/App/Cpan.pm scripts/cpan )
+         ],
+     },
+ 
+@@ -356,6 +369,10 @@ use File::Glob qw(:case);
+         'DISTRIBUTION' => 'GAAS/Digest-1.17.tar.gz',
+         'FILES'        => q[cpan/Digest],
+         'EXCLUDED'     => ['digest-bench'],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( Digest.pm )
++        ],
+     },
+ 
+     'Digest::MD5' => {
+@@ -373,6 +390,10 @@ use File::Glob qw(:case);
+                 examples/dups
+                 ),
+         ],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( lib/Digest/SHA.pm shasum )
++        ],
+     },
+ 
+     'Dumpvalue' => {
+@@ -384,6 +405,13 @@ use File::Glob qw(:case);
+     'Encode' => {
+         'DISTRIBUTION' => 'DANKOGAI/Encode-2.72.tar.gz',
+         'FILES'        => q[cpan/Encode],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw(
++               Encode.pm bin/enc2xs bin/encguess bin/piconv
++               bin/ucmlint bin/unidump
++            )
++        ],
+     },
+ 
+     'encoding::warnings' => {
+@@ -433,6 +461,10 @@ use File::Glob qw(:case);
+         'DISTRIBUTION' => 'BINGOS/ExtUtils-Command-1.20.tar.gz',
+         'FILES'        => q[cpan/ExtUtils-Command],
+         'EXCLUDED'     => [qr{^xt/}],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( lib/ExtUtils/Command.pm )
++        ],
+     },
+ 
+     'ExtUtils::Constant' => {
+@@ -510,7 +542,10 @@ use File::Glob qw(:case);
+                                 lib/ExtUtils/MakeMaker/version/vpp.pm
+                                 lib/ExtUtils/Mkbootstrap.pm
+                                 lib/ExtUtils/Mksymlists.pm
+-                                lib/ExtUtils/testlib.pm ] ],
++                                lib/ExtUtils/testlib.pm ],
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( bin/instmodsh )
++        ],
+     },
+ 
+     'ExtUtils::Manifest' => {
+@@ -530,6 +565,10 @@ use File::Glob qw(:case);
+     'File::Fetch' => {
+         'DISTRIBUTION' => 'BINGOS/File-Fetch-0.48.tar.gz',
+         'FILES'        => q[cpan/File-Fetch],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( lib/File/Fetch.pm )
++        ],
+     },
+ 
+     'File::Path' => {
+@@ -626,7 +665,11 @@ use File::Glob qw(:case);
+             qr/^eg/,
+             qr/^xt/
+         ],
+-    },
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( lib/HTTP/Tiny.pm )
++        ],
++   },
+ 
+     'I18N::Collate' => {
+         'DISTRIBUTION' => 'FLORA/I18N-Collate-1.02.tar.gz',
+@@ -659,6 +702,37 @@ use File::Glob qw(:case);
+             't/010examples-zlib.t',
+             't/cz-05examples.t',
+         ],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw(
++               bin/zipdetails lib/Compress/Zlib.pm
++               lib/IO/Compress/Adapter/Bzip2.pm
++               lib/IO/Compress/Adapter/Deflate.pm
++               lib/IO/Compress/Adapter/Identity.pm
++               lib/IO/Compress/Base.pm
++               lib/IO/Compress/Base/Common.pm
++               lib/IO/Compress/Bzip2.pm
++               lib/IO/Compress/Deflate.pm
++               lib/IO/Compress/Gzip.pm
++               lib/IO/Compress/Gzip/Constants.pm
++               lib/IO/Compress/RawDeflate.pm
++               lib/IO/Compress/Zip.pm
++               lib/IO/Compress/Zip/Constants.pm
++               lib/IO/Compress/Zlib/Constants.pm
++               lib/IO/Compress/Zlib/Extra.pm
++               lib/IO/Uncompress/Adapter/Bunzip2.pm
++               lib/IO/Uncompress/Adapter/Identity.pm
++               lib/IO/Uncompress/Adapter/Inflate.pm
++               lib/IO/Uncompress/AnyInflate.pm
++               lib/IO/Uncompress/AnyUncompress.pm
++               lib/IO/Uncompress/Base.pm
++               lib/IO/Uncompress/Bunzip2.pm
++               lib/IO/Uncompress/Gunzip.pm
++               lib/IO/Uncompress/Inflate.pm
++               lib/IO/Uncompress/RawInflate.pm
++               lib/IO/Uncompress/Unzip.pm
++              )
++        ],
+     },
+ 
+     'IO::Socket::IP' => {
+@@ -677,6 +751,10 @@ use File::Glob qw(:case);
+     'IPC::Cmd' => {
+         'DISTRIBUTION' => 'BINGOS/IPC-Cmd-0.92.tar.gz',
+         'FILES'        => q[cpan/IPC-Cmd],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( lib/IPC/Cmd.pm )
++        ],
+     },
+ 
+     'IPC::SysV' => {
+@@ -692,6 +770,10 @@ use File::Glob qw(:case);
+     'JSON::PP' => {
+         'DISTRIBUTION' => 'MAKAMAKA/JSON-PP-2.27300.tar.gz',
+         'FILES'        => q[cpan/JSON-PP],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( bin/json_pp lib/JSON/PP.pm )
++        ],
+     },
+ 
+     'lib' => {
+@@ -717,6 +799,16 @@ use File::Glob qw(:case);
+             qr(^demos/),
+             qr(^t/external/),
+         ],
++        'CUSTOMIZED'   => [
++            qw(
++               lib/Net/Cmd.pm lib/Net/Config.pm
++               lib/Net/Domain.pm lib/Net/FTP.pm lib/Net/FTP/A.pm
++               lib/Net/FTP/E.pm lib/Net/FTP/I.pm
++               lib/Net/FTP/L.pm lib/Net/FTP/dataconn.pm
++               lib/Net/NNTP.pm lib/Net/Netrc.pm lib/Net/POP3.pm
++               lib/Net/SMTP.pm lib/Net/Time.pm
++            )
++        ],
+     },
+ 
+     'Locale-Codes' => {
+@@ -749,6 +841,10 @@ use File::Glob qw(:case);
+     'Locale::Maketext::Simple' => {
+         'DISTRIBUTION' => 'JESSE/Locale-Maketext-Simple-0.21.tar.gz',
+         'FILES'        => q[cpan/Locale-Maketext-Simple],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( lib/Locale/Maketext/Simple.pm )
++        ],
+     },
+ 
+     'Math::BigInt' => {
+@@ -815,6 +911,10 @@ use File::Glob qw(:case);
+         'DISTRIBUTION' => 'MJD/Memoize-1.03.tgz',
+         'FILES'        => q[cpan/Memoize],
+         'EXCLUDED'     => ['article.html'],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( Memoize.pm )
++        ],
+     },
+ 
+     'MIME::Base64' => {
+@@ -942,6 +1042,10 @@ use File::Glob qw(:case);
+         # XXX We can and should fix this, but clean up the DRY-failure in utils
+         # first
+         'EXCLUDED' => ['perldoc'],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( lib/Pod/Perldoc.pm )
++        ],
+     },
+ 
+     'Pod::Simple' => {
+@@ -1023,6 +1127,9 @@ use File::Glob qw(:case);
+                 win32/PerlLog.RES
+                 ),
+         ],
++        'CUSTOMIZED'   => [
++            qw( Syslog.pm )
++        ],
+     },
+ 
+     'Term::ANSIColor' => {
+@@ -1057,6 +1164,10 @@ use File::Glob qw(:case);
+     'Test' => {
+         'DISTRIBUTION' => 'JESSE/Test-1.26.tar.gz',
+         'FILES'        => q[cpan/Test],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw( lib/Test.pm )
++        ],
+     },
+ 
+     'Test::Harness' => {
+@@ -1076,6 +1187,54 @@ use File::Glob qw(:case);
+                 t/lib/if.pm
+                 ),
+         ],
++        'CUSTOMIZED'   => [
++            # https://rt.perl.org/Ticket/Display.html?id=127834
++            qw(
++               bin/prove lib/App/Prove.pm lib/App/Prove/State.pm
++               lib/App/Prove/State/Result.pm
++               lib/App/Prove/State/Result/Test.pm
++               lib/TAP/Base.pm lib/TAP/Formatter/Base.pm
++               lib/TAP/Formatter/Color.pm
++               lib/TAP/Formatter/Console.pm
++               lib/TAP/Formatter/Console/ParallelSession.pm
++               lib/TAP/Formatter/Console/Session.pm
++               lib/TAP/Formatter/File.pm
++               lib/TAP/Formatter/File/Session.pm
++               lib/TAP/Formatter/Session.pm lib/TAP/Harness.pm
++               lib/TAP/Harness/Env.pm lib/TAP/Object.pm
++               lib/TAP/Parser.pm lib/TAP/Parser/Aggregator.pm
++               lib/TAP/Parser/Grammar.pm
++               lib/TAP/Parser/Iterator.pm
++               lib/TAP/Parser/Iterator/Array.pm
++               lib/TAP/Parser/Iterator/Process.pm
++               lib/TAP/Parser/Iterator/Stream.pm
++               lib/TAP/Parser/IteratorFactory.pm
++               lib/TAP/Parser/Multiplexer.pm
++               lib/TAP/Parser/Result.pm
++               lib/TAP/Parser/Result/Bailout.pm
++               lib/TAP/Parser/Result/Comment.pm
++               lib/TAP/Parser/Result/Plan.pm
++               lib/TAP/Parser/Result/Pragma.pm
++               lib/TAP/Parser/Result/Test.pm
++               lib/TAP/Parser/Result/Unknown.pm
++               lib/TAP/Parser/Result/Version.pm
++               lib/TAP/Parser/Result/YAML.pm
++               lib/TAP/Parser/ResultFactory.pm
++               lib/TAP/Parser/Scheduler.pm
++               lib/TAP/Parser/Scheduler/Job.pm
++               lib/TAP/Parser/Scheduler/Spinner.pm
++               lib/TAP/Parser/Source.pm
++               lib/TAP/Parser/SourceHandler.pm
++               lib/TAP/Parser/SourceHandler/Executable.pm
++               lib/TAP/Parser/SourceHandler/File.pm
++               lib/TAP/Parser/SourceHandler/Handle.pm
++               lib/TAP/Parser/SourceHandler/Perl.pm
++               lib/TAP/Parser/SourceHandler/RawTAP.pm
++               lib/TAP/Parser/YAMLish/Reader.pm
++               lib/TAP/Parser/YAMLish/Writer.pm
++               lib/Test/Harness.pm
++            )
++        ],
+     },
+ 
+     'Test::Simple' => {
+diff --git a/t/porting/customized.dat b/t/porting/customized.dat
+index 47ac314..ccc5afd 100644
+--- a/t/porting/customized.dat
++++ b/t/porting/customized.dat
+@@ -1,38 +1,143 @@
+-CPAN cpan/CPAN/lib/CPAN.pm ce62c43d72f101c011184dbbc59e21c2790826f0
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm 7f4dfd0fe884bd42412bcf04ca80ef97b39c1d54
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm bef099988b15fb0b2a1f5ac48c01af1f7f36d329
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm 8168e18f0e3ce3ece4bb7e7c72d57ec07c67c402
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 7115e97a53559cb3ec061dd6f7f344e522724c4a
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm f8db8d4245bf0684b8210c811f50d7cfb1a27d78
++Archive::Tar cpan/Archive-Tar/bin/ptar 5e9f3c6f565114193d98847ed8569cd0010c229c
++Archive::Tar cpan/Archive-Tar/bin/ptardiff 5a9f4c01a0390bf98da7e63f1c0bbf5bc74d12c7
++Archive::Tar cpan/Archive-Tar/bin/ptargrep eb74056c434acf314ac5a122e33bdd2ef99e6edb
++Archive::Tar cpan/Archive-Tar/lib/Archive/Tar.pm b7e13134a5bcabe8c33fb0729d2f2f80e924059a
++Archive::Tar cpan/Archive-Tar/lib/Archive/Tar/Constant.pm 18af3e90665fcf2ab40c5b02c10ba0ea3ac34d0e
++Archive::Tar cpan/Archive-Tar/lib/Archive/Tar/File.pm c0b849aa3d164305d7cb084ba3adf8d505971d6b
++CPAN cpan/CPAN/lib/App/Cpan.pm b2a9928c41083c82e884f6dc6d4b7043a2b0e351
++CPAN cpan/CPAN/lib/CPAN.pm 27f0f5c41a81aba89dfc895e7671719716522544
++CPAN cpan/CPAN/scripts/cpan c43050c8c63153a205e4385e118e906d1ecadf06
++Digest cpan/Digest/Digest.pm 43f7f544cb11842b2f55c73e28930da50774e081
++Digest::SHA cpan/Digest-SHA/lib/Digest/SHA.pm 5841fcf70f7290e07befdd16f05093664c618a96
++Digest::SHA cpan/Digest-SHA/shasum f92faa37afc098e2a825e4ecda1097890492d957
++Encode cpan/Encode/bin/enc2xs 832a56f55ffc100e8beacfb0f0362f00d09a5056
++Encode cpan/Encode/bin/encguess f1e7a130995c4bad53bb6d3034dae625cfe61e32
++Encode cpan/Encode/bin/piconv 80ea7f9afff580e41c4b29f5ab214ed378274b49
++Encode cpan/Encode/bin/ucmlint 495862125269a60536b78fd0a7910d024c4d21fe
++Encode cpan/Encode/bin/unidump 715f47c2fcc661268f3c6cd3de0d27c72b745cd2
++Encode cpan/Encode/Encode.pm fc8f84c4344320d6712f3740d72eb05bf5d6abf7
++ExtUtils::Command cpan/ExtUtils-Command/lib/ExtUtils/Command.pm 245dd8fbe6e6a58fb02b6007b49ec7dc944d9fc9
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/bin/instmodsh 5bc04a0173b8b787f465271b6186220326ae8eef
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm 6298f9b41b29e13010b185f64fa952570637fbb4
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 6e16329fb4d4c2f8db4afef4d8e79c1c1c918128
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm fc0483c5c7b92a8e0f63eb1f762172cddce5b948
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 8d1b35fcd7d3b4f0552ffb151baf75ccb181267b
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm 676b10e16b2dc68ba21312ed8aa4d409e86005a6
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 757bffb47857521311f8f3bde43ebe165f8d5191
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm 82be06851deb84c6419ad003ce9b6d1957f395f3
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod b01a546e52a908ce4ccd0b1a36fe81de52ab0691
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm 91a7b2a36210cebd57ff89d202af3d2b7bce430c
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm d4e7d722b4544be28da838912a7cc714528bc05f
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/vpp.pm 7297903505ab551731692ec79cdc0f5396e12479
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm 58872d66a72515f7d5be02417dfd2b28005fd61a
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm ab80029ab16d38d4f2e41dc88d2ceb9f3790e477
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm 453e0abbc4bb38db4c0820ad5c4846f313b66291
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm c1b1babda8f43ae7a2caba1cb4f70f92af5a0e34
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 6f90d94ad3e7aa0045a3b1a10a1bb18391f89f57
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm cab2b3ce08b71a4ce89aa630f236eb08b852439d
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm 61fced0faf518bf87c265fcb51ed330ba354623f
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm ae0ef51a7b6dd0b05aa61c779df7167dda5f5119
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm 9bff0fc8801d93578a5ac35d39f06cdc0e2af1ef
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm 0544301f7121ff02fd3a11b73ca2fab22e1176d4
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm 433135eecb85b4b1d90d3027432f329436c78447
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm 1fbb5605bfb47feee4083feba8aa85e659628f70
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm 5b66d1f485a6034d96fc24ba1665b1bad9e447f1
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 8cef99a9bd370ecfd07ddb0efbdcbb4101255e45
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm 939572fde3d59ba77c2e677fe2df2bed4bed5898
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm 09c2049bfd25b735e2a5bcf56a6cff7b4827f9c8
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm d65d63f8217a55c36f62e249814988974f593c79
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm c0ae2a92a7a9f71fc5f608b4192c6255510b7ae4
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm 12df38eacceeed73cab94c423236bfaed0fbbfec
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm 22fe9596a0237252f45399a36abc83b7813bc328
+-ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm 7fbc42ca2ebc6c677b79ae5fd5647243cf069463
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm 0e39b9ae0582cc333d8cfbe4256e3f3f1ae342b5
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm 81ebde56af5860edc646518fb64e5c427754ac4f
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm fb83ad4184016de85de92e8a428ec2e48b8fbc18
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm 6917a5d775e4e6f348abebe59ac4362e75885c51
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 843e15e58fe1a1bd7f6054dc8a8e839aaa03003b
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm 4cadf37f823fef47a4862c44a3d34aa38315600b
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm ee5298707a26912989934f1d44bf25460394ef60
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm e247f2f2ba5d6283418ec6125d64a7a2b477ae43
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm 1522f54c02b0f03a10ea837dc950b1adef83aecc
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm 7d8c5389bc876d068efa0839ca5c1429a6d75166
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm c92f49161433b47e1bde182382f295d17469e298
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm a35e3b45759c40152eb49381ce559f8841670824
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm e071e7343ccfcefceb08edfc7adeb376750c641c
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm a28e086bbbb493569fe8eabc1ceb8ad439b255cf
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm 3738ade1474915ee758d11756a86c82fa27b38b3
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm 1eb8c77a788ad3c00064420361ab9234654b9525
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm 512ee5ce6c3c5733a2abb4ddf7ce18b704615d10
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm 69b72d04420c669a8924c5cba866db43466713c3
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm 53d22b9ee5292d4530d247251389aae92ba0a105
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm 34b76c6387d2f3f3a01dcbff605a781ba3d0d193
++ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm a2a37bdf9269c6fa66e031e2e6ed8d7a300e3f45
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/basic.t 6cdc7701b50e586bc9c4cfb1616de8eb0b1baf34
+ ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 71ebcee355691ce374fcad251b12d8b2412462b3
++File::Fetch cpan/File-Fetch/lib/File/Fetch.pm bd0b64a1d8ee2ffac39e017f9fa9f78f95514b4d
++HTTP::Tiny cpan/HTTP-Tiny/lib/HTTP/Tiny.pm 4cffe21a5c66dd7336f13df7d52be5120d090aa7
++IO-Compress cpan/IO-Compress/bin/zipdetails 381ba2a6ae5bd21c8d2e994316e3e13f2f0a4f41
++IO-Compress cpan/IO-Compress/lib/Compress/Zlib.pm 01f382d46c6c7551cb16b3c99f5da015c55ad747
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm c95002609634395f0fd161e8a1d25d03c0bae022
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm 0ab5d3a1a28a3801ce5eb502adc580eaeee8c60c
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm 159f157fce8d0e1ec8b1aea4bcdd16c3c0904b65
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Base.pm 83cf2ae26a6809d5d41b8617f663bef2ca882c76
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Base/Common.pm 4eed3b8d6564c0d8edf9b76dc2caef341ea834eb
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Bzip2.pm a19dc021ebf08ad179b6ae3ce51400f5267e684c
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Deflate.pm 1348a0011ca6e6ad3028026e82c036a125721280
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Gzip.pm f6389389137ac9b7db76452014519f2f34f1d87d
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm e46ad4d39bed2b7fe0723fc9acec5d1dc5e46f7f
++IO-Compress cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm 9635dc6c8465292e2d8f3ad44ea1e54a9887b925
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Zip.pm 52fab82bbf8c4a7dc75a69a34626617e52ffbb68
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm e8ef5dfe48fa2246a5ff24f0488ca18ef3f3e1a1
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm ae7aa43b8c64718335fef04437162d31210424d8
++IO-Compress cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm 9236d2fcbe050834369771825067390a8d13f63a
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm 56decd37cd235cfcd6b98fe86746f715455d54bf
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm fff717d6a8218c97db5d5c4d551a67d3cf9a752c
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm 67e33ad09662d3bbdcb8741ea00f57cdeb466cd3
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm d99c1bba995e0b91f9c59d4854abb1d4f36c1328
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm 4ea764e8f4ebdd62fe380bb0b73b084b74123b76
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Base.pm 21649fb4e5aae09e0aebc5268d4d9aaaa7c72ae6
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm adeb4419132aa6786663a51e550e58a31f11d561
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm a7e12d30abb98b99f2f0601c2b05ba54a20a1b05
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm 988b69f2f165e4b66dd03850596795683677b1b2
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm b9f6794e96bfbee0910730c1a3f1e2b2caeec487
++IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm 1bbf7d65aa5ef341c049e9bb91c37470464d0824
++IPC::Cmd cpan/IPC-Cmd/lib/IPC/Cmd.pm d76a3537902c2a3097c07e41242e2c01fa8f3288
++JSON::PP cpan/JSON-PP/bin/json_pp 22e1b3760ec2b2cfd7ff0d2165f6e88907b94c70
++JSON::PP cpan/JSON-PP/lib/JSON/PP.pm 817730a21b9be855d844e4d26023758960039e99
++Locale::Maketext::Simple cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm 57ed38905791a17c150210cd6f42ead22a7707b6
++Memoize cpan/Memoize/Memoize.pm 902092ff91cdec9c7b4bd06202eb179e1ce26ca2
++Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm 6928fb8a381cfba8204886c656844bcf1abc60f5
++Sys::Syslog cpan/Sys-Syslog/Syslog.pm 181d7541a6aa2a0a4d15f5beec32d16c17c76caf
++Test cpan/Test/lib/Test.pm 785c02014198ec3dae35e41def2cb24766fcf1cb
++Test::Harness cpan/Test-Harness/bin/prove 9b2866928cb1125de2c68f9773b25723e02c54c0
++Test::Harness cpan/Test-Harness/lib/App/Prove.pm 8b96310d4e05b6ad72c7038a91e95a3aa6c1fc39
++Test::Harness cpan/Test-Harness/lib/App/Prove/State.pm ea87e075608a009b0763217f3e564389286fcea1
++Test::Harness cpan/Test-Harness/lib/App/Prove/State/Result.pm 6e820da9eae1ee43eef01f6255e25694832969f2
++Test::Harness cpan/Test-Harness/lib/App/Prove/State/Result/Test.pm a8b4b89cfaafb44440c6724b5b94ead829a4510a
++Test::Harness cpan/Test-Harness/lib/TAP/Base.pm b91d8cf032790f421888bcdfa91d39e64f289a26
++Test::Harness cpan/Test-Harness/lib/TAP/Formatter/Base.pm 9b017d6dd8bc2c699e193e6b893ed213a855c4e0
++Test::Harness cpan/Test-Harness/lib/TAP/Formatter/Color.pm 1b97212502185fd234cc909021c5d5f57a448814
++Test::Harness cpan/Test-Harness/lib/TAP/Formatter/Console.pm 4410d6595d38376b9bd965fede732f3428eef705
++Test::Harness cpan/Test-Harness/lib/TAP/Formatter/Console/ParallelSession.pm 85c0336b97954f1c58fdc48862a4b1ce2a149be3
++Test::Harness cpan/Test-Harness/lib/TAP/Formatter/Console/Session.pm 8c9595e1a7e7626834032c9a5954f5c66c0f1ff6
++Test::Harness cpan/Test-Harness/lib/TAP/Formatter/File.pm 2c7abea023c4fee7017cfb599a25cc551326c8aa
++Test::Harness cpan/Test-Harness/lib/TAP/Formatter/File/Session.pm 6f2bf6392c6e9070bd21559e92ea97ad7006c152
++Test::Harness cpan/Test-Harness/lib/TAP/Formatter/Session.pm 2e4847fd9ed08b2ba5d7c5617221b07afafd9fa5
++Test::Harness cpan/Test-Harness/lib/TAP/Harness.pm 2c013331c41e76a9c8ca4f97b57bf173e66610fa
++Test::Harness cpan/Test-Harness/lib/TAP/Harness/Env.pm a06dcbcb22f1f0ae7e625082c4dfaa4e2f91f0ed
++Test::Harness cpan/Test-Harness/lib/TAP/Object.pm 6461aadd7a3addf67c1cb8e171fb4680a71d5f0f
++Test::Harness cpan/Test-Harness/lib/TAP/Parser.pm 690e60f36c9a828c97c9397c017e9bb2721a26b4
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Aggregator.pm f4c7a240ccdfaa8a2499429a0154760731c54389
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Grammar.pm 0350988f3f5e1a20e1fdd700a8e36e4909a98d1b
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Iterator.pm 5957df07d2c629e3ae0cce6ee189fcf2d0e16481
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Iterator/Array.pm 6ca0b21d09e7e522030803e80ee2c5e43da0200a
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Iterator/Process.pm 1a7a34030b039043ba68ed6118669748d3e6f9ba
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Iterator/Stream.pm bfbedcdbca160cc01359af14dbd07a4ec7dacbdd
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/IteratorFactory.pm 001fc1c577479ccf6c04ce37a6e2ca68631f3513
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Multiplexer.pm 366c0e42bad072f2d26b87d8e102ca08b2b93d46
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Result.pm 16d4699601d0810d6cff9087e0675c3c772a1052
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Result/Bailout.pm e3c7652819686d2d990b612812e38b9dab00a6c6
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Result/Comment.pm 96dd44af4420752be211a2b13b223a40099ef24e
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Result/Plan.pm 4263622a6ca211b94bd161ef1dbdba4a8f026d1c
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Result/Pragma.pm 22ba31346065c58aa46f362ab7b52e2de21e33bc
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Result/Test.pm 3087c37d50a94b1a1b6504498b379bbbb83ef0a4
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Result/Unknown.pm ba5ccd779dc722ba806ea36720a21c4e100c7a74
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Result/Version.pm 6561e825d540e1aaed2633738de27aa6b8873895
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Result/YAML.pm f4ba6ffe0a2aa25eb3da94d4336a4b4f652f17f1
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/ResultFactory.pm 17ff9e45e5591e50a5d2715c00d4762ffc4c71bc
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Scheduler.pm 06100b96178d37578f0847e940b7fdf6c62a2f7e
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Scheduler/Job.pm a70a5bb740d6eda2fa005af66003cce9e4b4ca76
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Scheduler/Spinner.pm 552c5129e506d7d635f9a1b8b753d7ed61ec4bc7
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/Source.pm 9f471c03d5d53c32dd7598428186ef8a41fe2e6a
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/SourceHandler.pm 51e8103040eef96f40ef5e31d9611485b54530cb
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Executable.pm 24f44ba332b73973ef84ae04a677eea43c1b1b34
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/SourceHandler/File.pm a704768f7f7b216f54c5abf85f5849b2bc4b6173
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Handle.pm c7c9caa93547245c9f891f0951c17c345d2f6c97
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/SourceHandler/Perl.pm 3a2ff8b259d5eb02cec00cb78ad1cc52d57ad770
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/SourceHandler/RawTAP.pm db4d800d8b324aa3fc2ec811339e6653973f6fda
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/YAMLish/Reader.pm ff16eb902d35a5c8cf065999fb869f50cd5b63ee
++Test::Harness cpan/Test-Harness/lib/TAP/Parser/YAMLish/Writer.pm 992773df8e2027ebb264b9b4c8229feca069c487
++Test::Harness cpan/Test-Harness/lib/Test/Harness.pm 74b16495d3326641089b11498175cd4e9a666ce7
+ Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 9bae51c9b944cd5c0bbabe9d397e573976a2be8e
+ Win32API::File cpan/Win32API-File/buffers.h 02d230ac9ac7091365128161a0ed671898baefae
+ Win32API::File cpan/Win32API-File/cFile.h fca7e383e76979c3ac3adf12d11d1bcd2618e489
+@@ -43,6 +148,21 @@ Win32API::File cpan/Win32API-File/Makefile.PL 605d0aee31aebe84a99408f9ab5f644db5
+ Win32API::File cpan/Win32API-File/t/file.t 124e64aa77e755235eb297644a87fac5388d3d78
+ Win32API::File cpan/Win32API-File/t/tie.t 712ea7edd0cc805ce1c0b8172c01b03dd19b583d
+ Win32API::File cpan/Win32API-File/typemap 24bff088babeadac0873e8df390d1666d9d9db4a
++base dist/base/lib/base.pm 4d288b5b2070ee71585c5b315ba2b0aedd90cc1f
++libnet cpan/libnet/lib/Net/Cmd.pm 4a9f6e4501549a2d7a04fbf5f9e27ab0c00976f2
++libnet cpan/libnet/lib/Net/Config.pm dfa96dcd5a459f9f39e5ca513cefc82b8178520f
++libnet cpan/libnet/lib/Net/Domain.pm 090c8c06e210102dcf25e6820c6b43b5464ec49a
++libnet cpan/libnet/lib/Net/FTP.pm d2ba0c0acbb12274bdbdcc9a2f796dfdefffee3a
++libnet cpan/libnet/lib/Net/FTP/A.pm 5ab6b4c5842496fb1c20e2669149d38b77f956b9
++libnet cpan/libnet/lib/Net/FTP/dataconn.pm 51d87f91be37eff42450e783aa59e7253f5d6757
++libnet cpan/libnet/lib/Net/FTP/E.pm 58e16ebdce1299cfbc571eedcc5b8f39de28995d
++libnet cpan/libnet/lib/Net/FTP/I.pm 2be52cbb7621be0cb3b05c3c5e40cb674dbde379
++libnet cpan/libnet/lib/Net/FTP/L.pm 0d74596453fa3cdcffc793ce3b39144dc33138a3
++libnet cpan/libnet/lib/Net/Netrc.pm 4f633af3bcbb8fe3d66bc048c5399e15a6ae9339
++libnet cpan/libnet/lib/Net/NNTP.pm 8f1e0cdb2746b88245394fc4301b36be162cd8ff
++libnet cpan/libnet/lib/Net/POP3.pm dfd924fac6041c163f93e1b0006370eb55894f19
++libnet cpan/libnet/lib/Net/SMTP.pm 5dbb1d3bc93f00f130c7f62b15b9fa48c4fa99fd
++libnet cpan/libnet/lib/Net/Time.pm ddc742bc1d386ab6778090afb374d21bdc664d40
+ podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6
+ podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69
+ version cpan/version/lib/version.pm d0923b895d57f1d669ae36fcf85c87b16db341d1
+-- 
+2.9.2
+
diff --git a/gnu/packages/patches/perl-CVE-2016-6185.patch b/gnu/packages/patches/perl-CVE-2016-6185.patch
new file mode 100644
index 0000000..aa95079
--- /dev/null
+++ b/gnu/packages/patches/perl-CVE-2016-6185.patch
@@ -0,0 +1,208 @@ 
+From 7b5003b4f4213ca694d03577b95244f70a5e170c Mon Sep 17 00:00:00 2001
+From: Father Chrysostomos <sprout@cpan.org>
+Date: Sat, 2 Jul 2016 22:56:51 -0700
+Subject: [PATCH 1/3] =?UTF-8?q?Don=E2=80=99t=20let=20XSLoader=20load=20rel?=
+ =?UTF-8?q?ative=20paths?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[rt.cpan.org #115808]
+
+The logic in XSLoader for determining the library goes like this:
+
+    my $c = () = split(/::/,$caller,-1);
+    $modlibname =~ s,[\\/][^\\/]+$,, while $c--;    # Q&D basename
+    my $file = "$modlibname/auto/$modpname/$modfname.bundle";
+
+(That last line varies by platform.)
+
+$caller is the calling package.  $modlibname is the calling file.  It
+removes as many path segments from $modlibname as there are segments
+in $caller.  So if you have Foo/Bar/XS.pm calling XSLoader from the
+Foo::Bar package, the $modlibname will end up containing the path in
+@INC where XS.pm was found, followed by "/Foo".  Usually the fallback
+to Dynaloader::bootstrap_inherit, which does an @INC search, makes
+things Just Work.
+
+But if our hypothetical Foo/Bar/XS.pm actually calls
+XSLoader::load from inside a string eval, then path ends up being
+"(eval 1)/auto/Foo/Bar/Bar.bundle".
+
+So if someone creates a directory named ‘(eval 1)’ with a naughty
+binary file in it, it will be loaded if a script using Foo::Bar is run
+in the parent directory.
+
+This commit makes XSLoader fall back to Dynaloader’s @INC search if
+the calling file has a relative path that is not found in @INC.
+
+(cherry picked from commit 08e3451d7b3b714ad63a27f1b9c2a23ee75d15ee)
+---
+ dist/XSLoader/XSLoader_pm.PL | 25 +++++++++++++++++++++++++
+ dist/XSLoader/t/XSLoader.t   | 27 ++++++++++++++++++++++++++-
+ 2 files changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/dist/XSLoader/XSLoader_pm.PL b/dist/XSLoader/XSLoader_pm.PL
+index 414eaf2..e0aed87 100644
+--- a/dist/XSLoader/XSLoader_pm.PL
++++ b/dist/XSLoader/XSLoader_pm.PL
+@@ -90,6 +90,31 @@ print OUT <<'EOT';
+     my $modpname = join('/',@modparts);
+     my $c = () = split(/::/,$caller,-1);
+     $modlibname =~ s,[\\/][^\\/]+$,, while $c--;    # Q&D basename
++    # Does this look like a relative path?
++    if ($modlibname !~ m|^[\\/]|) {
++        # Someone may have a #line directive that changes the file name, or
++        # may be calling XSLoader::load from inside a string eval.  We cer-
++        # tainly do not want to go loading some code that is not in @INC,
++        # as it could be untrusted.
++        #
++        # We could just fall back to DynaLoader here, but then the rest of
++        # this function would go untested in the perl core, since all @INC
++        # paths are relative during testing.  That would be a time bomb
++        # waiting to happen, since bugs could be introduced into the code.
++        #
++        # So look through @INC to see if $modlibname is in it.  A rela-
++        # tive $modlibname is not a common occurrence, so this block is
++        # not hot code.
++        FOUND: {
++            for (@INC) {
++                if ($_ eq $modlibname) {
++                    last FOUND;
++                }
++            }
++            # Not found.  Fall back to DynaLoader.
++            goto \&XSLoader::bootstrap_inherit;
++        }
++    }
+ EOT
+ 
+ my $dl_dlext = quotemeta($Config::Config{'dlext'});
+diff --git a/dist/XSLoader/t/XSLoader.t b/dist/XSLoader/t/XSLoader.t
+index 2ff11fe..1e86faa 100644
+--- a/dist/XSLoader/t/XSLoader.t
++++ b/dist/XSLoader/t/XSLoader.t
+@@ -33,7 +33,7 @@ my %modules = (
+     'Time::HiRes'=> q| ::can_ok( 'Time::HiRes' => 'usleep'  ) |,  # 5.7.3
+ );
+ 
+-plan tests => keys(%modules) * 3 + 9;
++plan tests => keys(%modules) * 3 + 10;
+ 
+ # Try to load the module
+ use_ok( 'XSLoader' );
+@@ -125,3 +125,28 @@ XSLoader::load("Devel::Peek");
+ EOS
+     or ::diag $@;
+ }
++
++SKIP: {
++  skip "File::Path not available", 1
++    unless eval { require File::Path };
++  my $name = "phooo$$";
++  File::Path::make_path("$name/auto/Foo/Bar");
++  open my $fh,
++    ">$name/auto/Foo/Bar/Bar.$Config::Config{'dlext'}";
++  close $fh;
++  my $fell_back;
++  local *XSLoader::bootstrap_inherit = sub {
++    $fell_back++;
++    # Break out of the calling subs
++    goto the_test;
++  };
++  eval <<END;
++#line 1 $name
++package Foo::Bar;
++XSLoader::load("Foo::Bar");
++END
++ the_test:
++  ok $fell_back,
++    'XSLoader will not load relative paths based on (caller)[1]';
++  File::Path::remove_tree($name);
++}
+-- 
+2.9.2
+
+From 0305f4018f7ef3523ba67f7bb072c25abe890067 Mon Sep 17 00:00:00 2001
+From: Father Chrysostomos <sprout@cpan.org>
+Date: Mon, 4 Jul 2016 08:48:57 -0700
+Subject: [PATCH 2/3] Fix XSLoader to recognize drive letters
+
+Commit 08e3451d made XSLoader confirm that the file path it got
+from (caller)[2] was in @INC if it looked like a relative path.
+Not taking drive letters into account, it made that @INC search
+mandatory on Windows and some other systems.  It still worked, but
+was slightly slower.
+
+(cherry picked from commit a651dcdf6a9151150dcf0fb6b18849d3e39b0811)
+---
+ dist/XSLoader/XSLoader_pm.PL | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/dist/XSLoader/XSLoader_pm.PL b/dist/XSLoader/XSLoader_pm.PL
+index e0aed87..85148de 100644
+--- a/dist/XSLoader/XSLoader_pm.PL
++++ b/dist/XSLoader/XSLoader_pm.PL
+@@ -90,8 +90,20 @@ print OUT <<'EOT';
+     my $modpname = join('/',@modparts);
+     my $c = () = split(/::/,$caller,-1);
+     $modlibname =~ s,[\\/][^\\/]+$,, while $c--;    # Q&D basename
++EOT
++
++my $to_print = <<'EOT';
+     # Does this look like a relative path?
+-    if ($modlibname !~ m|^[\\/]|) {
++    if ($modlibname !~ m{regexp}) {
++EOT
++
++$to_print =~ s~regexp~
++    $^O eq 'MSWin32' || $^O eq 'os2' || $^O eq 'cygwin' || $^O eq 'amigaos'
++        ? '^(?:[A-Za-z]:)?[\\\/]' # Optional drive letter
++        : '^/'
++~e;
++
++print OUT $to_print, <<'EOT';
+         # Someone may have a #line directive that changes the file name, or
+         # may be calling XSLoader::load from inside a string eval.  We cer-
+         # tainly do not want to go loading some code that is not in @INC,
+-- 
+2.9.2
+
+From 4906af99ca0d3b9c85773a56e2821442dce282f1 Mon Sep 17 00:00:00 2001
+From: Steve Hay <steve.m.hay@googlemail.com>
+Date: Thu, 21 Jul 2016 21:30:23 +0100
+Subject: [PATCH 3/3] $VERSION++ for XSLoader
+
+Manual change in lieu of cherry-picking
+5993d6620f29d22b0a72701f4f0fdacff3d25460 and part of
+ae635bbffa4769051671b9832a7472b9d977c198 since maint-5.22 has an older
+version of XSLoader.
+---
+ dist/XSLoader/XSLoader_pm.PL | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dist/XSLoader/XSLoader_pm.PL b/dist/XSLoader/XSLoader_pm.PL
+index 85148de..d4ed2c7 100644
+--- a/dist/XSLoader/XSLoader_pm.PL
++++ b/dist/XSLoader/XSLoader_pm.PL
+@@ -10,7 +10,7 @@ print OUT <<'EOT';
+ 
+ package XSLoader;
+ 
+-$VERSION = "0.20";
++$VERSION = "0.20_01";
+ 
+ #use strict;
+ 
+@@ -245,7 +245,7 @@ XSLoader - Dynamically load C libraries into Perl code
+ 
+ =head1 VERSION
+ 
+-Version 0.17
++Version 0.20_01
+ 
+ =head1 SYNOPSIS
+ 
+-- 
+2.9.2
+
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index f42abee..e117279 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -43,6 +43,7 @@ 
   ;; Yeah, Perl...  It is required early in the bootstrap process by Linux.
   (package
     (name "perl")
+    (replacement perl/fixed)
     (version "5.22.1")
     (source (origin
              (method url-fetch)
@@ -120,6 +121,29 @@ 
     (home-page "http://www.perl.org/")
     (license gpl1+)))                          ; or "Artistic"
 
+(define perl/fixed
+  (package
+    (inherit perl)
+    (replacement #f)
+    (source
+      (let ((name "perl") (version "5.22.1"))
+        (origin
+          (method url-fetch)
+          (uri (string-append "http://www.cpan.org/src/5.0/perl"
+                              version ".tar.gz"))
+          (sha256
+           (base32
+            "09wg24w5syyafyv87l6z8pxwz4bjgcdj996bx5844k6m9445sirb"))
+          (patches (search-patches "perl-no-sys-dirs.patch"
+                                   "perl-autosplit-default-time.patch"
+                                   "perl-source-date-epoch.patch"
+                                   "perl-deterministic-ordering.patch"
+                                   "perl-no-build-time.patch"
+                                   "perl-CVE-2015-8607.patch"
+                                   "perl-CVE-2016-2381.patch"
+                                   "perl-CVE-2016-1238.patch"
+                                   "perl-CVE-2016-6185.patch")))))))
+
 (define-public perl-algorithm-c3
   (package
     (name "perl-algorithm-c3")
-- 
2.9.2