Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix #75102: `PharData` says invalid checksum for valid tar

Author: cmb69

ext/phar/tar.c

@@ -268,6 +268,15 @@ int phar_parse_tarfile(php_stream* fp, char *fname, size_t fname_len, char *alia
 		memset(hdr->checksum, ' ', sizeof(hdr->checksum));
 		sum2 = phar_tar_checksum(buf, old?sizeof(old_tar_header):sizeof(tar_header));
 
+		if (old && sum2 != sum1) {
+			uint32_t sum3 = phar_tar_checksum(buf, sizeof(tar_header));
+			if (sum3 == sum1) {
+				/* apparently a broken tar which is in ustar format w/o setting the ustar marker */
+				sum2 = sum3;
+				old = 0;
+			}
+		}
+
 		size = entry.uncompressed_filesize = entry.compressed_filesize =
 			phar_tar_number(hdr->size, sizeof(hdr->size));
 

ext/phar/tests/bug75102.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Bug #75102 (`PharData` says invalid checksum for valid tar)
+--SKIPIF--
+<?php
+if (!extension_loaded('phar')) die('skip phar extension not available');
+?>
+--FILE--
+<?php
+$phar = new PharData(__DIR__ . '/bug75102.tar');
+var_dump(file_get_contents($phar['test.txt']->getPathName()));
+?>
+--EXPECT--
+string(9) "yada yada"