Change 19974 by [EMAIL PROTECTED] on 2003/07/03 21:36:16
Integrate:
[ 19971]
Subject: [PATCH] t/op/magic.t on FreeBSD
From: Slaven Rezic <[EMAIL PROTECTED]>
Date: Fri, 4 Jul 2003 00:35:51 +0200 (CEST)
Message-Id: <[EMAIL PROTECTED]>
[ 19972]
Subject: [PATCH] installperl -n
From: Slaven Rezic <[EMAIL PROTECTED]>
Date: Fri, 4 Jul 2003 00:41:36 +0200 (CEST)
Message-Id: <[EMAIL PROTECTED]>
[ 19973]
Bump Time::HiRes version to 1.50.
Affected files ...
... //depot/maint-5.8/perl/ext/Time/HiRes/HiRes.pm#15 integrate
... //depot/maint-5.8/perl/installperl#8 integrate
... //depot/maint-5.8/perl/t/op/magic.t#16 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/Time/HiRes/HiRes.pm#15 (text) ====
Index: perl/ext/Time/HiRes/HiRes.pm
--- perl/ext/Time/HiRes/HiRes.pm#14~19825~ Thu Jun 19 08:12:52 2003
+++ perl/ext/Time/HiRes/HiRes.pm Thu Jul 3 14:36:16 2003
@@ -15,7 +15,7 @@
d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer
d_nanosleep);
-$VERSION = '1.49';
+$VERSION = '1.50';
$XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
==== //depot/maint-5.8/perl/installperl#8 (xtext) ====
Index: perl/installperl
--- perl/installperl#7~19653~ Sun Jun 1 00:35:55 2003
+++ perl/installperl Thu Jul 3 14:36:16 2003
@@ -213,7 +213,7 @@
# Do some quick sanity checks.
-if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
+if (!$nonono && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
$installbin || die "No installbin directory in config.sh\n";
-d $installbin || mkpath($installbin, $verbose, 0777);
==== //depot/maint-5.8/perl/t/op/magic.t#16 (xtext) ====
Index: perl/t/op/magic.t
--- perl/t/op/magic.t#15~19951~ Thu Jul 3 01:47:35 2003
+++ perl/t/op/magic.t Thu Jul 3 14:36:16 2003
@@ -292,7 +292,9 @@
my $mydollarzero = sub {
my($arg) = shift;
$0 = $arg if defined $arg;
- my $ps = `ps -o command= -p $$`;
+ # In FreeBSD the ps -o command= will cause
+ # an empty header line, grab only the last line.
+ my $ps = (`ps -o command= -p $$`)[-1];
return if $?;
chomp $ps;
printf "# 0[%s]ps[%s]\n", $0, $ps;
End of Patch.
