Change 34594 by [EMAIL PROTECTED] on 2008/10/25 21:54:55
Integrate:
[ 34582]
Integrate:
[ 34573]
Upgrade to SelfLoader 1.17.
[ 34588]
Integrate:
[ 34583]
Upgrade to lib.pm 0.61.
Affected files ...
... //depot/maint-5.8/perl/lib/SelfLoader.pm#7 integrate
... //depot/maint-5.8/perl/lib/lib.t#4 integrate
... //depot/maint-5.8/perl/lib/lib_pm.PL#8 integrate
Differences ...
==== //depot/maint-5.8/perl/lib/SelfLoader.pm#7 (text) ====
Index: perl/lib/SelfLoader.pm
--- perl/lib/SelfLoader.pm#6~34287~ 2008-09-05 15:36:23.000000000 -0700
+++ perl/lib/SelfLoader.pm 2008-10-25 14:54:55.000000000 -0700
@@ -1,7 +1,7 @@
package SelfLoader;
use 5.008;
use strict;
-our $VERSION = "1.16";
+our $VERSION = "1.17";
# The following bit of eval-magic is necessary to make this work on
# perls < 5.009005.
@@ -99,9 +99,9 @@
# Protect: fork() shares the file pointer between the parent and the kid
if(sysseek($fh, tell($fh), 0)) {
open my $nfh, '<&', $fh or croak "reopen: $!";# dup() the fd
- close $fh or die "close: $1"; # autocloses, but be
paranoid
+ close $fh or die "close: $!"; # autocloses, but be
paranoid
open $fh, '<&', $nfh or croak "reopen2: $!"; # dup() the fd "back"
- close $nfh or die "close after reopen: $1"; # autocloses, but be
paranoid
+ close $nfh or die "close after reopen: $!"; # autocloses, but be
paranoid
}
$Cache{"${currpack}::<DATA"} = 1; # indicate package is cached
==== //depot/maint-5.8/perl/lib/lib.t#4 (text) ====
Index: perl/lib/lib.t
--- perl/lib/lib.t#3~34013~ 2008-06-07 08:12:43.000000000 -0700
+++ perl/lib/lib.t 2008-10-25 14:54:55.000000000 -0700
@@ -2,6 +2,7 @@
BEGIN {
chdir 't';
+ unshift @INC, '..';
unshift @INC, '../lib';
@OrigINC = @INC;
}
==== //depot/maint-5.8/perl/lib/lib_pm.PL#8 (text) ====
Index: perl/lib/lib_pm.PL
--- perl/lib/lib_pm.PL#7~34283~ 2008-09-05 14:10:58.000000000 -0700
+++ perl/lib/lib_pm.PL 2008-10-25 14:54:55.000000000 -0700
@@ -86,7 +86,7 @@
print OUT <<'!NO!SUBS!';
our @ORIG_INC = @INC; # take a handy copy of 'original' value
-our $VERSION = '0.57';
+our $VERSION = '0.61';
my $Is_MacOS = $^O eq 'MacOS';
my $Mac_FS;
if ($Is_MacOS) {
End of Patch.
