update to 8.2.0RC2 (new tag)

add patch from https://github.com/php/php-src/pull/9537

4 files changed, 104 insertions, 11 deletions

diff --git a/failed.txt b/failed.txt
index 6eece94..ad421f8 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,17 +1,17 @@
-===== 8.2.0RC1 (2022-09-01)
+===== 8.2.0RC2 (2022-09-15)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
-/var/lib/mock/scl81el7x/build.log:Tests failed    :     2
-/var/lib/mock/scl81el8x/build.log:Tests failed     :    3
-/var/lib/mock/scl81el9x/build.log:Tests failed     :    2
-/var/lib/mock/scl81fc35x/build.log:Tests failed    :    2
-/var/lib/mock/scl81fc36x/build.log:Tests failed    :    2
+/var/lib/mock/scl82el7x/build.log:Tests failed    :     1
+/var/lib/mock/scl82el8x/build.log:Tests failed     :    2
+/var/lib/mock/scl82el9x/build.log:Tests failed     :    2
+/var/lib/mock/scl82fc35x/build.log:Tests failed    :    1
+/var/lib/mock/scl82fc36x/build.log:Tests failed    :    1
+/var/lib/mock/scl82fc37x/build.log:Tests failed    :    1
 
 
 all:
-	2	FPM: GH-8885 - access.log with stderr begins to write logs to error_log after daemon reload [sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt]
-	2	FPM: GH-8885 - access.log with stderr begins to write logs to error_log after daemon reload [sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt]
+	3	Compatibility of values of same name trait constants is checked after their constant expressions are evaluated [Zend/tests/traits/constant_016.phpt]
 el8x:
 	3	Test setlocale() function : usage variations - Setting all available locales in the platform [ext/standard/tests/strings/setlocale_variation2.phpt]
 
diff --git a/php-8.2.0-parser.patch b/php-8.2.0-parser.patch
index 1b4cdaa..dcfe617 100644
--- a/php-8.2.0-parser.patch
+++ b/php-8.2.0-parser.patch
@@ -11,6 +11,6 @@ diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
 +        return;
 +    }
 +
-     $version = "4.14.0";
+     $version = "4.15.1";
      $phpParserDir = __DIR__ . "/PHP-Parser-$version";
      if (!is_dir($phpParserDir)) {
diff --git a/php-pr9537.patch b/php-pr9537.patch
new file mode 100644
index 0000000..f03c49a
--- /dev/null
+++ b/php-pr9537.patch
@@ -0,0 +1,81 @@
+From 46a32f76549ae7c1399751d64b3cfdee54105833 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 14 Sep 2022 11:08:44 +0200
+Subject: [PATCH] fix tests on systemd enabled build
+
+---
+ .../tests/gh8885-stderr-fd-reload-usr1.phpt   | 16 ++++++++++++----
+ .../tests/gh8885-stderr-fd-reload-usr2.phpt   | 19 ++++++++++++++-----
+ 2 files changed, 26 insertions(+), 9 deletions(-)
+
+diff --git a/sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt b/sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt
+index 4ff8d0660936..c03994ce513d 100644
+--- a/sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt
++++ b/sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt
+@@ -40,7 +40,11 @@ assert($content !== false && strlen($content) > 0, 'File must not be empty');
+ $errorLogLines = explode("\n", $content);
+ array_pop($errorLogLines);
+ 
+-assert(count($errorLogLines) === 2, 'Expected 2 records in the error_log file');
++if (count($errorLogLines) === 3) {
++    assert(strpos($errorLogLines[2], 'systemd'));
++} else {
++    assert(count($errorLogLines) === 2, 'Expected 2 records in the error_log file:' . print_r($errorLogLines, true));
++}
+ assert(strpos($errorLogLines[0], 'NOTICE: fpm is running, pid'));
+ assert(strpos($errorLogLines[1], 'NOTICE: ready to handle connections'));
+ 
+@@ -61,9 +65,13 @@ array_pop($errorLogLines);
+ assert(count($errorLogLines) >= 4, 'Expected at least 4 records in the error_log file');
+ assert(strpos($errorLogLines[0], 'NOTICE: fpm is running, pid'));
+ assert(strpos($errorLogLines[1], 'NOTICE: ready to handle connections'));
+-assert(strpos($errorLogLines[2], 'NOTICE: error log file re-opened'));
+-assert(strpos($errorLogLines[3], 'NOTICE: access log file re-opened'));
+-
++if (strpos($errorLogLines[2], 'systemd')) {
++    assert(strpos($errorLogLines[3], 'NOTICE: error log file re-opened'));
++    assert(strpos($errorLogLines[4], 'NOTICE: access log file re-opened'));
++} else {
++    assert(strpos($errorLogLines[2], 'NOTICE: error log file re-opened'));
++    assert(strpos($errorLogLines[3], 'NOTICE: access log file re-opened'));
++}
+ 
+ $tester->ping('{{ADDR}}');
+ $stderrLines = $tester->getLogLines(-1);
+diff --git a/sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt b/sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt
+index 68d9f6fa68b6..e337c83e89f0 100644
+--- a/sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt
++++ b/sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt
+@@ -40,7 +40,11 @@ assert($content !== false && strlen($content) > 0, 'File must not be empty');
+ $errorLogLines = explode("\n", $content);
+ array_pop($errorLogLines);
+ 
+-assert(count($errorLogLines) === 2, 'Expected 2 records in the error_log file');
++if (count($errorLogLines) === 3) {
++    assert(strpos($errorLogLines[2], 'systemd'));
++} else {
++    assert(count($errorLogLines) === 2, 'Expected 2 records in the error_log file:' . print_r($errorLogLines, true));
++}
+ assert(strpos($errorLogLines[0], 'NOTICE: fpm is running, pid'));
+ assert(strpos($errorLogLines[1], 'NOTICE: ready to handle connections'));
+ 
+@@ -61,10 +65,15 @@ array_pop($errorLogLines);
+ assert(count($errorLogLines) >= 5, 'Expected at least 5 records in the error_log file');
+ assert(strpos($errorLogLines[0], 'NOTICE: fpm is running, pid'));
+ assert(strpos($errorLogLines[1], 'NOTICE: ready to handle connections'));
+-assert(strpos($errorLogLines[2], 'NOTICE: Reloading in progress'));
+-assert(strpos($errorLogLines[3], 'NOTICE: reloading: execvp'));
+-assert(strpos($errorLogLines[4], 'NOTICE: using inherited socket'));
+-
++if (strpos($errorLogLines[2], 'systemd')) {
++    assert(strpos($errorLogLines[3], 'NOTICE: Reloading in progress'));
++    assert(strpos($errorLogLines[4], 'NOTICE: reloading: execvp'));
++    assert(strpos($errorLogLines[5], 'NOTICE: using inherited socket'));
++} else {
++    assert(strpos($errorLogLines[2], 'NOTICE: Reloading in progress'));
++    assert(strpos($errorLogLines[3], 'NOTICE: reloading: execvp'));
++    assert(strpos($errorLogLines[4], 'NOTICE: using inherited socket'));
++}
+ $tester->ping('{{ADDR}}');
+ $stderrLines = $tester->getLogLines(-1);
+ assert(count($stderrLines) === 1, 'Must be only 1 record in the access.log');
diff --git a/php.spec b/php.spec
index 2cfcd0d..7d0625d 100644
--- a/php.spec
+++ b/php.spec
@@ -123,13 +123,13 @@
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.2.0
-%global rcver        RC1
+%global rcver        RC2
 %global lower        %(echo %{rcver} | tr '[:upper:]' '[:lower:]')
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 12%{?dist}
+Release: 15%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -192,6 +192,7 @@ Patch47: php-8.1.0-phpinfo.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
+Patch100: php-pr9537.patch
 
 # Security fixes (200+)
 
@@ -968,6 +969,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
+%patch100 -p1 -b .pr9537
 
 # security patches
 
@@ -1848,6 +1850,16 @@ fi
 
 
 %changelog
+* Wed Sep 14 2022 Remi Collet <remi@remirepo.net> - 8.2.0~rc2-15
+- update to 8.2.0RC2 (new tag)
+- add patch from https://github.com/php/php-src/pull/9537
+
+* Wed Sep 14 2022 Remi Collet <remi@remirepo.net> - 8.2.0~rc2-14
+- test build reverting some upstream changes
+
+* Wed Sep 14 2022 Remi Collet <remi@remirepo.net> - 8.2.0~rc2-13
+- update to 8.2.0RC2
+
 * Thu Sep  1 2022 Remi Collet <remi@remirepo.net> - 8.2.0~rc1-12
 - update to 8.2.0RC1
 - bump to final API/ABI