summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-02-18 16:19:11 +0100
committerRemi Collet <remi@remirepo.net>2021-02-18 16:19:11 +0100
commit3c604f954786d424618e2679107f47f46d10e626 (patch)
treedcc334f750571ee852cd7fb4a2460f2173f06808
parentf5f39db2bc970b8606a04185abe1d67a94204626 (diff)
update to 8.0.3RC1HEADmaster
-rw-r--r--failed.txt12
-rw-r--r--php-bug80682.patch30
-rw-r--r--php80.spec11
3 files changed, 14 insertions, 39 deletions
diff --git a/failed.txt b/failed.txt
index 7f51750..7464b15 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,14 +1,18 @@
-===== 8.0.2 (2021-02-04)
+===== 8.0.3RC1 (2021-02-18)
$ grep -ar 'Tests failed' /var/lib/mock/{fc,el}*/build.log
-/var/lib/mock/el7x/build.log:Tests failed : 0
+/var/lib/mock/el7x/build.log:Tests failed : 1
/var/lib/mock/el8x80/build.log:Tests failed : 0
-/var/lib/mock/fc31x/build.log:Tests failed : 0
/var/lib/mock/fc32x/build.log:Tests failed : 0
-/var/lib/mock/fc33x/build.log:Tests failed : 0
+/var/lib/mock/fc33x/build.log:Tests failed : 1
+/var/lib/mock/fc34x/build.log:Tests failed : 0
+el7x:
+ Bug #80747: Providing RSA key size < 512 generates key that crash PHP [ext/openssl/tests/bug80747.phpt]
+fc33x:
+ Implement Req #61679 (Support HTTP PATCH method) [sapi/cli/tests/php_cli_server_018.phpt]
1 proc_open give erratic test results :(
diff --git a/php-bug80682.patch b/php-bug80682.patch
deleted file mode 100644
index 38f908b..0000000
--- a/php-bug80682.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 067f7e4150d8f9bddf6b198c9c7826565ee549b0 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Thu, 28 Jan 2021 16:24:39 +0100
-Subject: [PATCH] Fix #80682 opcache doesn't honour pcre.jit option
-
----
- ext/opcache/zend_accelerator_blacklist.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/ext/opcache/zend_accelerator_blacklist.c b/ext/opcache/zend_accelerator_blacklist.c
-index 889fcabd7988..5c6bd76821a5 100644
---- a/ext/opcache/zend_accelerator_blacklist.c
-+++ b/ext/opcache/zend_accelerator_blacklist.c
-@@ -185,10 +185,12 @@ static void zend_accel_blacklist_update_regexp(zend_blacklist *blacklist)
- return;
- }
- #ifdef HAVE_PCRE_JIT_SUPPORT
-- if (0 > pcre2_jit_compile(it->re, PCRE2_JIT_COMPLETE)) {
-- /* Don't return here, even JIT could fail to compile, the pattern is still usable. */
-- pcre2_get_error_message(errnumber, pcre_error, sizeof(pcre_error));
-- zend_accel_error(ACCEL_LOG_WARNING, "Blacklist JIT compilation failed, %s\n", pcre_error);
-+ if (PCRE_G(jit)) {
-+ if (0 > pcre2_jit_compile(it->re, PCRE2_JIT_COMPLETE)) {
-+ /* Don't return here, even JIT could fail to compile, the pattern is still usable. */
-+ pcre2_get_error_message(errnumber, pcre_error, sizeof(pcre_error));
-+ zend_accel_error(ACCEL_LOG_WARNING, "Blacklist JIT compilation failed, %s\n", pcre_error);
-+ }
- }
- #endif
- /* prepare for the next iteration */
diff --git a/php80.spec b/php80.spec
index 4777fb9..59dd1ce 100644
--- a/php80.spec
+++ b/php80.spec
@@ -89,9 +89,9 @@
%bcond_without libgd
%bcond_with zip
-%global upver 8.0.2
-#global rcver RC1
-#global lower RC1
+%global upver 8.0.3
+%global rcver RC1
+%global lower RC1
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -153,7 +153,6 @@ Patch47: php-8.0.0-phpinfo.patch
Patch91: php-7.2.0-oci8conf.patch
# Upstream fixes (100+)
-Patch100: php-bug80682.patch
# Security fixes (200+)
@@ -1156,7 +1155,6 @@ in pure PHP.
%patch91 -p1 -b .remi-oci8
# upstream patches
-%patch100 -p1 -b .bug80682
# security patches
@@ -2144,6 +2142,9 @@ fi
%changelog
+* Thu Feb 18 2021 Remi Collet <remi@remirepo.net> - 8.0.3~RC1-1
+- update to 8.0.3RC1
+
* Tue Feb 2 2021 Remi Collet <remi@remirepo.net> - 8.0.2-1
- Update to 8.0.2 - http://www.php.net/releases/8_0_2.php