diff options
| -rw-r--r-- | failed.txt | 3 | ||||
| -rw-r--r-- | php.spec | 12 | ||||
| -rw-r--r-- | upstream.patch | 56 |
3 files changed, 68 insertions, 3 deletions
@@ -1,11 +1,10 @@ -===== 8.1.15 (2023-02-02) +===== 8.1.16 (2023-02-14) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/scl81el7x/build.log:Tests failed : 0 /var/lib/mock/scl81el8x/build.log:Tests failed : 0 /var/lib/mock/scl81el9x/build.log:Tests failed : 0 -/var/lib/mock/scl81fc35x/build.log:Tests failed : 0 /var/lib/mock/scl81fc36x/build.log:Tests failed : 0 /var/lib/mock/scl81fc37x/build.log:Tests failed : 0 @@ -67,7 +67,12 @@ %bcond_with oci8 %bcond_with zip # Optional extensions; to disable: pass "--without xxx" etc to rpmbuild/mock. +%if 0%{?fedora} >= 38 || 0%{?rhel} >= 10 +# uw-imap is not available +%bcond_with imap +%else %bcond_without imap +%endif %bcond_without firebird %bcond_without freetds %bcond_without tidy @@ -122,7 +127,7 @@ #global gh_date 20210809 %global gh_owner php %global gh_project php-src -%global upver 8.1.15 +%global upver 8.1.16 #global rcver RC1 Summary: PHP scripting language for creating dynamic web sites @@ -191,6 +196,7 @@ Patch47: php-8.1.0-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) +Patch100: upstream.patch # Security fixes (200+) @@ -971,6 +977,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch91 -p1 -b .remi-oci8 # upstream patches +%patch100 -p1 -b .up # security patches @@ -1853,6 +1860,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 + * Wed Feb 1 2023 Remi Collet <remi@remirepo.net> - 8.1.15-1 - Update to 8.1.15 - http://www.php.net/releases/8_1_15.php - add dependency on pcre2 minimal version 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 |