Contents of /trunk/perl/patches/perl-5.8.7-CAN-2004-0976.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 6342 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 6342 byte(s)
-import
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"; |
101 | --- perl-5.8.7/lib/ExtUtils/instmodsh.CAN-2004-0976 2004-01-05 17:34:59.000000000 -0500 |
102 | +++ perl-5.8.7/lib/ExtUtils/instmodsh 2005-11-08 12:42:25.000000000 -0500 |
103 | @@ -2,6 +2,7 @@ |
104 | |
105 | use strict; |
106 | use IO::File; |
107 | +use File::Temp; |
108 | use ExtUtils::Packlist; |
109 | use ExtUtils::Installed; |
110 | |
111 | @@ -58,15 +59,14 @@ |
112 | $reply =~ /^t\s*/ and do |
113 | { |
114 | my $file = (split(' ', $reply))[1]; |
115 | - my $tmp = "/tmp/inst.$$"; |
116 | - if (my $fh = IO::File->new($tmp, "w")) |
117 | - { |
118 | - $fh->print(join("\n", $Inst->files($module))); |
119 | - $fh->close(); |
120 | - system("tar cvf $file -I $tmp"); |
121 | - unlink($tmp); |
122 | - last CASE; |
123 | - } |
124 | + my ($fh, $tmp) = File::Temp::tempfile(UNLINK => 1); |
125 | + $fh->print(join("\n", $Inst->files($module))); |
126 | + $fh->close(); |
127 | + # This used to use -I which is wrong for GNU tar. |
128 | + system("tar cvf $file -T $tmp"); |
129 | + unlink($tmp); |
130 | + last CASE; |
131 | + } |
132 | else { print("Can't open $file: $!\n"); } |
133 | last CASE; |
134 | }; |
135 | --- perl-5.8.7/lib/ExtUtils/MakeMaker.pm.CAN-2004-0976 2004-01-05 17:34:59.000000000 -0500 |
136 | +++ perl-5.8.7/lib/ExtUtils/MakeMaker.pm 2005-11-08 13:07:36.000000000 -0500 |
137 | @@ -1013,7 +1013,7 @@ |
138 | The Makefile to be produced may be altered by adding arguments of the |
139 | form C<KEY=VALUE>. E.g. |
140 | |
141 | - perl Makefile.PL PREFIX=/tmp/myperl5 |
142 | + perl Makefile.PL PREFIX=~/myperl5 |
143 | |
144 | Other interesting targets in the generated Makefile are |
145 | |
146 | @@ -1355,13 +1355,13 @@ |
147 | |
148 | This is the root directory into which the code will be installed. It |
149 | I<prepends itself to the normal prefix>. For example, if your code |
150 | -would normally go into /usr/local/lib/perl you could set DESTDIR=/tmp/ |
151 | -and installation would go into /tmp/usr/local/lib/perl. |
152 | +would normally go into /usr/local/lib/perl you could set DESTDIR=~/myperl/ |
153 | +and installation would go into ~/myperl/usr/local/lib/perl. |
154 | |
155 | This is primarily of use for people who repackage Perl modules. |
156 | |
157 | NOTE: Due to the nature of make, it is important that you put the trailing |
158 | -slash on your DESTDIR. "/tmp/" not "/tmp". |
159 | +slash on your DESTDIR. "~/myperl/" not "~/myperl". |
160 | |
161 | =item DIR |
162 | |
163 | --- perl-5.8.7/lib/CGI/Cookie.pm.CAN-2004-0976 2005-05-16 04:41:03.000000000 -0400 |
164 | +++ perl-5.8.7/lib/CGI/Cookie.pm 2005-11-08 14:56:15.141710000 -0500 |
165 | @@ -407,7 +407,7 @@ |
166 | You may also retrieve cookies that were stored in some external |
167 | form using the parse() class method: |
168 | |
169 | - $COOKIES = `cat /usr/tmp/Cookie_stash`; |
170 | + $COOKIES = `cat /var/run/www/Cookie_stash`; |
171 | %cookies = parse CGI::Cookie($COOKIES); |
172 | |
173 | If you are in a mod_perl environment, you can save some overhead by |
174 | --- perl-5.8.7/lib/Shell.pm.CAN-2004-0976 2004-06-01 05:42:17.000000000 -0400 |
175 | +++ perl-5.8.7/lib/Shell.pm 2005-11-08 15:01:36.434664000 -0500 |
176 | @@ -127,7 +127,7 @@ |
177 | use Shell qw(cat ps cp); |
178 | $passwd = cat('</etc/passwd'); |
179 | @pslines = ps('-ww'), |
180 | - cp("/etc/passwd", "/tmp/passwd"); |
181 | + cp("/etc/passwd", "/etc/passwd.orig"); |
182 | |
183 | # object oriented |
184 | my $sh = Shell->new; |