Rename 5.40.1 config files for 5.40.2

There will be no 5.40.1 release.  5.40.2 is a security update.

The pp file includes some tweaking to get modules to build.
Some of these need to be revisited.

Author: shawnlaffan

devel.utils/_build-5.40.1_local_ucrt.bat devel.utils/_build-5.40.2_local_ucrt.batdevel.utils/_build-5.40.1_local_ucrt.bat renamed to devel.utils/_build-5.40.2_local_ucrt.bat

@@ -12,7 +12,7 @@ set PERLEXE=%SP%\perl\bin\perl
 :: update blib - requires Build.PL to have been run
 call ..\build.bat test
 
-set MAKEFLAGS=-j12
+::set MAKEFLAGS=-j12
 set TEST_JOBS=8
 
 :: tests take a long time
@@ -21,6 +21,6 @@ set TEST_CORE=-notest_core
 
 ::set SKIP_MSI_STEP=1
 ::set SKIP_PDL_STEP=1
-%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.40.1.1.pp %TEST_CORE% -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
+%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.40.2.1.pp %TEST_CORE% -beta=1 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
 
 

share/64bit-5.40.1.1.pp share/64bit-5.40.2.1.ppshare/64bit-5.40.1.1.pp renamed to share/64bit-5.40.2.1.pp

@@ -8,7 +8,7 @@
 # <image_dir>     is placeholder for c:\strawberry
 
 {
-  app_version     => '5.40.1.1', #BEWARE: do not use '.0.0' in the last two version digits
+  app_version     => '5.40.2.1', #BEWARE: do not use '.0.0' in the last two version digits
   bits            => 64,
   beta            => 0,
   app_fullname    => 'Strawberry Perl (64-bit)',
@@ -77,7 +77,7 @@
     ### NEXT STEP ###########################
     {
         plugin     => 'Perl::Dist::Strawberry::Step::InstallPerlCore',
-        url        => 'https://www.cpan.org/src/5.0/perl-5.40.1.tar.gz',
+        url        => 'https://www.cpan.org/src/5.0/perl-5.40.2.tar.gz',
         cf_email   => 'strawberry-perl@project', #IMPORTANT: keep 'strawberry-perl' before @
         perl_debug => 0,    # can be overridden by --perl_debug=N option
         perl_64bitint => 1, # ignored on 64bit, can be overridden by --perl_64bitint | --noperl_64bitint option
@@ -90,7 +90,8 @@
             '<dist_sharedir>/msi/files/perlexe.ico'             => 'win32/perlexe.ico',
             '<dist_sharedir>/perl-5.36/perlexe.rc.tt'           => 'win32/perlexe.rc',
             '<dist_sharedir>/perl-5.40/posix_bessel.patch'      => '*',
-            #'<dist_sharedir>/perl-5.40/GNUmakefile_5401'      => 'win32/GNUmakefile',
+            '<dist_sharedir>/perl-5.40/gh23179_no_delta.patch'  => '*',
+            '<dist_sharedir>/perl-5.40/scope_types.h'           => 'scope_types.h',
             'config_H.gc'                                 => {
                 I_DBM  => 'define',
                 I_GDBM => 'define',
@@ -174,14 +175,17 @@
               env => {MAKEFLAGS => '', TEST_JOBS => '' },
             },
 
+            { module=>'Socket',  ignore_uptodate => 1 },  #  reinstall: https://github.com/StrawberryPerl/Perl-Dist-Strawberry/issues/221
+
             #removed from core in 5.20
             qw/ Module::Build /,
             { module=>'B::Lint',  ignore_testfailure=>1 }, #XXX-TODO https://rt.cpan.org/Public/Bug/Display.html?id=101115 #XXX-FAIL-5.32.1
             { module=>'Archive::Extract',  ignore_testfailure=>1 }, #XXX-TODO-5.28/64bit
             { module=>'CPANPLUS', env=>{ 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/40_CPANPLUS-Internals-Report.t' } },
             #XXX-TODO https://rt.cpan.org/Public/Bug/Display.html?id=116479
             qw/ CPANPLUS::Dist::Build /,
-            qw/ File::CheckTree Log::Message Module::Pluggable Object::Accessor Text::Soundex Term::UI Tree::DAG_Node /,
+            qw/ File::CheckTree Log::Message Module::Pluggable Object::Accessor Text::Soundex Term::UI /,
+            'https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.32.tgz',  #  1.33 fails UTF8 tests
 
             #  https://github.com/StrawberryPerl/Perl-Dist-Strawberry/issues/92
             { module => 'https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/dev_20230318/Pod-Parser-1.65_01.tar.gz' },
@@ -191,7 +195,11 @@
             qw/ JSON Cpanel::JSON::XS JSON::XS JSON::MaybeXS YAML YAML::Tiny YAML::XS /,
 
             # pkg-config related
-            { module=>'PkgConfig', makefilepl_param=>'--script=pkg-config' },
+            #  current version fails some symlink related tests
+            { module           => 'PkgConfig', 
+              makefilepl_param => '--script=pkg-config', 
+              env              => {'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/01-script_detailed.t'} 
+            },
             'ExtUtils::PkgConfig',
 
         ]
@@ -215,7 +223,8 @@
 			# qw/ Win32::Console::ANSI /,  # disable for now - fails tests under UCRT 5.39.10 - but patched now
             { 
               module => 'https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/patched_cpan_modules/Win32-Console-ANSI-1.11_001.tar.gz',
-              env    => { 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/04_DisplayEdition.t' } 
+              env    => { 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/04_DisplayEdition.t t/06_Func.t' } 
+              # 06_Func test fails new in 5.40.2, as-yet undiagnosed
             },
             { module => 'Win32-Clipboard', ignore_testfailure=>1 },  #  inconsistent failures of tests 7 & 9
             { module=>'<package_url>/kmx/perl-modules-patched/Win32-SerialPort-0.22_patched.tar.gz', skiptest=>1 },