summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-03-01 12:46:07 +0100
committerRemi Collet <remi@php.net>2023-03-01 12:46:07 +0100
commit70d9eb7af30307f2a4f4bbe8fee56230831ca57a (patch)
tree6373a8a7c010abc8f885c6b3f32e3bb57374d034
parentd536990d5053389b49d14e7a047b9c05b732ef83 (diff)
update to 8.1.17RC1
-rw-r--r--failed.txt7
-rw-r--r--php.spec11
-rw-r--r--upstream.patch56
3 files changed, 11 insertions, 63 deletions
diff --git a/failed.txt b/failed.txt
index 1a9b262..f26c474 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,8 +1,8 @@
-===== 8.1.16 (2023-02-14)
+===== 8.1.17RC1 (2023-03-02)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
-/var/lib/mock/scl81el7x/build.log:Tests failed : 0
+/var/lib/mock/scl81el7x/build.log:Tests failed : 2
/var/lib/mock/scl81el8x/build.log:Tests failed : 0
/var/lib/mock/scl81el9x/build.log:Tests failed : 0
/var/lib/mock/scl81fc36x/build.log:Tests failed : 0
@@ -10,6 +10,9 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
/var/lib/mock/scl81fc38x/build.log:Tests failed : 2
+el7x:
+ 5 ReflectionFunctionAbstract::getClosureUsedVariables [ext/reflection/tests/ReflectionFunction_getClosureUsedVariables.phpt]
+ 5 GH-10623 (ReflectionFunction::getClosureUsedVariables() returns empty array in presence of variadic arguments) [ext/reflection/tests/gh10623.phpt]
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]
diff --git a/php.spec b/php.spec
index 97a61df..1ee4db9 100644
--- a/php.spec
+++ b/php.spec
@@ -122,13 +122,13 @@
#global gh_date 20210809
%global gh_owner php
%global gh_project php-src
-%global upver 8.1.16
-#global rcver RC1
+%global upver 8.1.17
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}%{?gh_date:.%{gh_date}}
-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
@@ -191,7 +191,6 @@ Patch47: php-8.1.0-phpinfo.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
-Patch100: upstream.patch
# Security fixes (200+)
@@ -972,7 +971,6 @@ 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
@@ -1855,6 +1853,9 @@ fi
%changelog
+* Wed Mar 1 2023 Remi Collet <remi@remirepo.net> - 8.1.17~RC1-1
+- update to 8.1.17RC1
+
* Tue Feb 21 2023 Remi Collet <remi@remirepo.net> - 8.1.16-2
- F38: enable imap extension
diff --git a/upstream.patch b/upstream.patch
deleted file mode 100644
index 84d43da..0000000
--- a/upstream.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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