[inseparable changes from match from perl-5.003_99 to perl-5.003_99a]

 BUILD PROCESS

Subject: AFS patches
From: Chip Salzenberg <chip@perl.com>
Files: Configure installperl

 CORE LANGUAGE CHANGES

Subject: SECURITY: Forbid glob() when tainting (-T or setuid)
From: Chip Salzenberg <chip@perl.com>
Files: pod/perlrun.pod pod/perlsec.pod pp_sys.c

Subject: SECURITY: Forbid exec() if $ENV{TERM} or $ENV{ENV} is tainted
From: Chip Salzenberg <chip@perl.com>
Files: pod/perlrun.pod pod/perlsec.pod t/op/taint.t taint.c

 CORE PORTABILITY

Subject: (NeXT|Open)Step update
Date: Wed,  7 May 97 17:47:02 -0500
From: Gerd Knops <gerti@BITart.com>
Files: Configure MANIFEST config_h.SH hints/next_3.sh hints/next_4.sh

    private-msgid: 9705072247.AA18882@BITart.com

Subject: Win32 update (consolidated patch plus three followups)
From: Gurusamy Sarathy <gsar@engin.umich.edu>
Files: EXTERN.h README.win32 lib/Sys/Hostname.pm pod/perldelta.pod win32/config.H win32/config.w32 win32/config_sh.PL win32/perllib.c win32/win32.c win32/win32.h win32/include/sys/socket.h

 DOCUMENTATION

Subject: Updates to perldelta
From: Chip Salzenberg <chip@perl.com>
Files: pod/perldelta.pod

Subject: Document 'Possible attempt to separate words with commas'
Date: 06 May 1997 23:27:55 +0200
From: Gisle Aas <gisle@aas.no>
Files: pod/perlop.pod
Msg-ID: hyb9snvdw.fsf@bergen.sn.no

    (applied based on p5p patch as commit 18270fd3b8aafde2f9ea21ea13adde95ef24b149)

Subject: Document that C<m?x?> is just like C<?x?>
From: Chip Salzenberg <chip@perl.com>
Files: pod/perlop.pod

 OTHER CORE CHANGES

Subject: Fix for redefined sort subs nastiness
Date: Thu, 08 May 1997 20:04:18 -0400
From: Gurusamy Sarathy <gsar@engin.umich.edu>
Files: op.c pod/perldelta.pod pod/perldiag.pod sv.c t/op/sort.t
Msg-ID: 199705090004.UAA15032@aatma.engin.umich.edu

    (applied based on p5p patch as commit e9e069932a0db06904b29e2b09a435afd40ed35c)

2 files changed, 201 insertions, 171 deletions

diff --git a/t/op/sort.t b/t/op/sort.t
index 44c7c04185..c792bbb48e 100755
--- a/t/op/sort.t
+++ b/t/op/sort.t
@@ -2,7 +2,7 @@
 
 # $RCSfile: sort.t,v $$Revision: 4.1 $$Date: 92/08/07 18:28:24 $
 
-print "1..14\n";
+print "1..19\n";
 
 sub backwards { $a lt $b ? 1 : $a gt $b ? -1 : 0 }
 
@@ -66,3 +66,28 @@ print "# x = '@b'\n";
 @b = sort reverse (4,1,3,2);
 print ("@b" eq '1 2 3 4' ? "ok 14\n" : "not ok 14\n");
 print "# x = '@b'\n";
+
+$^W = 0;
+# redefining sort sub inside the sort sub should fail
+sub twoface { *twoface = sub { $a <=> $b }; &twoface }
+eval { @b = sort twoface 4,1,3,2 };
+print ($@ =~ /redefine active sort/ ? "ok 15\n" : "not ok 15\n");
+
+# redefining sort subs outside the sort should not fail
+eval { *twoface = sub { &backwards } };
+print $@ ? "not ok 16\n" : "ok 16\n";
+
+eval { @b = sort twoface 4,1,3,2 };
+print ("@b" eq '4 3 2 1' ? "ok 17\n" : "not ok 17 |@b|\n");
+
+*twoface = sub { *twoface = *backwards; $a <=> $b };
+eval { @b = sort twoface 4,1 };
+print ($@ =~ /redefine active sort/ ? "ok 18\n" : "not ok 18\n");
+
+*twoface = sub {
+                 eval 'sub twoface { $a <=> $b }';
+		 die($@ =~ /redefine active sort/ ? "ok 19\n" : "not ok 19\n");
+		 $a <=> $b;
+	       };
+eval { @b = sort twoface 4,1 };
+print $@ ? "$@" : "not ok 19\n";
diff --git a/t/op/taint.t b/t/op/taint.t
index 8639fd60f5..a33edde0eb 100755
--- a/t/op/taint.t
+++ b/t/op/taint.t
@@ -19,15 +19,18 @@ my $Is_VMS = $^O eq 'VMS';
 my $Is_MSWin32 = $^O eq 'MSWin32';
 my $Invoke_Perl = $Is_VMS ? 'MCR Sys$Disk:[]Perl.' :
                   $Is_MSWin32 ? '.\perl' : './perl';
+my @MoreEnv = qw/IFS ENV CDPATH TERM/;
+
 if ($Is_VMS) {
-    my ($olddcl) = $ENV{'DCL$PATH'} =~ /^(.*)$/;
-    my ($oldifs) = $ENV{IFS} =~ /^(.*)$/;
+    my (%old, $x);
+    for $x ('DCL$PATH', @MoreEnv) {
+	($old{$x}) = $ENV{$x} =~ /^(.*)$/ if exists $ENV{$x};
+    }
     eval <<EndOfCleanup;
 	END {
 	    \$ENV{PATH} = '';
 	    warn "# Note: logical name 'PATH' may have been deleted\n";
-	    \$ENV{IFS} =  \$oldifs;
-	    \$ENV{'DCL\$PATH'} = \$olddcl;
+	    @ENV{keys %old} = values %old;
 	}
 EndOfCleanup
 }
@@ -79,7 +82,7 @@ print PROG 'print "@ARGV\n"', "\n";
 close PROG;
 my $echo = "$Invoke_Perl $ECHO";
 
-print "1..136\n";
+print "1..132\n";
 
 # First, let's make sure that Perl is checking the dangerous
 # environment variables. Maybe they aren't set yet, so we'll
@@ -87,21 +90,29 @@ print "1..136\n";
 {
     $ENV{'DCL$PATH'} = '' if $Is_VMS;
 
+    $ENV{PATH} = '';
+    delete $ENV{IFS};
+    delete $ENV{ENV};
+    delete $ENV{CDPATH};
+    $ENV{TERM} = 'dumb';
+
+    test 1, eval { `$echo 1` } eq "1\n";
+
     if ($Is_MSWin32) {
-	print "# PATH/IFS tainting tests skipped\n";
-	for (1..4) { print "ok $_\n" }
+	print "# Environment tainting tests skipped\n";
+	for (2) { print "ok $_\n" }
     }
     else {
-	$ENV{PATH} = $TAINT;
-	$ENV{IFS} = " \t\n";
-	test 1, eval { `$echo 1` } eq '';
-	test 2, $@ =~ /^Insecure \$ENV{PATH}/, $@;
-
-	$ENV{PATH} = '';
-	$ENV{IFS} = $TAINT;
-	test 3, eval { `$echo 1` } eq '';
-	test 4, $@ =~ /^Insecure \$ENV{IFS}/, $@;
+	my @vars = ('PATH', @MoreEnv);
+	while (my $v = $vars[0]) {
+	    local $ENV{$v} = $TAINT;
+	    last if eval { `$echo 1` };
+	    last unless $@ =~ /^Insecure \$ENV{$v}/;
+	    shift @vars;
+	}
+	test 2, !@vars, "\$$vars[0]";
     }
+
     my $tmp;
     if ($^O eq 'os2' || $^O eq 'amigaos' || $Is_MSWin32) {
 	print "# all directories are writeable\n";
@@ -114,75 +125,69 @@ print "1..136\n";
     }
 
     if ($tmp) {
-	$ENV{PATH} = $tmp;
-	$ENV{IFS} = " \t\n";
-	test 5, eval { `$echo 1` } eq '';
-	test 6, $@ =~ /^Insecure directory in \$ENV{PATH}/, $@;
+	local $ENV{PATH} = $tmp;
+	test 3, eval { `$echo 1` } eq '';
+	test 4, $@ =~ /^Insecure directory in \$ENV{PATH}/, $@;
     }
     else {
-	for (5..6) { print "ok $_\n" }
+	for (3..4) { print "ok $_\n" }
     }
 
-    $ENV{PATH} = '';
-    $ENV{IFS} = " \t\n";
-    test 7, eval { `$echo 1` } eq "1\n";
-    test 8, $@ eq '', $@;
-
     if ($Is_VMS) {
 	$ENV{'DCL$PATH'} = $TAINT;
-	test 9,  eval { `$echo 1` } eq '';
-	test 10, $@ =~ /^Insecure \$ENV{DCL\$PATH}/, $@;
+	test 5,  eval { `$echo 1` } eq '';
+	test 6, $@ =~ /^Insecure \$ENV{DCL\$PATH}/, $@;
 	if ($tmp) {
 	    $ENV{'DCL$PATH'} = $tmp;
-	    test 11, eval { `$echo 1` } eq '';
-	    test 12, $@ =~ /^Insecure directory in \$ENV{DCL\$PATH}/, $@;
+	    test 7, eval { `$echo 1` } eq '';
+	    test 8, $@ =~ /^Insecure directory in \$ENV{DCL\$PATH}/, $@;
 	}
 	else {
 	    print "# can't find world-writeable directory to test DCL\$PATH\n";
-	    for (11..12) { print "ok $_\n" }
+	    for (7..8) { print "ok $_\n" }
 	}
 	$ENV{'DCL$PATH'} = '';
     }
     else {
 	print "# This is not VMS\n";
-	for (9..12) { print "ok $_\n"; }
+	for (5..8) { print "ok $_\n"; }
     }
 }
 
 # Let's see that we can taint and untaint as needed.
 {
     my $foo = $TAINT;
-    test 13, tainted $foo;
+    test 9, tainted $foo;
 
     # That was a sanity check. If it failed, stop the insanity!
     die "Taint checks don't seem to be enabled" unless tainted $foo;
 
     $foo = "foo";
-    test 14, not tainted $foo;
+    test 10, not tainted $foo;
 
     taint_these($foo);
-    test 15, tainted $foo;
+    test 11, tainted $foo;
 
     my @list = 1..10;
-    test 16, not any_tainted @list;
+    test 12, not any_tainted @list;
     taint_these @list[1,3,5,7,9];
-    test 17, any_tainted @list;
-    test 18, all_tainted @list[1,3,5,7,9];
-    test 19, not any_tainted @list[0,2,4,6,8];
+    test 13, any_tainted @list;
+    test 14, all_tainted @list[1,3,5,7,9];
+    test 15, not any_tainted @list[0,2,4,6,8];
 
     ($foo) = $foo =~ /(.+)/;
-    test 20, not tainted $foo;
+    test 16, not tainted $foo;
 
     $foo = $1 if ('bar' . $TAINT) =~ /(.+)/;
-    test 21, not tainted $foo;
-    test 22, $foo eq 'bar';
+    test 17, not tainted $foo;
+    test 18, $foo eq 'bar';
 
     my $pi = 4 * atan2(1,1) + $TAINT0;
-    test 23, tainted $pi;
+    test 19, tainted $pi;
 
     ($pi) = $pi =~ /(\d+\.\d+)/;
-    test 24, not tainted $pi;
-    test 25, sprintf("%.5f", $pi) eq '3.14159';
+    test 20, not tainted $pi;
+    test 21, sprintf("%.5f", $pi) eq '3.14159';
 }
 
 # How about command-line arguments? The problem is that we don't
@@ -198,150 +203,150 @@ print "1..136\n";
     };
     close PROG;
     print `$Invoke_Perl "-T" $arg and some suspect arguments`;
-    test 26, !$?, "Exited with status $?";
+    test 22, !$?, "Exited with status $?";
     unlink $arg;
 }
 
 # Reading from a file should be tainted
 {
     my $file = './TEST';
-    test 27, open(FILE, $file), "Couldn't open '$file': $!";
+    test 23, open(FILE, $file), "Couldn't open '$file': $!";
 
     my $block;
     sysread(FILE, $block, 100);
     my $line = <FILE>;
     close FILE;
-    test 28, tainted $block;
-    test 29, tainted $line;
+    test 24, tainted $block;
+    test 25, tainted $line;
 }
 
-# Globs should be tainted.
+# Globs should be forbidden.
 {
     # Some glob implementations need to spawn system programs.
     local $ENV{PATH} = '';
     $ENV{PATH} = (-l '/bin' ? '' : '/bin:') . '/usr/bin' unless $Is_VMS;
 
-    my @globs = <*>;
-    test 30, all_tainted @globs;
+    my @globs = eval { <*> };
+    test 26, @globs == 0 && $@ =~ /^Insecure dependency/;
 
-    @globs = glob '*';
-    test 31, all_tainted @globs;
+    @globs = eval { glob '*' };
+    test 27, @globs == 0 && $@ =~ /^Insecure dependency/;
 }
 
 # Output of commands should be tainted
 {
     my $foo = `$echo abc`;
-    test 32, tainted $foo;
+    test 28, tainted $foo;
 }
 
 # Certain system variables should be tainted
 {
-    test 33, all_tainted $^X, $0;
+    test 29, all_tainted $^X, $0;
 }
 
 # Results of matching should all be untainted
 {
     my $foo = "abcdefghi" . $TAINT;
-    test 34, tainted $foo;
+    test 30, tainted $foo;
 
     $foo =~ /def/;
-    test 35, not any_tainted $`, $&, $';
+    test 31, not any_tainted $`, $&, $';
 
     $foo =~ /(...)(...)(...)/;
-    test 36, not any_tainted $1, $2, $3, $+;
+    test 32, not any_tainted $1, $2, $3, $+;
 
     my @bar = $foo =~ /(...)(...)(...)/;
-    test 37, not any_tainted @bar;
+    test 33, not any_tainted @bar;
 
-    test 38, tainted $foo;	# $foo should still be tainted!
-    test 39, $foo eq "abcdefghi";
+    test 34, tainted $foo;	# $foo should still be tainted!
+    test 35, $foo eq "abcdefghi";
 }
 
 # Operations which affect files can't use tainted data.
 {
-    test 40, eval { chmod 0, $TAINT } eq '', 'chmod';
-    test 41, $@ =~ /^Insecure dependency/, $@;
+    test 36, eval { chmod 0, $TAINT } eq '', 'chmod';
+    test 37, $@ =~ /^Insecure dependency/, $@;
 
     # There is no feature test in $Config{} for truncate,
     #   so we allow for the possibility that it's missing.
-    test 42, eval { truncate 'NoSuChFiLe', $TAINT0 } eq '', 'truncate';
-    test 43, $@ =~ /^(?:Insecure dependency|truncate not implemented)/, $@;
+    test 38, eval { truncate 'NoSuChFiLe', $TAINT0 } eq '', 'truncate';
+    test 39, $@ =~ /^(?:Insecure dependency|truncate not implemented)/, $@;
 
-    test 44, eval { rename '', $TAINT } eq '', 'rename';
-    test 45, $@ =~ /^Insecure dependency/, $@;
+    test 40, eval { rename '', $TAINT } eq '', 'rename';
+    test 41, $@ =~ /^Insecure dependency/, $@;
 
-    test 46, eval { unlink $TAINT } eq '', 'unlink';
-    test 47, $@ =~ /^Insecure dependency/, $@;
+    test 42, eval { unlink $TAINT } eq '', 'unlink';
+    test 43, $@ =~ /^Insecure dependency/, $@;
 
-    test 48, eval { utime $TAINT } eq '', 'utime';
-    test 49, $@ =~ /^Insecure dependency/, $@;
+    test 44, eval { utime $TAINT } eq '', 'utime';
+    test 45, $@ =~ /^Insecure dependency/, $@;
 
     if ($Config{d_chown}) {
-	test 50, eval { chown -1, -1, $TAINT } eq '', 'chown';
-	test 51, $@ =~ /^Insecure dependency/, $@;
+	test 46, eval { chown -1, -1, $TAINT } eq '', 'chown';
+	test 47, $@ =~ /^Insecure dependency/, $@;
     }
     else {
 	print "# chown() is not available\n";
-	for (50..51) { print "ok $_\n" }
+	for (46..47) { print "ok $_\n" }
     }
 
     if ($Config{d_link}) {
-	test 52, eval { link $TAINT, '' } eq '', 'link';
-	test 53, $@ =~ /^Insecure dependency/, $@;
+	test 48, eval { link $TAINT, '' } eq '', 'link';
+	test 49, $@ =~ /^Insecure dependency/, $@;
     }
     else {
 	print "# link() is not available\n";
-	for (52..53) { print "ok $_\n" }
+	for (48..49) { print "ok $_\n" }
     }
 
     if ($Config{d_symlink}) {
-	test 54, eval { symlink $TAINT, '' } eq '', 'symlink';
-	test 55, $@ =~ /^Insecure dependency/, $@;
+	test 50, eval { symlink $TAINT, '' } eq '', 'symlink';
+	test 51, $@ =~ /^Insecure dependency/, $@;
     }
     else {
 	print "# symlink() is not available\n";
-	for (54..55) { print "ok $_\n" }
+	for (50..51) { print "ok $_\n" }
     }
 }
 
 # Operations which affect directories can't use tainted data.
 {
-    test 56, eval { mkdir $TAINT0, $TAINT } eq '', 'mkdir';
-    test 57, $@ =~ /^Insecure dependency/, $@;
+    test 52, eval { mkdir $TAINT0, $TAINT } eq '', 'mkdir';
+    test 53, $@ =~ /^Insecure dependency/, $@;
 
-    test 58, eval { rmdir $TAINT } eq '', 'rmdir';
-    test 59, $@ =~ /^Insecure dependency/, $@;
+    test 54, eval { rmdir $TAINT } eq '', 'rmdir';
+    test 55, $@ =~ /^Insecure dependency/, $@;
 
-    test 60, eval { chdir $TAINT } eq '', 'chdir';
-    test 61, $@ =~ /^Insecure dependency/, $@;
+    test 56, eval { chdir $TAINT } eq '', 'chdir';
+    test 57, $@ =~ /^Insecure dependency/, $@;
 
     if ($Config{d_chroot}) {
-	test 62, eval { chroot $TAINT } eq '', 'chroot';
-	test 63, $@ =~ /^Insecure dependency/, $@;
+	test 58, eval { chroot $TAINT } eq '', 'chroot';
+	test 59, $@ =~ /^Insecure dependency/, $@;
     }
     else {
 	print "# chroot() is not available\n";
-	for (62..63) { print "ok $_\n" }
+	for (58..59) { print "ok $_\n" }
     }
 }
 
 # Some operations using files can't use tainted data.
 {
     my $foo = "imaginary library" . $TAINT;
-    test 64, eval { require $foo } eq '', 'require';
-    test 65, $@ =~ /^Insecure dependency/, $@;
+    test 60, eval { require $foo } eq '', 'require';
+    test 61, $@ =~ /^Insecure dependency/, $@;
 
     my $filename = "./taintB$$";	# NB: $filename isn't tainted!
     END { unlink $filename if defined $filename }
     $foo = $filename . $TAINT;
     unlink $filename;	# in any case
 
-    test 66, eval { open FOO, $foo } eq '', 'open for read';
-    test 67, $@ eq '', $@;		# NB: This should be allowed
-    test 68, $! == 2;			# File not found
+    test 62, eval { open FOO, $foo } eq '', 'open for read';
+    test 63, $@ eq '', $@;		# NB: This should be allowed
+    test 64, $! == 2;			# File not found
 
-    test 69, eval { open FOO, "> $foo" } eq '', 'open for write';
-    test 70, $@ =~ /^Insecure dependency/, $@;
+    test 65, eval { open FOO, "> $foo" } eq '', 'open for write';
+    test 66, $@ =~ /^Insecure dependency/, $@;
 }
 
 # Commands to the system can't use tainted data
@@ -350,71 +355,71 @@ print "1..136\n";
 
     if ($^O eq 'amigaos') {
 	print "# open(\"|\") is not available\n";
-	for (71..74) { print "ok $_\n" }
+	for (67..70) { print "ok $_\n" }
     }
     else {
-	test 71, eval { open FOO, "| $foo" } eq '', 'popen to';
-	test 72, $@ =~ /^Insecure dependency/, $@;
+	test 67, eval { open FOO, "| $foo" } eq '', 'popen to';
+	test 68, $@ =~ /^Insecure dependency/, $@;
 
-	test 73, eval { open FOO, "$foo |" } eq '', 'popen from';
-	test 74, $@ =~ /^Insecure dependency/, $@;
+	test 69, eval { open FOO, "$foo |" } eq '', 'popen from';
+	test 70, $@ =~ /^Insecure dependency/, $@;
     }
 
-    test 75, eval { exec $TAINT } eq '', 'exec';
-    test 76, $@ =~ /^Insecure dependency/, $@;
+    test 71, eval { exec $TAINT } eq '', 'exec';
+    test 72, $@ =~ /^Insecure dependency/, $@;
 
-    test 77, eval { system $TAINT } eq '', 'system';
-    test 78, $@ =~ /^Insecure dependency/, $@;
+    test 73, eval { system $TAINT } eq '', 'system';
+    test 74, $@ =~ /^Insecure dependency/, $@;
 
     $foo = "*";
     taint_these $foo;
 
-    test 79, eval { `$echo 1$foo` } eq '', 'backticks';
-    test 80, $@ =~ /^Insecure dependency/, $@;
+    test 75, eval { `$echo 1$foo` } eq '', 'backticks';
+    test 76, $@ =~ /^Insecure dependency/, $@;
 
     if ($Is_VMS) { # wildcard expansion doesn't invoke shell, so is safe
-	test 81, join('', eval { glob $foo } ) ne '', 'globbing';
-	test 82, $@ eq '', $@;
+	test 77, join('', eval { glob $foo } ) ne '', 'globbing';
+	test 78, $@ eq '', $@;
     }
     else {
-	test 81, join('', eval { glob $foo } ) eq '', 'globbing';
-	test 82, $@ =~ /^Insecure dependency/, $@;
+	test 77, join('', eval { glob $foo } ) eq '', 'globbing';
+	test 78, $@ =~ /^Insecure dependency/, $@;
     }
 }
 
 # Operations which affect processes can't use tainted data.
 {
-    test 83, eval { kill 0, $TAINT } eq '', 'kill';
-    test 84, $@ =~ /^Insecure dependency/, $@;
+    test 79, eval { kill 0, $TAINT } eq '', 'kill';
+    test 80, $@ =~ /^Insecure dependency/, $@;
 
     if ($Config{d_setpgrp}) {
-	test 85, eval { setpgrp 0, $TAINT } eq '', 'setpgrp';
-	test 86, $@ =~ /^Insecure dependency/, $@;
+	test 81, eval { setpgrp 0, $TAINT } eq '', 'setpgrp';
+	test 82, $@ =~ /^Insecure dependency/, $@;
     }
     else {
 	print "# setpgrp() is not available\n";
-	for (85..86) { print "ok $_\n" }
+	for (81..82) { print "ok $_\n" }
     }
 
     if ($Config{d_setprior}) {
-	test 87, eval { setpriority 0, $TAINT, $TAINT } eq '', 'setpriority';
-	test 88, $@ =~ /^Insecure dependency/, $@;
+	test 83, eval { setpriority 0, $TAINT, $TAINT } eq '', 'setpriority';
+	test 84, $@ =~ /^Insecure dependency/, $@;
     }
     else {
 	print "# setpriority() is not available\n";
-	for (87..88) { print "ok $_\n" }
+	for (83..84) { print "ok $_\n" }
     }
 }
 
 # Some miscellaneous operations can't use tainted data.
 {
     if ($Config{d_syscall}) {
-	test 89, eval { syscall $TAINT } eq '', 'syscall';
-	test 90, $@ =~ /^Insecure dependency/, $@;
+	test 85, eval { syscall $TAINT } eq '', 'syscall';
+	test 86, $@ =~ /^Insecure dependency/, $@;
     }
     else {
 	print "# syscall() is not available\n";
-	for (89..90) { print "ok $_\n" }
+	for (85..86) { print "ok $_\n" }
     }
 
     {
@@ -423,18 +428,18 @@ print "1..136\n";
 	local *FOO;
 	my $temp = "./taintC$$";
 	END { unlink $temp }
-	test 91, open(FOO, "> $temp"), "Couldn't open $temp for write: $!";
+	test 87, open(FOO, "> $temp"), "Couldn't open $temp for write: $!";
 
-	test 92, eval { ioctl FOO, $TAINT, $foo } eq '', 'ioctl';
-	test 93, $@ =~ /^Insecure dependency/, $@;
+	test 88, eval { ioctl FOO, $TAINT, $foo } eq '', 'ioctl';
+	test 89, $@ =~ /^Insecure dependency/, $@;
 
 	if ($Config{d_fcntl}) {
-	    test 94, eval { fcntl FOO, $TAINT, $foo } eq '', 'fcntl';
-	    test 95, $@ =~ /^Insecure dependency/, $@;
+	    test 90, eval { fcntl FOO, $TAINT, $foo } eq '', 'fcntl';
+	    test 91, $@ =~ /^Insecure dependency/, $@;
 	}
 	else {
 	    print "# fcntl() is not available\n";
-	    for (94..95) { print "ok $_\n" }
+	    for (90..91) { print "ok $_\n" }
 	}
 
 	close FOO;
@@ -445,63 +450,63 @@ print "1..136\n";
 {
     my $foo = 'abc' . $TAINT;
     my $fooref = \$foo;
-    test 96, not tainted $fooref;
-    test 97, tainted $$fooref;
-    test 98, tainted $foo;
+    test 92, not tainted $fooref;
+    test 93, tainted $$fooref;
+    test 94, tainted $foo;
 }
 
 # Some tests involving assignment
 {
     my $foo = $TAINT0;
     my $bar = $foo;
-    test 99, all_tainted $foo, $bar;
-    test 100, tainted($foo = $bar);
-    test 101, tainted($bar = $bar);
-    test 102, tainted($bar += $bar);
-    test 103, tainted($bar -= $bar);
-    test 104, tainted($bar *= $bar);
-    test 105, tainted($bar++);
-    test 106, tainted($bar /= $bar);
-    test 107, tainted($bar += 0);
-    test 108, tainted($bar -= 2);
-    test 109, tainted($bar *= -1);
-    test 110, tainted($bar /= 1);
-    test 111, tainted($bar--);
-    test 112, $bar == 0;
+    test 95, all_tainted $foo, $bar;
+    test 96, tainted($foo = $bar);
+    test 97, tainted($bar = $bar);
+    test 98, tainted($bar += $bar);
+    test 99, tainted($bar -= $bar);
+    test 100, tainted($bar *= $bar);
+    test 101, tainted($bar++);
+    test 102, tainted($bar /= $bar);
+    test 103, tainted($bar += 0);
+    test 104, tainted($bar -= 2);
+    test 105, tainted($bar *= -1);
+    test 106, tainted($bar /= 1);
+    test 107, tainted($bar--);
+    test 108, $bar == 0;
 }
 
 # Test assignment and return of lists
 {
     my @foo = ("A", "tainted" . $TAINT, "B");
-    test 113, not tainted $foo[0];
-    test 114,     tainted $foo[1];
-    test 115, not tainted $foo[2];
+    test 109, not tainted $foo[0];
+    test 110,     tainted $foo[1];
+    test 111, not tainted $foo[2];
     my @bar = @foo;
-    test 116, not tainted $bar[0];
-    test 117,     tainted $bar[1];
-    test 118, not tainted $bar[2];
+    test 112, not tainted $bar[0];
+    test 113,     tainted $bar[1];
+    test 114, not tainted $bar[2];
     my @baz = eval { "A", "tainted" . $TAINT, "B" };
-    test 119, not tainted $baz[0];
-    test 120,     tainted $baz[1];
-    test 121, not tainted $baz[2];
+    test 115, not tainted $baz[0];
+    test 116,     tainted $baz[1];
+    test 117, not tainted $baz[2];
     my @plugh = eval q[ "A", "tainted" . $TAINT, "B" ];
-    test 122, not tainted $plugh[0];
-    test 123,     tainted $plugh[1];
-    test 124, not tainted $plugh[2];
+    test 118, not tainted $plugh[0];
+    test 119,     tainted $plugh[1];
+    test 120, not tainted $plugh[2];
     my $nautilus = sub { "A", "tainted" . $TAINT, "B" };
-    test 125, not tainted ((&$nautilus)[0]);
-    test 126,     tainted ((&$nautilus)[1]);
-    test 127, not tainted ((&$nautilus)[2]);
+    test 121, not tainted ((&$nautilus)[0]);
+    test 122,     tainted ((&$nautilus)[1]);
+    test 123, not tainted ((&$nautilus)[2]);
     my @xyzzy = &$nautilus;
-    test 128, not tainted $xyzzy[0];
-    test 129,     tainted $xyzzy[1];
-    test 130, not tainted $xyzzy[2];
+    test 124, not tainted $xyzzy[0];
+    test 125,     tainted $xyzzy[1];
+    test 126, not tainted $xyzzy[2];
     my $red_october = sub { return "A", "tainted" . $TAINT, "B" };
-    test 131, not tainted ((&$red_october)[0]);
-    test 132,     tainted ((&$red_october)[1]);
-    test 133, not tainted ((&$red_october)[2]);
+    test 127, not tainted ((&$red_october)[0]);
+    test 128,     tainted ((&$red_october)[1]);
+    test 129, not tainted ((&$red_october)[2]);
     my @corge = &$red_october;
-    test 134, not tainted $corge[0];
-    test 135,     tainted $corge[1];
-    test 136, not tainted $corge[2];
+    test 130, not tainted $corge[0];
+    test 131,     tainted $corge[1];
+    test 132, not tainted $corge[2];
 }