From b033e42fe5a28f06250c32a7daa22c3093572cb7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Feb 2020 14:25:54 +0100 Subject: add fix for GCC 10 --- failed.txt | 6 +++--- php.spec | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/failed.txt b/failed.txt index 49b46f3..c04d5d0 100644 --- a/failed.txt +++ b/failed.txt @@ -5,9 +5,9 @@ $ grep -r 'Tests failed' /var/lib/mock/scl56*/build.log /var/lib/mock/scl56el6x/build.log:Tests failed : 3 /var/lib/mock/scl56el7x/build.log:Tests failed : 2 /var/lib/mock/scl56el8x/build.log:Tests failed : 28 -/var/lib/mock/scl56fc29x/build.log:Tests failed : 3 /var/lib/mock/scl56fc30x/build.log:Tests failed : 3 /var/lib/mock/scl56fc31x/build.log:Tests failed : 3 +/var/lib/mock/scl56fc32x/build.log:Tests failed : 3 el6x: @@ -16,9 +16,9 @@ el6x: 3 getmxrr() test [ext/standard/tests/network/getmxrr.phpt] el7x: 2 Bug #75457 (heap-use-after-free in php7.0.25) [ext/pcre/tests/bug75457.phpt] -el7x, fc29x, fc30x, fc31x: +el7x, fc30x, fc31x, fc32x: openssl_error_string() tests [ext/openssl/tests/openssl_error_string_basic.phpt] -fc29x, fc30x, fc31x: +fc30x, fc31x, fc32x: 2 substr_compare() [ext/standard/tests/strings/substr_compare.phpt] TLS server rate-limits client-initiated renegotiation [ext/openssl/tests/stream_server_reneg_limit.phpt] diff --git a/php.spec b/php.spec index d1857e8..b469100 100644 --- a/php.spec +++ b/php.spec @@ -184,6 +184,7 @@ Patch7: php-5.3.0-recode.patch Patch8: php-5.6.17-libdb.patch Patch9: php-5.5.30-curl.patch Patch10: php-5.6.37-icu62.patch +Patch11: php-5.6.40-gcc10.patch # Functional changes Patch40: php-5.4.0-dlopen.patch @@ -946,6 +947,7 @@ support for using the enchant library to PHP. %if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 %patch10 -p1 -b .icu62 %endif +%patch11 -p1 -b .gcc10 %patch40 -p1 -b .dlopen %patch41 -p1 -b .dtrace @@ -1941,6 +1943,9 @@ EOF %changelog +* Wed Feb 19 2020 Remi Collet - 5.6.40-18.fc32 +- add fix for GCC 10 + * Tue Feb 18 2020 Remi Collet - 5.6.40-18 - phar: Fix #79082 Files added to tar with Phar::buildFromIterator have all-access permissions -- cgit