CPAN: skip cperl builtin prereqs

Author: Reini Urban

Porting/Maintainers.pl

@@ -364,7 +364,8 @@ package Maintainers;
                 ),
         ],
         'CUSTOMIZED'   => [
-            qw( lib/CPAN.pm lib/CPAN/FirstTime.pm lib/CPAN/Distribution.pm ),
+            qw( lib/CPAN.pm lib/CPAN/FirstTime.pm lib/CPAN/Distribution.pm 
+                lib/CPAN/Version.pm ),
         ],
     },
 

cpan/CPAN/lib/CPAN/Distribution.pm

@@ -8,7 +8,7 @@ use CPAN::InfoObj;
 use File::Path ();
 @CPAN::Distribution::ISA = qw(CPAN::InfoObj);
 use vars qw($VERSION);
-$VERSION = "2.14_01";
+$VERSION = "2.14_02"; # with cperl fixes
 
 # no prepare, because prepare is not a command on the shell command line
 # TODO: clear instance cache on reload
@@ -1292,6 +1292,7 @@ Could not determine which directory to use for looking at $dist.
         local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : "";
         $CPAN::META->set_perl5lib;
         local $ENV{MAKEFLAGS}; # protect us from outer make calls
+        local $ENV{PERL_USE_UNSAFE_INC} = 1;
 
         unless (system($shell) == 0) {
             my $code = $? >> 8;
@@ -2608,6 +2609,12 @@ sub follow_prereqs {
     my(@good_prereq_tuples);
     for my $p (@prereq_tuples) {
         # e.g. $p = ['Devel::PartialDump', 'r', 1]
+        # skip builtins without .pm
+        if ($Config::Config{usecperl}
+        and $p->[0] =~ /^(DynaLoader|XSLoader|strict|coretypes)$/) {
+            CPAN->debug("$p->[0] builtin") if $CPAN::DEBUG;
+            next;
+        }
         # promote if possible
         if ($p->[1] =~ /^(r|c)$/) {
             push @good_prereq_tuples, $p;
@@ -2622,6 +2629,7 @@ sub follow_prereqs {
             die "Panic: in follow_prereqs: reqtype[$p->[1]] seen, should never happen";
         }
     }
+    return unless @good_prereq_tuples;
     my $pretty_id = $self->pretty_id;
     my %map = (
                b => "build_requires",
@@ -3644,6 +3652,10 @@ sub _make_test_illuminate_prereqs {
                 ) {
             # lex Class::Accessor::Chained::Fast which has no $VERSION
             CPAN->debug("m[$m] have available_file[$available_file]")
+              if $CPAN::DEBUG;
+        } elsif ($Config::Config{usecperl}
+                 and $m =~ /^(DynaLoader|XSLoader|strict|coretypes)$/) {
+            CPAN->debug("m[$m] builtin available_version[$available_version]")
                 if $CPAN::DEBUG;
         } else {
             push @prereq, $m

cpan/CPAN/lib/CPAN/Version.pm

@@ -2,7 +2,7 @@ package CPAN::Version;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = "5.5003";
+$VERSION = "5.5003_01"; # strip cperl c suffices
 
 # CPAN::Version::vcmp courtesy Jost Krieger
 sub vcmp {
@@ -18,6 +18,7 @@ sub vcmp {
 
     for ($l,$r) {
         s/_//g;
+        s/c$//;
     }
     CPAN->debug("l[$l] r[$r]") if $CPAN::DEBUG;
     for ($l,$r) {

pod/perlcdelta.pod

@@ -159,6 +159,8 @@ fixed UTF-8 issues, passes now all Test-CPAN-Meta tests.
 
 =item CPAN  2.14c
 
+reapply most of our patches.
+
 =item Archive::Tar  2.10
 
 =item Cpanel::JSON::XS  3.0218

t/porting/customized.dat

@@ -1,7 +1,8 @@
 B::C cpan/B-C/t/test10 0b3ab672868ee49e8539649aad1ad8c940c4c420
 CPAN cpan/CPAN/lib/CPAN.pm 3c18561fe8a6947135c5208d968890b41e1b0dc3
-CPAN cpan/CPAN/lib/CPAN/Distribution.pm 4a09afeda1854ccdabeb8cdc900735403df32703
+CPAN cpan/CPAN/lib/CPAN/Distribution.pm 6aecd5eb65cd65fc49019a8283cf6d6131971cf5
 CPAN cpan/CPAN/lib/CPAN/FirstTime.pm bc6f59c30cf7dbb7180270d673c3b152ea93f6c2
+CPAN cpan/CPAN/lib/CPAN/Version.pm 4f70abb999f1dba524ffd66ee8ac055cd335e1b8
 CPAN::Meta cpan/CPAN-Meta/lib/CPAN/Meta.pm 5e1d1466cbdb58d00e3a94661d2871f41efc4761
 CPAN::Meta cpan/CPAN-Meta/lib/CPAN/Meta/History/Meta_1_4.pod 3a1ae20933b955b5f1e538ea35b502517a3ae391
 CPAN::Meta cpan/CPAN-Meta/lib/CPAN/Meta/Spec.pm bcee4a5a8412c8ecc90c7ec3ccbabf622de3b56c