[packages/perl.git] / perl-5.8.7-CAN-2004-0976.patch

--- perl-5.8.7/utils/c2ph.PL.CAN-2004-0976	2004-10-19 15:45:42.000000000 -0400
+++ perl-5.8.7/utils/c2ph.PL	2005-11-08 12:53:30.000000000 -0500
@@ -1320,7 +1320,7 @@
 	$intrinsics{$_[1]} = $template{$_[0]};
     }
     close(PIPE) || die "couldn't read intrinsics!";
-    unlink($TMP, '$SAFEDIR/a.out');
+    unlink($TMP, "$SAFEDIR/a.out");
     print STDERR "done\n" if $trace;
 }
 
--- perl-5.8.7/lib/Memoize/t/tie_storable.t.CAN-2004-0976	2002-07-12 15:56:19.000000000 -0400
+++ perl-5.8.7/lib/Memoize/t/tie_storable.t	2005-11-08 13:06:13.000000000 -0500
@@ -33,14 +33,7 @@
 
 print "1..4\n";
 
-
-if (eval {require File::Spec::Functions}) {
- File::Spec::Functions->import();
-} else {
-  *catfile = sub { join '/', @_ };
-}
-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
-$file = catfile($tmpdir, "storable$$");
+$file = "storable$$";
 1 while unlink $file;
 tryout('Memoize::Storable', $file, 1);  # Test 1..4
 1 while unlink $file;
--- perl-5.8.7/lib/Memoize/t/tie_ndbm.t.CAN-2004-0976	2005-04-22 07:36:58.000000000 -0400
+++ perl-5.8.7/lib/Memoize/t/tie_ndbm.t	2005-11-08 13:04:45.000000000 -0500
@@ -28,14 +28,7 @@
 
 print "1..4\n";
 
-
-if (eval {require File::Spec::Functions}) {
- File::Spec::Functions->import();
-} else {
-  *catfile = sub { join '/', @_ };
-}
-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
-$file = catfile($tmpdir, "md$$");
+$file = "md$$";
 1 while unlink $file, "$file.dir", "$file.pag", "$file.db";
 tryout('Memoize::NDBM_File', $file, 1);  # Test 1..4
 1 while unlink $file, "$file.dir", "$file.pag", "$file.db";
--- perl-5.8.7/lib/Memoize/t/tie.t.CAN-2004-0976	2002-07-12 15:56:19.000000000 -0400
+++ perl-5.8.7/lib/Memoize/t/tie.t	2005-11-08 13:03:20.000000000 -0500
@@ -29,14 +29,7 @@
   $_[0]+1;
 }
 
-if (eval {require File::Spec::Functions}) {
-  File::Spec::Functions->import('tmpdir', 'catfile');
-  $tmpdir = tmpdir();
-} else {
-  *catfile = sub { join '/', @_ };
-  $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp';
-}
-$file = catfile($tmpdir, "md$$");
+$file = "md$$";
 @files = ($file, "$file.db", "$file.dir", "$file.pag");
 1 while unlink @files;
 
--- perl-5.8.7/lib/Memoize/t/tie_sdbm.t.CAN-2004-0976	2002-07-12 15:56:19.000000000 -0400
+++ perl-5.8.7/lib/Memoize/t/tie_sdbm.t	2005-11-08 13:05:32.000000000 -0500
@@ -28,14 +28,7 @@
 
 print "1..4\n";
 
-if (eval {require File::Spec::Functions}) {
- File::Spec::Functions->import('tmpdir', 'catfile');
- $tmpdir = tmpdir();
-} else {
- *catfile = sub { join '/', @_ };
-  $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp';
-}
-$file = catfile($tmpdir, "md$$");
+$file = "md$$";
 1 while unlink $file, "$file.dir", "$file.pag";
 tryout('Memoize::SDBM_File', $file, 1);  # Test 1..4
 1 while unlink $file, "$file.dir", "$file.pag";
--- perl-5.8.7/lib/Memoize/t/tie_gdbm.t.CAN-2004-0976	2002-07-12 15:56:19.000000000 -0400
+++ perl-5.8.7/lib/Memoize/t/tie_gdbm.t	2005-11-08 13:04:03.000000000 -0500
@@ -26,13 +26,7 @@
 
 print "1..4\n";
 
-if (eval {require File::Spec::Functions}) {
- File::Spec::Functions->import();
-} else {
-  *catfile = sub { join '/', @_ };
-}
-$tmpdir = $ENV{TMP} || $ENV{TMPDIR} ||  '/tmp';  
-$file = catfile($tmpdir, "md$$");
+$file = "md$$";
 1 while unlink $file, "$file.dir", "$file.pag";
 tryout('GDBM_File', $file, 1);  # Test 1..4
 1 while unlink $file, "$file.dir", "$file.pag";
--- perl-5.8.7/lib/CGI/Cookie.pm.CAN-2004-0976	2005-05-16 04:41:03.000000000 -0400
+++ perl-5.8.7/lib/CGI/Cookie.pm	2005-11-08 14:56:15.141710000 -0500
@@ -407,7 +407,7 @@
 You may also retrieve cookies that were stored in some external
 form using the parse() class method:
 
-       $COOKIES = `cat /usr/tmp/Cookie_stash`;
+       $COOKIES = `cat /var/run/www/Cookie_stash`;
        %cookies = parse CGI::Cookie($COOKIES);
 
 If you are in a mod_perl environment, you can save some overhead by
--- perl-5.8.7/lib/Shell.pm.CAN-2004-0976	2004-06-01 05:42:17.000000000 -0400
+++ perl-5.8.7/lib/Shell.pm	2005-11-08 15:01:36.434664000 -0500
@@ -127,7 +127,7 @@
    use Shell qw(cat ps cp);
    $passwd = cat('</etc/passwd');
    @pslines = ps('-ww'),
-   cp("/etc/passwd", "/tmp/passwd");
+   cp("/etc/passwd", "/etc/passwd.orig");
 
    # object oriented 
    my $sh = Shell->new;
Commit	Line	Data
21155a62 AM	1	--- perl-5.8.7/utils/c2ph.PL.CAN-2004-0976 2004-10-19 15:45:42.000000000 -0400
	2	+++ perl-5.8.7/utils/c2ph.PL 2005-11-08 12:53:30.000000000 -0500
	3	@@ -1320,7 +1320,7 @@
	4	$intrinsics{$_[1]} = $template{$_[0]};
	5	}
	6	close(PIPE) \|\| die "couldn't read intrinsics!";
	7	- unlink($TMP, '$SAFEDIR/a.out');
	8	+ unlink($TMP, "$SAFEDIR/a.out");
	9	print STDERR "done\n" if $trace;
	10	}
	11
	12	--- perl-5.8.7/lib/Memoize/t/tie_storable.t.CAN-2004-0976 2002-07-12 15:56:19.000000000 -0400
	13	+++ perl-5.8.7/lib/Memoize/t/tie_storable.t 2005-11-08 13:06:13.000000000 -0500
	14	@@ -33,14 +33,7 @@
	15
	16	print "1..4\n";
	17
	18	-
	19	-if (eval {require File::Spec::Functions}) {
	20	- File::Spec::Functions->import();
	21	-} else {
	22	- *catfile = sub { join '/', @_ };
	23	-}
	24	-$tmpdir = $ENV{TMP} \|\| $ENV{TMPDIR} \|\| '/tmp';
	25	-$file = catfile($tmpdir, "storable$$");
	26	+$file = "storable$$";
	27	1 while unlink $file;
	28	tryout('Memoize::Storable', $file, 1); # Test 1..4
	29	1 while unlink $file;
	30	--- perl-5.8.7/lib/Memoize/t/tie_ndbm.t.CAN-2004-0976 2005-04-22 07:36:58.000000000 -0400
	31	+++ perl-5.8.7/lib/Memoize/t/tie_ndbm.t 2005-11-08 13:04:45.000000000 -0500
	32	@@ -28,14 +28,7 @@
	33
	34	print "1..4\n";
	35
	36	-
	37	-if (eval {require File::Spec::Functions}) {
	38	- File::Spec::Functions->import();
	39	-} else {
	40	- *catfile = sub { join '/', @_ };
	41	-}
	42	-$tmpdir = $ENV{TMP} \|\| $ENV{TMPDIR} \|\| '/tmp';
	43	-$file = catfile($tmpdir, "md$$");
	44	+$file = "md$$";
	45	1 while unlink $file, "$file.dir", "$file.pag", "$file.db";
	46	tryout('Memoize::NDBM_File', $file, 1); # Test 1..4
	47	1 while unlink $file, "$file.dir", "$file.pag", "$file.db";
	48	--- perl-5.8.7/lib/Memoize/t/tie.t.CAN-2004-0976 2002-07-12 15:56:19.000000000 -0400
	49	+++ perl-5.8.7/lib/Memoize/t/tie.t 2005-11-08 13:03:20.000000000 -0500
	50	@@ -29,14 +29,7 @@
	51	$_[0]+1;
	52	}
	53
	54	-if (eval {require File::Spec::Functions}) {
	55	- File::Spec::Functions->import('tmpdir', 'catfile');
	56	- $tmpdir = tmpdir();
	57	-} else {
	58	- *catfile = sub { join '/', @_ };
	59	- $tmpdir = $ENV{TMP} \|\| $ENV{TMPDIR} \|\| '/tmp';
	60	-}
	61	-$file = catfile($tmpdir, "md$$");
	62	+$file = "md$$";
	63	@files = ($file, "$file.db", "$file.dir", "$file.pag");
	64	1 while unlink @files;
65
66	--- perl-5.8.7/lib/Memoize/t/tie_sdbm.t.CAN-2004-0976 2002-07-12 15:56:19.000000000 -0400
67	+++ perl-5.8.7/lib/Memoize/t/tie_sdbm.t 2005-11-08 13:05:32.000000000 -0500
68	@@ -28,14 +28,7 @@
69
70	print "1..4\n";
71
72	-if (eval {require File::Spec::Functions}) {
73	- File::Spec::Functions->import('tmpdir', 'catfile');
74	- $tmpdir = tmpdir();
75	-} else {
76	- *catfile = sub { join '/', @_ };
77	- $tmpdir = $ENV{TMP} \|\| $ENV{TMPDIR} \|\| '/tmp';
78	-}
79	-$file = catfile($tmpdir, "md$$");
80	+$file = "md$$";
81	1 while unlink $file, "$file.dir", "$file.pag";
82	tryout('Memoize::SDBM_File', $file, 1); # Test 1..4
83	1 while unlink $file, "$file.dir", "$file.pag";
84	--- perl-5.8.7/lib/Memoize/t/tie_gdbm.t.CAN-2004-0976 2002-07-12 15:56:19.000000000 -0400
85	+++ perl-5.8.7/lib/Memoize/t/tie_gdbm.t 2005-11-08 13:04:03.000000000 -0500
86	@@ -26,13 +26,7 @@
87
88	print "1..4\n";
89
90	-if (eval {require File::Spec::Functions}) {
91	- File::Spec::Functions->import();
92	-} else {
93	- *catfile = sub { join '/', @_ };
94	-}
95	-$tmpdir = $ENV{TMP} \|\| $ENV{TMPDIR} \|\| '/tmp';
96	-$file = catfile($tmpdir, "md$$");
97	+$file = "md$$";
98	1 while unlink $file, "$file.dir", "$file.pag";
99	tryout('GDBM_File', $file, 1); # Test 1..4
100	1 while unlink $file, "$file.dir", "$file.pag";
21155a62 AM	101	--- perl-5.8.7/lib/CGI/Cookie.pm.CAN-2004-0976 2005-05-16 04:41:03.000000000 -0400
	102	+++ perl-5.8.7/lib/CGI/Cookie.pm 2005-11-08 14:56:15.141710000 -0500
	103	@@ -407,7 +407,7 @@
	104	You may also retrieve cookies that were stored in some external
	105	form using the parse() class method:
	106
	107	- $COOKIES = `cat /usr/tmp/Cookie_stash`;
	108	+ $COOKIES = `cat /var/run/www/Cookie_stash`;
	109	%cookies = parse CGI::Cookie($COOKIES);
	110
	111	If you are in a mod_perl environment, you can save some overhead by
	112	--- perl-5.8.7/lib/Shell.pm.CAN-2004-0976 2004-06-01 05:42:17.000000000 -0400
	113	+++ perl-5.8.7/lib/Shell.pm 2005-11-08 15:01:36.434664000 -0500
	114	@@ -127,7 +127,7 @@
	115	use Shell qw(cat ps cp);
	116	$passwd = cat('</etc/passwd');
	117	@pslines = ps('-ww'),
	118	- cp("/etc/passwd", "/tmp/passwd");
	119	+ cp("/etc/passwd", "/etc/passwd.orig");
	120
	121	# object oriented
	122	my $sh = Shell->new;