Update upstream source from tag 'upstream/0.37'

Update to upstream version '0.37'
with Debian dir 97d43f6fcc9f6715790c19634bd4e0f010555168

42 files changed, 44 insertions, 35 deletions

diff --git a/t/.mcpani/config b/t/.mcpani/config
index 40403b6..40403b6 100644..100755
--- a/t/.mcpani/config
+++ b/t/.mcpani/config
diff --git a/t/.mcpani/config_bad b/t/.mcpani/config_bad
index 9c345d3..9c345d3 100644..100755
--- a/t/.mcpani/config_bad
+++ b/t/.mcpani/config_bad
diff --git a/t/.mcpani/config_badremote b/t/.mcpani/config_badremote
index 8cab746..8cab746 100644..100755
--- a/t/.mcpani/config_badremote
+++ b/t/.mcpani/config_badremote
diff --git a/t/.mcpani/config_mcpi b/t/.mcpani/config_mcpi
index b06d530..b06d530 100644..100755
--- a/t/.mcpani/config_mcpi
+++ b/t/.mcpani/config_mcpi
diff --git a/t/.mcpani/config_noread b/t/.mcpani/config_noread
index c970925..c970925 100644..100755
--- a/t/.mcpani/config_noread
+++ b/t/.mcpani/config_noread
diff --git a/t/.mcpani/config_norepo b/t/.mcpani/config_norepo
index dbb8e8a..dbb8e8a 100644..100755
--- a/t/.mcpani/config_norepo
+++ b/t/.mcpani/config_norepo
diff --git a/t/.mcpani/config_nowrite b/t/.mcpani/config_nowrite
index ffb6f18..ffb6f18 100644..100755
--- a/t/.mcpani/config_nowrite
+++ b/t/.mcpani/config_nowrite
diff --git a/t/.mcpani/config_with_whitespaces b/t/.mcpani/config_with_whitespaces
index cd86168..cd86168 100644..100755
--- a/t/.mcpani/config_with_whitespaces
+++ b/t/.mcpani/config_with_whitespaces
diff --git a/t/00.load.t b/t/00.load.t
index 35ba62b..35ba62b 100644..100755
--- a/t/00.load.t
+++ b/t/00.load.t
diff --git a/t/add-multiple.t b/t/add-multiple.t
index 8aad410..8aad410 100644..100755
--- a/t/add-multiple.t
+++ b/t/add-multiple.t
diff --git a/t/add.t b/t/add.t
index 1e52bfb..5ddb659 100644..100755
--- a/t/add.t
+++ b/t/add.t
@@ -35,7 +35,7 @@ is( grep( /^CPAN::Mini::Inject\s+/, @{ $mcpi->{modulelist} } ),
   1, 'Module added to list just once' );
 
 SKIP: {
-  skip "Not a UNIX system", 2 if ( $^O =~ /^MSWin/ );
+  skip "Not a UNIX system", 2 if ( $^O =~ /^MSWin|^cygwin/ );
   is( ( stat( 't/local/MYCPAN/authors/id/S/SS/SSORICHE' ) )[2] & 07777,
     0775, 'Added author directory mode is 0775' );
   is(
diff --git a/t/html/01mailrc.txt.gz b/t/html/01mailrc.txt.gz
index 7bee62a..7bee62a 100644..100755
--- a/t/html/01mailrc.txt.gz
+++ b/t/html/01mailrc.txt.gz
diff --git a/t/html/02packages.details.txt.gz b/t/html/02packages.details.txt.gz
index 79ce42c..79ce42c 100644..100755
--- a/t/html/02packages.details.txt.gz
+++ b/t/html/02packages.details.txt.gz
diff --git a/t/html/03modlist.data.gz b/t/html/03modlist.data.gz
index 689b691..689b691 100644..100755
--- a/t/html/03modlist.data.gz
+++ b/t/html/03modlist.data.gz
diff --git a/t/html/CHECKSUMS b/t/html/CHECKSUMS
index 2a02d41..2a02d41 100644..100755
--- a/t/html/CHECKSUMS
+++ b/t/html/CHECKSUMS
diff --git a/t/html/CPAN-Mini-2.1828.tar.gz b/t/html/CPAN-Mini-2.1828.tar.gz
index 2a02d41..2a02d41 100644..100755
--- a/t/html/CPAN-Mini-2.1828.tar.gz
+++ b/t/html/CPAN-Mini-2.1828.tar.gz
diff --git a/t/html/CPAN-Mini-Inject-1.01.tar.gz b/t/html/CPAN-Mini-Inject-1.01.tar.gz
index 2a02d41..2a02d41 100644..100755
--- a/t/html/CPAN-Mini-Inject-1.01.tar.gz
+++ b/t/html/CPAN-Mini-Inject-1.01.tar.gz
diff --git a/t/html/index.html b/t/html/index.html
index 9cbf947..9cbf947 100644..100755
--- a/t/html/index.html
+++ b/t/html/index.html
diff --git a/t/inject.t b/t/inject.t
index 1e022ed..e8fb5ec 100644..100755
--- a/t/inject.t
+++ b/t/inject.t
@@ -1,26 +1,33 @@
-use Test::More tests => 11;
+use Test::More tests => 12;
 
+use Test::InDistDir;
 use CPAN::Mini::Inject;
 use File::Path;
 use File::Copy;
 use File::Basename;
 use Compress::Zlib;
 
-rmtree( ['t/local/MYCPAN/modulelist'], 0, 1 );
+my $root = "t/local";
+my $modules = "$root/CPAN/modules";
+my $authors = "$root/CPAN/authors";
+my $mycpan = "$root/MYCPAN";
+my $mymodules = "$root/mymodules";
+
+rmtree( ["$mycpan/modulelist"], 0, 1 );
 copy(
-  't/local/CPAN/modules/02packages.details.txt.gz.original',
-  't/local/CPAN/modules/02packages.details.txt.gz'
+  "$modules/02packages.details.txt.gz.original",
+  "$modules/02packages.details.txt.gz"
 );
-chmod oct(666), 't/local/CPAN/modules/02packages.details.txt.gz';
-chmod oct(666), "t/local/CPAN/authors/01mailrc.txt.gz" if -f "t/local/CPAN/authors/01mailrc.txt.gz";
-rmtree( ['t/local/CPAN/authors'], 0, 1 );
-mkdir( 't/local/CPAN/authors' );
+chmod oct(666), "$modules/02packages.details.txt.gz";
+chmod oct(666), "$authors/01mailrc.txt.gz" if -f "$authors/01mailrc.txt.gz";
+rmtree( [$authors], 0, 1 );
+mkdir( $authors );
 copy(
-  't/local/01mailrc.txt.gz.original',
-  't/local/CPAN/authors/01mailrc.txt.gz'
+  "$root/01mailrc.txt.gz.original",
+  "$authors/01mailrc.txt.gz"
 );
-chmod oct(666), 't/local/CPAN/authors/01mailrc.txt.gz';
-mkdir( 't/local/MYCPAN' );
+chmod oct(666), "$authors/01mailrc.txt.gz";
+mkdir( $mycpan );
 
 my $mcpi;
 my $module = "S/SS/SSORICHE/CPAN-Mini-Inject-0.01.tar.gz";
@@ -33,44 +40,46 @@ $mcpi->loadcfg( 't/.mcpani/config' )->parsecfg->readlist->add(
   module   => 'CPAN::Mini::Inject',
   authorid => 'SSORICHE',
   version  => '0.01',
-  file     => 't/local/mymodules/CPAN-Mini-Inject-0.01.tar.gz'
+  file     => "$mymodules/CPAN-Mini-Inject-0.01.tar.gz"
  )->add(
   module   => 'CPAN::Mini::Inject',
   authorid => 'SSORICHE',
   version  => '0.02',
-  file     => 't/local/mymodules/CPAN-Mini-Inject-0.01.tar.gz'
+  file     => "$mymodules/CPAN-Mini-Inject-0.01.tar.gz"
  )->add(
   module   => 'CPAN::Mini',
   authorid => 'RJBS',
   version  => '0.17',
-  file     => 't/local/mymodules/CPAN-Mini-0.17.tar.gz',
+  file     => "$mymodules/CPAN-Mini-0.17.tar.gz",
  )->writelist;
 
 ok( $mcpi->inject,                        'Copy modules' );
-ok( -e "t/local/CPAN/authors/id/$module", 'Module file exists' );
-ok( -e 't/local/CPAN/authors/id/S/SS/SSORICHE/CHECKSUMS',
-  'Checksum created' );
+ok( -e "$authors/id/$module", 'Module file exists' );
+my $checksum_file = "$authors/id/S/SS/SSORICHE/CHECKSUMS";
+ok( -e "$checksum_file", 'Checksum created' );
+
+open my $chk, '<', $checksum_file;
+my $checksum_text = join "", <$chk>;
+close $chk;
+unlike $checksum_text, qr{$authors/id}, "root path isn't leaked to checksums";
 
 SKIP: {
-  skip "Not a UNIX system", 3 if ( $^O =~ /^MSWin/ );
-  is( ( stat( "t/local/CPAN/authors/id/$module" ) )[2] & 07777,
+  skip "Not a UNIX system", 3 if ( $^O =~ /^MSWin|^cygwin/ );
+  is( ( stat( "$authors/id/$module" ) )[2] & 07777,
     0664, 'Module file mode set' );
   is(
-    ( stat( dirname( "t/local/CPAN/authors/id/$module" ) ) )[2] & 07777,
-    0775,
-    'Author directory mode set'
+    ( stat( dirname( "$authors/id/$module" ) ) )[2] & 07777,
+    0775, 'Author directory mode set'
   );
   is(
-    ( stat( 't/local/CPAN/authors/id/S/SS/SSORICHE/CHECKSUMS' ) )[2]
-     & 07777,
-    0664,
-    'Checksum file mode set'
+    ( stat( "$checksum_file" ) )[2] & 07777,
+    0664, 'Checksum file mode set'
   );
 }
 
 my @goodfile = <DATA>;
 ok( my $gzread
-   = gzopen( 't/local/CPAN/modules/02packages.details.txt.gz', 'rb' ) );
+   = gzopen( "$modules/02packages.details.txt.gz", 'rb' ) );
 
 my @packages;
 my $package;
@@ -90,7 +99,7 @@ $gzread->gzclose;
 is_deeply( \@goodfile, \@packages );
 
 ok( my $gzauthread
-   = gzopen( 't/local/CPAN/authors/01mailrc.txt.gz', 'rb' ) );
+   = gzopen( "$authors/01mailrc.txt.gz", 'rb' ) );
 
 my $author;
 my $author_was_injected = 0;
@@ -103,12 +112,12 @@ $gzauthread->gzclose;
 ok( $author_was_injected,      'author injected into 01mailrc.txt.gz' );
 ok( $author_was_injected == 1, 'author injected exactly 1 time' );
 
-unlink( 't/local/CPAN/authors/id/S/SS/SSORICHE/CHECKSUMS' );
-unlink( "t/local/CPAN/authors/id/$module" );
-unlink( 't/local/MYCPAN/modulelist' );
-unlink( 't/local/CPAN/modules/02packages.details.txt.gz' );
+unlink( "$checksum_file" );
+unlink( "$authors/id/$module" );
+unlink( "$mycpan/modulelist" );
+unlink( "$modules/02packages.details.txt.gz" );
 
-rmtree( [ 't/local/CPAN/authors', 't/local/MYCPAN' ], 0, 1 );
+rmtree( [ $authors, $mycpan ], 0, 1 );
 
 __DATA__
 File:         02packages.details.txt
diff --git a/t/lib/CPANServer.pm b/t/lib/CPANServer.pm
index 90a5cc9..90a5cc9 100644..100755
--- a/t/lib/CPANServer.pm
+++ b/t/lib/CPANServer.pm
diff --git a/t/lib/filenames.pl b/t/lib/filenames.pl
index 504b4bf..504b4bf 100644..100755
--- a/t/lib/filenames.pl
+++ b/t/lib/filenames.pl
diff --git a/t/loadcfg.t b/t/loadcfg.t
index 4e8fcb5..4e8fcb5 100644..100755
--- a/t/loadcfg.t
+++ b/t/loadcfg.t
diff --git a/t/local/01mailrc.txt.gz.original b/t/local/01mailrc.txt.gz.original
index d14acf2..d14acf2 100644..100755
--- a/t/local/01mailrc.txt.gz.original
+++ b/t/local/01mailrc.txt.gz.original
diff --git a/t/local/CPAN/modules/02packages.details.txt.gz.original b/t/local/CPAN/modules/02packages.details.txt.gz.original
index 01e0a0a..01e0a0a 100644..100755
--- a/t/local/CPAN/modules/02packages.details.txt.gz.original
+++ b/t/local/CPAN/modules/02packages.details.txt.gz.original
diff --git a/t/local/mymodules/CPAN-Mini-0.17.tar.gz b/t/local/mymodules/CPAN-Mini-0.17.tar.gz
index e69de29..e69de29 100644..100755
--- a/t/local/mymodules/CPAN-Mini-0.17.tar.gz
+++ b/t/local/mymodules/CPAN-Mini-0.17.tar.gz
diff --git a/t/local/mymodules/CPAN-Mini-Inject-0.01.tar.gz b/t/local/mymodules/CPAN-Mini-Inject-0.01.tar.gz
index e69de29..e69de29 100644..100755
--- a/t/local/mymodules/CPAN-Mini-Inject-0.01.tar.gz
+++ b/t/local/mymodules/CPAN-Mini-Inject-0.01.tar.gz
diff --git a/t/local/mymodules/Dist-Metadata-Test-MetaFile-2.2.tar.gz b/t/local/mymodules/Dist-Metadata-Test-MetaFile-2.2.tar.gz
index 3c49465..3c49465 100644..100755
--- a/t/local/mymodules/Dist-Metadata-Test-MetaFile-2.2.tar.gz
+++ b/t/local/mymodules/Dist-Metadata-Test-MetaFile-2.2.tar.gz
diff --git a/t/local/mymodules/Dist-Metadata-Test-MetaFile-Only.tar.gz b/t/local/mymodules/Dist-Metadata-Test-MetaFile-Only.tar.gz
index 4af56c9..4af56c9 100644..100755
--- a/t/local/mymodules/Dist-Metadata-Test-MetaFile-Only.tar.gz
+++ b/t/local/mymodules/Dist-Metadata-Test-MetaFile-Only.tar.gz
diff --git a/t/local/mymodules/not-discoverable.tar.gz b/t/local/mymodules/not-discoverable.tar.gz
index e69de29..e69de29 100644..100755
--- a/t/local/mymodules/not-discoverable.tar.gz
+++ b/t/local/mymodules/not-discoverable.tar.gz
diff --git a/t/new.t b/t/new.t
index bedd1e6..bedd1e6 100644..100755
--- a/t/new.t
+++ b/t/new.t
diff --git a/t/parsecfg.t b/t/parsecfg.t
index bbd0976..bbd0976 100644..100755
--- a/t/parsecfg.t
+++ b/t/parsecfg.t
diff --git a/t/pod-coverage.t b/t/pod-coverage.t
index 963cbc9..963cbc9 100644..100755
--- a/t/pod-coverage.t
+++ b/t/pod-coverage.t
diff --git a/t/pod.t b/t/pod.t
index 437887a..437887a 100644..100755
--- a/t/pod.t
+++ b/t/pod.t
diff --git a/t/private.t b/t/private.t
index f1199ac..f1199ac 100644..100755
--- a/t/private.t
+++ b/t/private.t
diff --git a/t/read/MYCPAN/modulelist b/t/read/MYCPAN/modulelist
index c72f881..c72f881 100644..100755
--- a/t/read/MYCPAN/modulelist
+++ b/t/read/MYCPAN/modulelist
diff --git a/t/read/MYCPAN/test-0.01.tar.gz b/t/read/MYCPAN/test-0.01.tar.gz
index e69de29..e69de29 100644..100755
--- a/t/read/MYCPAN/test-0.01.tar.gz
+++ b/t/read/MYCPAN/test-0.01.tar.gz
diff --git a/t/read/authors/01mailrc.txt.gz b/t/read/authors/01mailrc.txt.gz
index 9daeafb..9daeafb 100644..100755
--- a/t/read/authors/01mailrc.txt.gz
+++ b/t/read/authors/01mailrc.txt.gz
diff --git a/t/readlist.t b/t/readlist.t
index ad4635a..ad4635a 100644..100755
--- a/t/readlist.t
+++ b/t/readlist.t
diff --git a/t/testremote.t b/t/testremote.t
index 8512c10..8512c10 100644..100755
--- a/t/testremote.t
+++ b/t/testremote.t
diff --git a/t/update_mirror.t b/t/update_mirror.t
index 7bd5a57..7bd5a57 100644..100755
--- a/t/update_mirror.t
+++ b/t/update_mirror.t
diff --git a/t/writelist.t b/t/writelist.t
index de9d907..de9d907 100644..100755
--- a/t/writelist.t
+++ b/t/writelist.t
diff --git a/t/zz.exceptions.t b/t/zz.exceptions.t
index f90c9de..f90c9de 100644..100755
--- a/t/zz.exceptions.t
+++ b/t/zz.exceptions.t