From 816ebb6943338c1bd6a68e341112bb802c8b8a98 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Feb 2021 16:12:16 +0100 Subject: update to 8.0.3RC1 --- failed.txt | 9 ++++++--- php-bug80682.patch | 30 ------------------------------ php.spec | 11 ++++++----- 3 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 php-bug80682.patch diff --git a/failed.txt b/failed.txt index ac2c828..f6734e4 100644 --- a/failed.txt +++ b/failed.txt @@ -1,14 +1,17 @@ -===== 8.0.2 (2021-02-04) +===== 8.0.3RC1 (2021-02-18) $ grep -ar 'Tests failed' /var/lib/mock/scl80*/build.log -/var/lib/mock/scl80el7x/build.log:Tests failed : 0 +/var/lib/mock/scl80el7x/build.log:Tests failed : 3 /var/lib/mock/scl80el8x/build.log:Tests failed : 0 -/var/lib/mock/scl80fc31x/build.log:Tests failed : 0 /var/lib/mock/scl80fc32x/build.log:Tests failed : 0 /var/lib/mock/scl80fc33x/build.log:Tests failed : 0 +el7x: + Bug #80747: Providing RSA key size < 512 generates key that crash PHP [ext/openssl/tests/bug80747.phpt] + Bug #60180 ($_SERVER["PHP_SELF"] incorrect) [ext/standard/tests/streams/bug64433.phpt] + Bug #70198 Checking liveness does not work as expected [ext/standard/tests/streams/bug70198.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 -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/php.spec b/php.spec index 0349764..69ab523 100644 --- a/php.spec +++ b/php.spec @@ -102,9 +102,9 @@ #global gh_date 20200615 %global gh_owner php %global gh_project php-src -%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: %{?scl_prefix}php @@ -168,7 +168,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+) @@ -935,7 +934,6 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .bug80682 # security patches @@ -1809,6 +1807,9 @@ fi %changelog +* Thu Feb 18 2021 Remi Collet - 8.0.3~RC1-1 +- update to 8.0.3RC1 + * Tue Feb 2 2021 Remi Collet - 8.0.2-1 - Update to 8.0.2 - http://www.php.net/releases/8_0_2.php -- cgit