In perl.git, the branch smoke-me/leont/harness has been updated <http://perl5.git.perl.org/perl.git/commitdiff/592bc5caf785af2d4ad1b96eea2abdfe04dfa2ea?hp=f22d3d69bab5ad3503ae8ea49612c69e37e4feb8>
discards f22d3d69bab5ad3503ae8ea49612c69e37e4feb8 (commit) - Log ----------------------------------------------------------------- commit 592bc5caf785af2d4ad1b96eea2abdfe04dfa2ea Author: Leon Timmermans <[email protected]> Date: Sat Mar 18 22:51:51 2017 +0100 Upgrade to Test::Harness 3.38 ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- Porting/corelist.pl | 4 ++-- Porting/release_schedule.pod | 2 ++ Porting/sync-with-cpan | 11 ++++++++++- t/porting/copyright.t | 4 +++- t/porting/customized.dat | 27 --------------------------- 6 files changed, 18 insertions(+), 32 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index d2b3069e1a..97ba798081 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1066,7 +1066,7 @@ use File::Glob qw(:case); }, 'Test::Harness' => { - 'DISTRIBUTION' => 'LEONT/Test-Harness-3.36.tar.gz', + 'DISTRIBUTION' => 'LEONT/Test-Harness-3.38.tar.gz', 'FILES' => q[cpan/Test-Harness], 'EXCLUDED' => [ qr{^examples/}, diff --git a/Porting/corelist.pl b/Porting/corelist.pl index 448cb9d1c7..ce74ed42c8 100755 --- a/Porting/corelist.pl +++ b/Porting/corelist.pl @@ -21,8 +21,8 @@ use IPC::Cmd 'can_run'; use HTTP::Tiny; use IO::Uncompress::Gunzip; -my $corelist_file = 'dist/Module-CoreList/lib/Module/CoreList.pm'; -my $utils_file = 'dist/Module-CoreList/lib/Module/CoreList/Utils.pm'; +my $corelist_file = './dist/Module-CoreList/lib/Module/CoreList.pm'; +my $utils_file = './dist/Module-CoreList/lib/Module/CoreList/Utils.pm'; my %lines; my %module_to_file; diff --git a/Porting/release_schedule.pod b/Porting/release_schedule.pod index 63f36ae3ff..1cadc5e66e 100644 --- a/Porting/release_schedule.pod +++ b/Porting/release_schedule.pod @@ -19,6 +19,7 @@ Code freezes (which happen in the 5.25.X series) 2017-01-20 5.25.9 User-visible changes to correctly functioning programs freeze 2017-02-20 5.25.10 Full code freeze + 2017-03-20 5.25.11 Full code freeze 2017-04-20 5.26.0 Stable release! =head2 Perl 5.24 @@ -62,6 +63,7 @@ you should reset the version numbers to the next blead series. 2016-12-20 5.25.8 â Sawyer X 2017-01-20 5.25.9 â Abigail 2017-02-20 5.25.10 â Renée Bäcker + 2017-03-20 5.25.11 Sawyer X (RC0 for 5.26.0 will be released once we think that all the blockers have been addressed. This typically means some time in April or May.) diff --git a/Porting/sync-with-cpan b/Porting/sync-with-cpan index 8245e5cd66..e6cfd8f36e 100755 --- a/Porting/sync-with-cpan +++ b/Porting/sync-with-cpan @@ -158,7 +158,7 @@ our %Modules; use autodie; -require "Porting/Maintainers.pl"; +require "./Porting/Maintainers.pl"; my $MAKE_LOG = 'make.log'; @@ -482,6 +482,15 @@ if (@de_exec && @delete) { @de_exec = grep {!$delete {$_}} @de_exec; } +# +# Mustn't change the +x bit on files that are whitelisted +# +if (@de_exec) { + my %permitted = map +(tr/\n//dr => 1), grep !/^#/, + do { local @ARGV = '../Porting/exec-bit.txt'; <> }; + @de_exec = grep !$permitted{"cpan/$pkg_dir/$_"}, @de_exec; +} + say "unlink $pkg_dir/$_" for @delete; say "git add $pkg_dir/$_" for @commit; say "git rm -f $pkg_dir/$_" for @gone; diff --git a/t/porting/copyright.t b/t/porting/copyright.t index ab6226acb2..daa95f806e 100644 --- a/t/porting/copyright.t +++ b/t/porting/copyright.t @@ -18,7 +18,9 @@ working on older releases. It should be run before making a new release. =cut - +BEGIN { + unshift @INC, '.' if -f 'TestInit.pm'; +} use TestInit; use strict; use Config; diff --git a/t/porting/customized.dat b/t/porting/customized.dat index c73daf2a98..eb38b270d6 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -3,33 +3,6 @@ Encode cpan/Encode/Unicode/Unicode.pm 9749692c67f7d69083034de9184a93f070ab4799 ExtUtils::Constant cpan/ExtUtils-Constant/t/Constant.t a0369c919e216fb02767a637666bb4577ad79b02 File::Path cpan/File-Path/lib/File/Path.pm fd8ce4420a0c113d3f47dd3223859743655c1da8 File::Path cpan/File-Path/t/Path_win32.t 94b9276557ce7f80b91f6fd9bfa7a0cd9bf9683e -IO-Compress cpan/IO-Compress/bin/zipdetails 381ba2a6ae5bd21c8d2e994316e3e13f2f0a4f41 -IO-Compress cpan/IO-Compress/lib/Compress/Zlib.pm 0f93fb368d1d6af6f461b86304e8aabe0472754d -IO-Compress cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm 3acbcf5538e036a1b7907eedf038badf38254d71 -IO-Compress cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm ed1c8835f3c3cb333b1ff5d4d517695ac2569f6a -IO-Compress cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm 75a361c5032bf602cd55d2b52a9fc6dee3f966ee -IO-Compress cpan/IO-Compress/lib/IO/Compress/Base.pm 490ddf3f073a6d1a9b508a06e870709d19932d6f -IO-Compress cpan/IO-Compress/lib/IO/Compress/Base/Common.pm 46dcd7effb81737a5e3aaa322d2b7404a36666e4 -IO-Compress cpan/IO-Compress/lib/IO/Compress/Bzip2.pm 4fc4bc90f9566eeecb0b6f3fe3b59443ed838378 -IO-Compress cpan/IO-Compress/lib/IO/Compress/Deflate.pm 729f52133f69df0d4e83f1561c1a4a9b18c00753 -IO-Compress cpan/IO-Compress/lib/IO/Compress/Gzip.pm 26654883fe0e4224e1d86c8d7d8cd11d75505075 -IO-Compress cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm f8cc94ebbbf50310d7fbd9c4addf1619646e8e7a -IO-Compress cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm 19ba3e84de766613f53e29de4f76b46ed50b780c -IO-Compress cpan/IO-Compress/lib/IO/Compress/Zip.pm db0231d4dea78b8400db6ea7b65ac9ef95ead319 -IO-Compress cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm e810575fb4ef2a4a2e26ab528484061eb822f508 -IO-Compress cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm 65fe46cd7b9fdfd54bdfc4635829fb302d0d6d30 -IO-Compress cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm d80925cae9d1f26c526e898a70d6d4052749b217 -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm 784c7c313969d869a59118d327895e0b60f1decc -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm 5ed1888ebf365026460873e37c7db8bf7655b1a0 -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm f427dff7fb2cb55f7ee04adc20986cc3ae32e84c -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm c51ae0e7524891d82634309353700cc802583b7e -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm 18b7d32dfa4eee9c11bdd8a98e68bcd00040e082 -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Base.pm 821b0445d3edfa5761e7a7935cd80b2b35e22017 -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm 7dd2eaf1727fa77e184c7cb2d6513f396e57a3e8 -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm 7490524bf3714621bb3292574d0f97212f2538bd -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm c75aa1ec1f2a6138ef9ae660771fb2cac8be6931 -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm 8f30a77bcda7123300ef5a8d02c2160ebb72f013 -IO-Compress cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm 321a55011a1f11fe73b005e33942eb27fed6d046 JSON::PP cpan/JSON-PP/bin/json_pp a7b8de6c201ef177ee82624ee4ca6a47cc1a3b4f JSON::PP cpan/JSON-PP/lib/JSON/PP.pm 86f697dae482106270fdd659b18c95a54af764ba JSON::PP cpan/JSON-PP/t/011_pc_expo.t e4c896d5f06ca380ddb6b4d6cd5714ea3003ada6 -- Perl5 Master Repository
