Update to 8.1.16 - http://www.php.net/releases/8_1_16.phpv8.1.16

3 files changed, 71 insertions, 7 deletions

diff --git a/failed.txt b/failed.txt
index d008dc2..a646e0b 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,15 +1,18 @@
-===== 8.1.15 (2023-02-02)
+===== 8.1.16 (2023-02-14)
 
 $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
 
 /var/lib/mock/el7x81/build.log:Tests failed   :    0
 /var/lib/mock/el8x81/build.log:Tests failed   :    0
 /var/lib/mock/el9x81/build.log:Tests failed   :    0
-/var/lib/mock/fc35x81/build.log:Tests failed  :    0
 /var/lib/mock/fc36x81/build.log:Tests failed  :    0
 /var/lib/mock/fc37x81/build.log:Tests failed  :    0
+/var/lib/mock/fc38x81/build.log:Tests failed  :    2
 
 
+fc38x:
+	3	openssl_error_string() tests (OpenSSL >= 3.0) [ext/openssl/tests/openssl_error_string_basic_openssl3.phpt]
+	3	openssl_private_decrypt() tests [ext/openssl/tests/openssl_private_decrypt_basic.phpt]
 
 
 1	proc_open give erratic test results :(
diff --git a/php81.spec b/php81.spec
index a53ff9a..d5deb89 100644
--- a/php81.spec
+++ b/php81.spec
@@ -40,11 +40,11 @@
 # Optional Oracle extensions; pass "--with oci8" etc to rpmbuild.
 %bcond_with           oci8
 
-%if 0%{?fedora} >= 38
+%if 0%{?fedora} >= 38 || 0%{?rhel} >= 10
 # uw-imap is not available
-%bcond_with          imap
+%bcond_with           imap
 %else
-%bcond_without       imap
+%bcond_without        imap
 %endif
 
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -114,13 +114,13 @@
 %bcond_without         libgd
 %bcond_with            zip
 
-%global upver          8.1.15
+%global upver          8.1.16
 #global rcver          RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -181,6 +181,7 @@ Patch47: php-8.1.0-phpinfo.patch
 Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
+Patch100: upstream.patch
 
 # Security fixes (200+)
 
@@ -1193,6 +1194,7 @@ in pure PHP.
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
+%patch100 -p1 -b .up
 
 # security patches
 
@@ -2199,6 +2201,9 @@ fi
 
 
 %changelog
+* Tue Feb 14 2023 Remi Collet <remi@remirepo.net> - 8.1.16-1
+- Update to 8.1.16 - http://www.php.net/releases/8_1_16.php
+
 * Fri Feb 10 2023 Remi Collet <remi@remirepo.net> - 8.1.15-2
 - F38: disable imap extension
 
diff --git a/upstream.patch b/upstream.patch
new file mode 100644
index 0000000..84d43da
--- /dev/null
+++ b/upstream.patch
@@ -0,0 +1,56 @@
+From e86d8704b44dde164e36b5364036e1988ac566fe Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Tue, 14 Feb 2023 14:13:40 +0100
+Subject: [PATCH] more config for new FPM tests
+
+---
+ sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt | 4 +++-
+ .../fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt | 4 +++-
+ sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt      | 4 +++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
+index d2239ac3c410..d5c4c4d46987 100644
+--- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
++++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt
+@@ -21,7 +21,9 @@ php_admin_value[html_errors] = false
+ php_admin_value[max_input_vars] = 20
+ php_admin_value[max_file_uploads] = 5
+ php_admin_value[max_multipart_body_parts] = 10
+-php_flag[display_errors] = On
++php_admin_flag[display_errors] = On
++php_admin_flag[display_startup_errors] = On
++php_admin_flag[log_errors] = On
+ EOT;
+ 
+ $code = <<<EOT
+diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
+index 42b5afbf9ee7..c7e029371bba 100644
+--- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
++++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt
+@@ -20,7 +20,9 @@ pm.max_spare_servers = 3
+ php_admin_value[html_errors] = false
+ php_admin_value[max_input_vars] = 20
+ php_admin_value[max_file_uploads] = 5
+-php_flag[display_errors] = On
++php_admin_flag[display_errors] = On
++php_admin_flag[display_startup_errors] = On
++php_admin_flag[log_errors] = On
+ EOT;
+ 
+ $code = <<<EOT
+diff --git a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
+index da81174c7280..8c7ec54c799b 100644
+--- a/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
++++ b/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt
+@@ -19,7 +19,9 @@ pm.min_spare_servers = 1
+ pm.max_spare_servers = 3
+ php_admin_value[html_errors] = false
+ php_admin_value[max_file_uploads] = 5
+-php_flag[display_errors] = On
++php_admin_flag[display_errors] = On
++php_admin_flag[display_startup_errors] = On
++php_admin_flag[log_errors] = On
+ EOT;
+ 
+ $code = <<<EOT