]> git.pld-linux.org Git - packages/php.git/blame - bug-52078-fileinode.patch
Rel 4; fix openssl 3 build
[packages/php.git] / bug-52078-fileinode.patch
CommitLineData
78ca42ef
JR
1diff -urNp -x '*.orig' php-7.2.34.org/ext/spl/tests/SplFileInfo_getInode_basic.phpt php-7.2.34/ext/spl/tests/SplFileInfo_getInode_basic.phpt
2--- php-7.2.34.org/ext/spl/tests/SplFileInfo_getInode_basic.phpt 2021-08-27 22:34:19.251518695 +0200
3+++ php-7.2.34/ext/spl/tests/SplFileInfo_getInode_basic.phpt 2021-08-27 22:34:20.224831419 +0200
4@@ -11,6 +11,7 @@ Jacopo Romei <jacopo@sviluppoagile.it>
5 --SKIPIF--
6 <?php
7 if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms");
8+if (PHP_INT_SIZE == 4) die("skip this test is for >32bit platform only (inodes overflow there)");
9 ?>
10 --FILE--
11 <?php
12diff -urNp -x '*.orig' php-7.2.34.org/ext/standard/tests/file/fileinode_basic.phpt php-7.2.34/ext/standard/tests/file/fileinode_basic.phpt
13--- php-7.2.34.org/ext/standard/tests/file/fileinode_basic.phpt 2020-09-30 07:15:51.000000000 +0200
14+++ php-7.2.34/ext/standard/tests/file/fileinode_basic.phpt 2021-08-27 22:34:20.221498156 +0200
15@@ -28,9 +28,9 @@ unlink (dirname(__FILE__)."/inode.tmp");
c0240cb1 16 ?>
17 --EXPECTF--
18 *** Testing fileinode() with file, directory ***
19-%d
20-%d
21-%d
22-%d
23+%i
24+%i
25+%i
26+%i
27
28 *** Done ***
78ca42ef
JR
29diff -urNp -x '*.orig' php-7.2.34.org/ext/standard/tests/file/fileinode_variation.phpt php-7.2.34/ext/standard/tests/file/fileinode_variation.phpt
30--- php-7.2.34.org/ext/standard/tests/file/fileinode_variation.phpt 2020-09-30 07:15:51.000000000 +0200
31+++ php-7.2.34/ext/standard/tests/file/fileinode_variation.phpt 2021-08-27 22:34:20.221498156 +0200
32@@ -88,24 +88,24 @@ echo "\n*** Done ***";
c0240cb1 33 --EXPECTF--
34 *** Testing fileinode() with files, links and directories ***
35 -- Testing with files --
36-%d
37-%d
38+%i
39+%i
40 -- Testing with links: hard link --
41-%d
42-%d
43+%i
44+%i
45 -- Testing with links: soft link --
46-%d
47-%d
48+%i
49+%i
50 -- Testing after copying a file --
51-%d
52-%d
53+%i
54+%i
55 -- Testing after renaming the file --
56-%d
57-%d
58+%i
59+%i
60 -- Testing with directories --
61-%d
62-%d
63+%i
64+%i
65 -- Testing with binary input --
66-%d
67-%d
68+%i
69+%i
70 *** Done ***
78ca42ef
JR
71diff -urNp -x '*.orig' php-7.2.34.org/ext/standard/tests/file/fileinode_variation1.phpt php-7.2.34/ext/standard/tests/file/fileinode_variation1.phpt
72--- php-7.2.34.org/ext/standard/tests/file/fileinode_variation1.phpt 2020-09-30 07:15:51.000000000 +0200
73+++ php-7.2.34/ext/standard/tests/file/fileinode_variation1.phpt 2021-08-27 22:34:20.221498156 +0200
74@@ -41,7 +41,7 @@ unlink($file_path."/fileinode_variation1
75 ?>
c0240cb1 76 --EXPECTF--
77 *** Testing fileinode() with links ***
78-int(%d)
79-int(%d)
80+int(%i)
81+int(%i)
82
83 *** Done ***
78ca42ef
JR
84diff -urNp -x '*.orig' php-7.2.34.org/ext/standard/tests/file/filestat.phpt php-7.2.34/ext/standard/tests/file/filestat.phpt
85--- php-7.2.34.org/ext/standard/tests/file/filestat.phpt 2020-09-30 07:15:51.000000000 +0200
86+++ php-7.2.34/ext/standard/tests/file/filestat.phpt 2021-08-27 22:34:20.221498156 +0200
87@@ -30,17 +30,17 @@ var_dump(filectime("/no/such/file/or/dir
c0240cb1 88 echo "Done\n";
89 ?>
981a3721 90 --EXPECTF--
c0240cb1 91+int(%i)
92 int(%d)
93 int(%d)
94 int(%d)
95 int(%d)
96+int(%i)
97 int(%d)
98 int(%d)
99 int(%d)
100 int(%d)
101-int(%d)
102-int(%d)
103-int(%d)
104+int(%i)
105 int(%d)
106 int(%d)
107 int(%d)
78ca42ef
JR
108diff -urNp -x '*.orig' php-7.2.34.org/ext/standard/tests/file/lstat_stat_variation18.phpt php-7.2.34/ext/standard/tests/file/lstat_stat_variation18.phpt
109--- php-7.2.34.org/ext/standard/tests/file/lstat_stat_variation18.phpt 2020-09-30 07:15:51.000000000 +0200
110+++ php-7.2.34/ext/standard/tests/file/lstat_stat_variation18.phpt 2021-08-27 22:34:20.221498156 +0200
111@@ -65,7 +65,7 @@ array(26) {
c0240cb1 112 [0]=>
113 int(%d)
114 [1]=>
115- int(%d)
116+ int(%i)
117 [2]=>
118 int(%d)
119 [3]=>
78ca42ef 120@@ -91,7 +91,7 @@ array(26) {
c0240cb1 121 ["dev"]=>
122 int(%d)
123 ["ino"]=>
124- int(%d)
125+ int(%i)
126 ["mode"]=>
127 int(%d)
128 ["nlink"]=>
78ca42ef 129@@ -121,7 +121,7 @@ array(26) {
c0240cb1 130 [0]=>
131 int(%d)
132 [1]=>
133- int(%d)
134+ int(%i)
135 [2]=>
136 int(%d)
137 [3]=>
78ca42ef 138@@ -147,7 +147,7 @@ array(26) {
c0240cb1 139 ["dev"]=>
140 int(%d)
141 ["ino"]=>
142- int(%d)
143+ int(%i)
144 ["mode"]=>
145 int(%d)
146 ["nlink"]=>
78ca42ef
JR
147diff -urNp -x '*.orig' php-7.2.34.org/ext/standard/tests/file/lstat_stat_variation19.phpt php-7.2.34/ext/standard/tests/file/lstat_stat_variation19.phpt
148--- php-7.2.34.org/ext/standard/tests/file/lstat_stat_variation19.phpt 2020-09-30 07:15:51.000000000 +0200
149+++ php-7.2.34/ext/standard/tests/file/lstat_stat_variation19.phpt 2021-08-27 22:34:20.221498156 +0200
150@@ -66,7 +66,7 @@ array(26) {
c0240cb1 151 [0]=>
152 int(%d)
153 [1]=>
154- int(%d)
155+ int(%i)
156 [2]=>
157 int(%d)
158 [3]=>
78ca42ef 159@@ -92,7 +92,7 @@ array(26) {
c0240cb1 160 ["dev"]=>
161 int(%d)
162 ["ino"]=>
163- int(%d)
164+ int(%i)
165 ["mode"]=>
166 int(%d)
167 ["nlink"]=>
78ca42ef 168@@ -120,7 +120,7 @@ array(26) {
c0240cb1 169 [0]=>
170 int(%d)
171 [1]=>
172- int(%d)
173+ int(%i)
174 [2]=>
175 int(%d)
176 [3]=>
78ca42ef 177@@ -146,7 +146,7 @@ array(26) {
c0240cb1 178 ["dev"]=>
179 int(%d)
180 ["ino"]=>
181- int(%d)
182+ int(%i)
183 ["mode"]=>
184 int(%d)
185 ["nlink"]=>
78ca42ef 186@@ -176,7 +176,7 @@ array(26) {
c0240cb1 187 [0]=>
188 int(%d)
189 [1]=>
190- int(%d)
191+ int(%i)
192 [2]=>
193 int(%d)
194 [3]=>
78ca42ef 195@@ -202,7 +202,7 @@ array(26) {
c0240cb1 196 ["dev"]=>
197 int(%d)
198 ["ino"]=>
199- int(%d)
200+ int(%i)
201 ["mode"]=>
202 int(%d)
203 ["nlink"]=>
78ca42ef 204@@ -230,7 +230,7 @@ array(26) {
c0240cb1 205 [0]=>
206 int(%d)
207 [1]=>
208- int(%d)
209+ int(%i)
210 [2]=>
211 int(%d)
212 [3]=>
78ca42ef 213@@ -256,7 +256,7 @@ array(26) {
c0240cb1 214 ["dev"]=>
215 int(%d)
216 ["ino"]=>
217- int(%d)
218+ int(%i)
219 ["mode"]=>
220 int(%d)
221 ["nlink"]=>
78ca42ef
JR
222diff -urNp -x '*.orig' php-7.2.34.org/ext/standard/tests/file/lstat_stat_variation20.phpt php-7.2.34/ext/standard/tests/file/lstat_stat_variation20.phpt
223--- php-7.2.34.org/ext/standard/tests/file/lstat_stat_variation20.phpt 2020-09-30 07:15:51.000000000 +0200
224+++ php-7.2.34/ext/standard/tests/file/lstat_stat_variation20.phpt 2021-08-27 22:34:20.221498156 +0200
225@@ -68,7 +68,7 @@ array(26) {
c0240cb1 226 [0]=>
227 int(%d)
228 [1]=>
229- int(%d)
230+ int(%i)
231 [2]=>
232 int(%d)
233 [3]=>
78ca42ef 234@@ -94,7 +94,7 @@ array(26) {
c0240cb1 235 ["dev"]=>
236 int(%d)
237 ["ino"]=>
238- int(%d)
239+ int(%i)
240 ["mode"]=>
241 int(%d)
242 ["nlink"]=>
78ca42ef 243@@ -124,7 +124,7 @@ array(26) {
c0240cb1 244 [0]=>
245 int(%d)
246 [1]=>
247- int(%d)
248+ int(%i)
249 [2]=>
250 int(%d)
251 [3]=>
78ca42ef 252@@ -150,7 +150,7 @@ array(26) {
c0240cb1 253 ["dev"]=>
254 int(%d)
255 ["ino"]=>
256- int(%d)
257+ int(%i)
258 ["mode"]=>
259 int(%d)
260 ["nlink"]=>
78ca42ef 261@@ -178,7 +178,7 @@ array(26) {
c0240cb1 262 [0]=>
263 int(%d)
264 [1]=>
265- int(%d)
266+ int(%i)
267 [2]=>
268 int(%d)
269 [3]=>
78ca42ef 270@@ -204,7 +204,7 @@ array(26) {
c0240cb1 271 ["dev"]=>
272 int(%d)
273 ["ino"]=>
274- int(%d)
275+ int(%i)
276 ["mode"]=>
277 int(%d)
278 ["nlink"]=>
78ca42ef 279@@ -232,7 +232,7 @@ array(26) {
c0240cb1 280 [0]=>
281 int(%d)
282 [1]=>
283- int(%d)
284+ int(%i)
285 [2]=>
286 int(%d)
287 [3]=>
78ca42ef 288@@ -258,7 +258,7 @@ array(26) {
c0240cb1 289 ["dev"]=>
290 int(%d)
291 ["ino"]=>
292- int(%d)
293+ int(%i)
294 ["mode"]=>
295 int(%d)
296 ["nlink"]=>
78ca42ef
JR
297diff -urNp -x '*.orig' php-7.2.34.org/ext/standard/tests/file/tempnam_variation1.phpt php-7.2.34/ext/standard/tests/file/tempnam_variation1.phpt
298--- php-7.2.34.org/ext/standard/tests/file/tempnam_variation1.phpt 2020-09-30 07:15:51.000000000 +0200
299+++ php-7.2.34/ext/standard/tests/file/tempnam_variation1.phpt 2021-08-27 22:34:20.221498156 +0200
300@@ -66,51 +66,51 @@ echo "*** Done ***\n";
c0240cb1 301 -- Iteration 1 --
302 File name is => %s%etempnam_variation1.tmp%s
303 File permissions are => 100600
304-File inode is => %d
305+File inode is => %i
306 File created in => directory specified
307 -- Iteration 2 --
308 File name is => %s%etempnam_variation1.tmp%s
309 File permissions are => 100600
310-File inode is => %d
311+File inode is => %i
312 File created in => directory specified
313 -- Iteration 3 --
314 File name is => %s%etempnam_variation1.tmp%s
315 File permissions are => 100600
316-File inode is => %d
317+File inode is => %i
318 File created in => directory specified
319 -- Iteration 4 --
320 File name is => %s%etempnam_variation1.tmp%s
321 File permissions are => 100600
322-File inode is => %d
323+File inode is => %i
324 File created in => directory specified
325 -- Iteration 5 --
326 File name is => %s%etempnam_variation1.tmp%s
327 File permissions are => 100600
328-File inode is => %d
329+File inode is => %i
330 File created in => directory specified
331 -- Iteration 6 --
332 File name is => %s%etempnam_variation1.tmp%s
333 File permissions are => 100600
334-File inode is => %d
335+File inode is => %i
336 File created in => directory specified
337 -- Iteration 7 --
338 File name is => %s%etempnam_variation1.tmp%s
339 File permissions are => 100600
340-File inode is => %d
341+File inode is => %i
342 File created in => directory specified
343 -- Iteration 8 --
344 File name is => %s%etempnam_variation1.tmp%s
345 File permissions are => 100600
346-File inode is => %d
347+File inode is => %i
348 File created in => directory specified
349 -- Iteration 9 --
350 File name is => %s%etempnam_variation1.tmp%s
351 File permissions are => 100600
352-File inode is => %d
353+File inode is => %i
354 File created in => directory specified
355 -- Iteration 10 --
356 File name is => %s%etempnam_variation1.tmp%s
357 File permissions are => 100600
358-File inode is => %d
359+File inode is => %i
360 File created in => directory specified
361 *** Done ***
78ca42ef
JR
362diff -urNp -x '*.orig' php-7.2.34.org/tests/security/open_basedir_fileinode.phpt php-7.2.34/tests/security/open_basedir_fileinode.phpt
363--- php-7.2.34.org/tests/security/open_basedir_fileinode.phpt 2020-09-30 07:15:55.000000000 +0200
364+++ php-7.2.34/tests/security/open_basedir_fileinode.phpt 2021-08-27 22:34:20.221498156 +0200
365@@ -46,9 +46,9 @@ bool(false)
c0240cb1 366
367 Warning: fileinode(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d
368 bool(false)
369-int(%d)
370-int(%d)
371-int(%d)
372-int(%d)
373-int(%d)
374+int(%i)
375+int(%i)
376+int(%i)
377+int(%i)
378+int(%i)
379 *** Finished testing open_basedir configuration [fileinode] ***
This page took 0.093174 seconds and 4 git commands to generate.