From 372cb7f92e61dda5a1191203a4e2a07b3ce003aa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Oct 2017 08:15:09 +0200 Subject: Update to 7.1.11RC1 oci8 version is now 2.1.8 --- failed.txt | 6 ++---- php-upstream.patch | 20 -------------------- php.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 php-upstream.patch diff --git a/failed.txt b/failed.txt index 519656c..55593ee 100644 --- a/failed.txt +++ b/failed.txt @@ -1,4 +1,4 @@ -===== 7.1.10 (2017-09-28) +===== 7.1.11RC1 (2017-10-12) $ grep -r 'Tests failed' /var/lib/mock/scl71*/build.log @@ -7,12 +7,10 @@ $ grep -r 'Tests failed' /var/lib/mock/scl71*/build.log /var/lib/mock/scl70fc23x/build.log:Tests failed : 0 /var/lib/mock/scl70fc24x/build.log:Tests failed : 0 /var/lib/mock/scl70fc25x/build.log:Tests failed : 0 -/var/lib/mock/scl70fc26x/build.log:Tests failed : 1 +/var/lib/mock/scl70fc26x/build.log:Tests failed : 0 /var/lib/mock/scl70fc27x/build.log:Tests failed : 0 -fc26x: - 1 Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt] 1 proc_open give erratic test results :( diff --git a/php-upstream.patch b/php-upstream.patch deleted file mode 100644 index 84862e9..0000000 --- a/php-upstream.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 7674b5e5749e8c0076357167ca553f153c94e6d1 Mon Sep 17 00:00:00 2001 -From: Anatol Belski -Date: Tue, 12 Sep 2017 18:17:28 +0200 -Subject: [PATCH] Fix test failure on 32-bit - ---- - ext/standard/tests/serialize/bug74103.phpt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/standard/tests/serialize/bug74103.phpt b/ext/standard/tests/serialize/bug74103.phpt -index 3d474b31b1cd..97076ffe466e 100644 ---- a/ext/standard/tests/serialize/bug74103.phpt -+++ b/ext/standard/tests/serialize/bug74103.phpt -@@ -5,5 +5,5 @@ Bug #74103: heap-use-after-free when uns - var_dump(unserialize('a:7:{i:0;i:04;s:1:"a";i:2;i:9617006;i:4;s:1:"a";i:4;s:1:"a";R:5;s:1:"7";R:3;s:1:"a";R:5;;s:18;}}')); - ?> - --EXPECTF-- --Notice: unserialize(): Error at offset 64 of 96 bytes in %s on line %d -+Notice: unserialize(): Error at offset %d of %d bytes in %s on line %d - bool(false) diff --git a/php.spec b/php.spec index 177934f..4d8a499 100644 --- a/php.spec +++ b/php.spec @@ -26,7 +26,7 @@ %global zendver 20160303 %global pdover 20150127 # Extension version -%global oci8ver 2.1.7 +%global oci8ver 2.1.8 # Adds -z now to the linker flags %global _hardened_build 1 @@ -120,8 +120,8 @@ %global db_devel libdb-devel %endif -%global upver 7.1.10 -#global rcver RC1 +%global upver 7.1.11 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php @@ -184,7 +184,6 @@ Patch48: php-7.1.9-openssl-load-config.patch Patch91: php-5.6.3-oci8conf.patch # Upstream fixes (100+) -Patch100: php-upstream.patch # Security fixes (200+) @@ -897,7 +896,6 @@ support for JavaScript Object Notation (JSON) to PHP. %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .up # security patches @@ -1823,6 +1821,10 @@ fi %changelog +* Wed Oct 11 2017 Remi Collet - 7.1.11~RC1-1 +- Update to 7.1.11RC1 +- oci8 version is now 2.1.8 + * Wed Sep 27 2017 Remi Collet - 7.1.10-1 - Update to 7.1.10 - http://www.php.net/releases/7_1_10.php -- cgit