base: Update to 2.23_01

fixes for missing . in @inc (cperl or -Dfortify_inc).

Author: Reini Urban

MANIFEST

@@ -3293,7 +3293,11 @@ dist/base/t/fields-5_6_0.t	See if fields work
 dist/base/t/fields-5_8_0.t	See if fields work
 dist/base/t/fields-base.t	See if fields work
 dist/base/t/fields.t		See if fields work
+dist/base/t/incdot.t		See if base works
+dist/base/t/incmodified-vs-incdot.t	See if base works
 dist/base/t/isa.t		See if base's behaviour doesn't change
+dist/base/t/lib/BaseIncExtender.pm		Test module for base.pm
+dist/base/t/lib/BaseIncDoubleExtender.pm	Test module for base.pm
 dist/base/t/lib/Broken.pm	Test module for base.pm
 dist/base/t/lib/Dummy.pm	Test module for base.pm
 dist/base/t/lib/HasSigDie.pm	Module for testing base.pm

Porting/Maintainers.pl

@@ -236,6 +236,7 @@ package Maintainers;
     'base' => {
         'DISTRIBUTION' => 'RJBS/base-2.23.tar.gz',
         'FILES'        => q[dist/base],
+        'CUSTOMIZED'   => [ qw[ lib/base.pm ] ],
     },
 
     'bignum' => {

dist/Module-CoreList/lib/Module/CoreList.pm

@@ -13280,6 +13280,7 @@ for my $version ( sort { version_sort($a, $b) } keys %released ) {
             'Socket'                => '2.024_02',
             'YAML::XS'              => '0.71',
             'YAML::LibYAML'         => '0.71',
+            'base'                  => '2.23_01'
         },
         removed => {
         }

dist/base/Changes

@@ -1,5 +1,5 @@
 2.23
-    - no changes since 2.23
+    - no changes since 2.22_01
 
 2.22_01
     - require perl v5.8.0; tests for [perl #121196] break on 5.6.1, and

dist/base/lib/base.pm

@@ -3,9 +3,15 @@ package base;
 
 use strict 'vars';
 use vars qw($VERSION);
-$VERSION = '2.23';
+$VERSION = '2.23_01';
 $VERSION =~ tr/_//d;
 
+# simplest way to avoid indexing of the package: no package statement
+sub base::__inc_scope_guard::DESTROY {
+	my $noop = $_[0][0];
+	ref $_ and $_ == $noop and $_ = '.' for @INC;
+}
+
 # constant.pm is slow
 sub SUCCESS () { 1 }
 
@@ -91,13 +97,17 @@ sub import {
 
         next if grep $_->isa($base), ($inheritor, @bases);
 
-        # Following blocks help isolate $SIG{__DIE__} changes
+        # Following blocks help isolate $SIG{__DIE__} and @INC changes
         {
             my $sigdie;
             {
                 local $SIG{__DIE__};
                 my $fn = _module_to_filename($base);
-                eval { require $fn };
+                my $dotty = $INC[-1] eq '.' && ( $INC[-1] = sub {()} );
+                eval {
+                    my $redotty = $dotty && bless [ $dotty ], 'base::__inc_scope_guard';
+                    require $fn
+                };
                 # Only ignore "Can't locate" errors from our eval require.
                 # Other fatal errors (syntax etc) must be reported.
                 #
@@ -111,11 +121,24 @@ sub import {
                 unless (%{"$base\::"}) {
                     require Carp;
                     local $" = " ";
-                    Carp::croak(<<ERROR);
+                    my $e = <<ERROR;
 Base class package "$base" is empty.
     (Perhaps you need to 'use' the module which defines that package first,
     or make that module available in \@INC (\@INC contains: @INC).
 ERROR
+                    if ($dotty && -e $fn) {
+                        $e .= <<ERROS;
+    The file $fn does exist in the current directory.  But note
+    that base.pm, when loading a module, now ignores the current working
+    directory if it is the last entry in \@INC.  If your software worked on
+    previous versions of Perl, the best solution is to use FindBin to
+    detect the path properly and to add that path to \@INC.  As a last
+    resort, you can re-enable looking in the current working directory by
+    adding "use lib '.'" to your code.
+ERROS
+                    }
+                    $e =~ s/\n\z/)\n/;
+                    Carp::croak($e);
                 }
                 $sigdie = $SIG{__DIE__} || undef;
             }

dist/base/t/incdot.t

@@ -0,0 +1,19 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+use base ();
+
+use Test::More tests => 2;
+
+if ($INC[-1] ne '.') { push @INC, '.' }
+
+my $inc = quotemeta "@INC";
+
+eval { 'base'->import("foo") };
+like $@, qr/\@INC contains: $inc\).\)/,
+    'Error does not list final dot in @INC (or mention use lib)';
+eval { 'base'->import('t::lib::Dummy') };
+like $@, qr<\@INC contains: $inc\).\n(?x:
+           )    The file t/lib/Dummy\.pm does exist in the current direct>,
+    'special cur dir message for existing files in . that are ignored';

dist/base/t/incmodified-vs-incdot.t

@@ -0,0 +1,27 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Test::More tests => 10;  # one test is in each BaseInc* itself
+
+use lib 't/lib';
+
+# make it look like an older perl
+BEGIN { push @INC, '.' if $INC[-1] ne '.' }
+
+use base 'BaseIncExtender';
+
+BEGIN {
+    is $INC[0], 't/lib/blahblah', 'modules loaded by base can prepend entries to @INC';
+    is $INC[1], 't/lib', 'previously prepended additional @INC entry remains';
+    is $INC[-1], '.', 'dot still at end @INC after using base';
+}
+
+use base 'BaseIncDoubleExtender';
+
+BEGIN {
+    is $INC[0], 't/lib/blahdeblah', 'modules loaded by base can prepend entries to @INC';
+    is $INC[1], 't/lib/blahblah', 'previously prepended additional @INC entry remains';
+    is $INC[2], 't/lib', 'previously prepended additional @INC entry remains';
+    is $INC[-2], '.', 'dot still at previous end of @INC after using base';
+    is $INC[-1], 't/lib/on-end', 'modules loaded by base can append entries to @INC';
+}

dist/base/t/lib/BaseIncDoubleExtender.pm

@@ -0,0 +1,9 @@
+package BaseIncDoubleExtender;
+
+BEGIN { ::ok( $INC[-1] ne '.', 'no trailing dot in @INC during module load from base' ) }
+
+use lib 't/lib/blahdeblah';
+
+push @INC, 't/lib/on-end';
+
+1;

dist/base/t/lib/BaseIncExtender.pm

@@ -0,0 +1,7 @@
+package BaseIncExtender;
+
+BEGIN { ::ok( $INC[-1] ne '.', 'no trailing dot in @INC during module load from base' ) }
+
+use lib 't/lib/blahblah';
+
+1;

pod/perlcdelta.pod

@@ -237,6 +237,10 @@ Change $sv->EXTFLAGS to compflags since 5.22 for CALLREGCOMP().
 Turn off MGf_REFCOUNTED.
 global-buffer-overflow with dynamic COW strings, wrong savepvn args.
 
+=item base  2.23_01
+
+fixes for missing . in @INC (cperl or -Dfortify_inc).
+
 =back
 
 =head1 Documentation