diff options
| -rw-r--r-- | failed.txt | 7 | ||||
| -rw-r--r-- | php-bug80682.patch | 30 | ||||
| -rw-r--r-- | php.spec | 9 |
3 files changed, 9 insertions, 37 deletions
@@ -1,14 +1,15 @@ -===== 7.4.15 (2021-02-02) +===== 7.4.16RC1 (2021-02-18) $ grep -ar 'Tests failed' /var/lib/mock/scl74*/build.log -/var/lib/mock/scl74el7x/build.log:Tests failed : 0 +/var/lib/mock/scl74el7x/build.log:Tests failed : 1 /var/lib/mock/scl74el8x/build.log:Tests failed : 0 -/var/lib/mock/scl74fc31x/build.log:Tests failed : 0 /var/lib/mock/scl74fc32x/build.log:Tests failed : 0 /var/lib/mock/scl74fc33x/build.log:Tests failed : 0 +el7x: + 5 Bug #80747: Providing RSA key size < 512 generates key that crash PHP [ext/openssl/tests/bug80747.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 */ @@ -100,8 +100,8 @@ #global gh_date 20190612 %global gh_owner php %global gh_project php-src -%global upver 7.4.15 -#global rcver RC2 +%global upver 7.4.16 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php @@ -163,7 +163,6 @@ Patch47: php-7.4.8-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) -Patch100: php-bug80682.patch # Security fixes (200+) @@ -937,7 +936,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 @@ -1815,6 +1813,9 @@ fi %changelog +* Tue Feb 16 2021 Remi Collet <remi@remirepo.net> - 7.4.16~RC1-1 +- update to 7.4.16RC1 + * Tue Feb 2 2021 Remi Collet <remi@remirepo.net> - 7.4.15-1 - Update to 7.4.15 - http://www.php.net/releases/7_4_15.php |