diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | failed.txt | 35 | ||||
| -rw-r--r-- | php-7.0.10-datetests.patch | 24 | ||||
| -rw-r--r-- | php-upstream.patch | 131 | ||||
| -rw-r--r-- | php.spec | 9 |
5 files changed, 156 insertions, 45 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6ba34ac --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +php-*.tar.xz +php71-php-*src.rpm @@ -1,27 +1,24 @@ -===== 7.1.3 (2017-03-16) +===== 7.1.4RC1 (2017-03-30) $ grep -r 'Tests failed' /var/lib/mock/scl71*/build.log -/var/lib/mock/scl70el6x/build.log:Tests failed : 0 -/var/lib/mock/scl70el7x/build.log:Tests failed : 0 -/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 : 9 +/var/lib/mock/scl70el6x/build.log:Tests failed : 1 +/var/lib/mock/scl70el7x/build.log:Tests failed : 1 +/var/lib/mock/scl70fc23x/build.log:Tests failed : 1 +/var/lib/mock/scl70fc24x/build.log:Tests failed : 2 +/var/lib/mock/scl70fc25x/build.log:Tests failed : 2 +/var/lib/mock/scl70fc26x/build.log:Tests failed : 1 +el6x, el7x, fc24x, fc25x + (4) Bug #33415 [2] (Possibly invalid non-one-hour DST or timezone shifts) [ext/date/tests/bug33415-2.phpt] +fc23x, fc24x, fc25x + (2) Bug #73837: Milliseconds in DateTime() [ext/date/tests/bug73837.phpt] fc26x - Bug #20382 [2] (strtotime ("Monday", $date) produces wrong result on DST changeover) [ext/date/tests/bug20382-2.phpt] - Bug #27780 (strtotime(+1 xxx) returns a wrong date/time) [ext/date/tests/bug27780.phpt] - Bug #32086 (strtotime don't work in DST) [ext/date/tests/bug32086.phpt] - Bug #33414 [1] (Comprehensive list of incorrect days returned after strotime() / date() tests) [ext/date/tests/bug33414-1.phpt] - Bug #33414 [2] (Comprehensive list of incorrect days returned after strotime() / date() tests) [ext/date/tests/bug33414-2.phpt] - Bug #33415 [1] (Possibly invalid non-one-hour DST or timezone shifts) [ext/date/tests/bug33415-1.phpt] - Bug #33415 [2] (Possibly invalid non-one-hour DST or timezone shifts) [ext/date/tests/bug33415-2.phpt] - date_modify() function [1] [ext/date/tests/date_modify-1.phpt] - sni_server [ext/openssl/tests/sni_server.phpt] + (3) ext/openssl/tests/sni_server.phpt - -* proc_open give erratic test results :( -*** f26 failures related to tzdata 2016j vs 2017a and sni_server is a known issue with openssl 1.1 +(1) proc_open give erratic test results :( +(2) test issue (fixed upstream) +(3) known issue +(4) bugs related to tzdata 2017a (repo) vs 2017b (php) diff --git a/php-7.0.10-datetests.patch b/php-7.0.10-datetests.patch index c3a65e9..7df99a5 100644 --- a/php-7.0.10-datetests.patch +++ b/php-7.0.10-datetests.patch @@ -42,27 +42,3 @@ diff -up ./ext/date/tests/strtotime3-64bit.phpt.datetests ./ext/date/tests/strto string(31) "Fri, 16 Jun 2006 02:22:33 +0100" bool(false) string(31) "Tue, 02 Mar 2004 00:00:00 +0000" -diff -up ./ext/date/tests/bug33414-2.phpt.datetests ./ext/date/tests/bug33414-2.phpt ---- ./ext/date/tests/bug33414-2.phpt.datetests 2016-07-21 02:23:03.000000000 +0200 -+++ ./ext/date/tests/bug33414-2.phpt 2016-07-26 07:28:10.323598643 +0200 -@@ -74,7 +74,7 @@ $strtotime_tstamp = strtotime("next Frid - print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; - print "wanted=Friday 00:00:00\n\n"; - ?> ----EXPECT-- -+--EXPECTF-- - TZ=Pacific/Rarotonga - wrong day. - tStamp=Thursday 1970-01-01 17:17:17 CKT 0 - result=Tuesday 1970-01-06 00:00:00 CKT 0 -@@ -106,8 +106,8 @@ result=Tuesday 2005-04-12 00:00:00 CDT 1 - wanted=Tuesday 00:00:00 - - TZ=Pacific/Pitcairn - wrong day. --tStamp=Thursday 1970-01-01 17:17:17 PNT 0 --result=Wednesday 1970-01-07 00:00:00 PNT 0 -+tStamp=Thursday 1970-%s -+result=Wednesday 1970-%s - wanted=Wednesday 00:00:00 - - TZ=Pacific/Fakaofo - wrong day. - diff --git a/php-upstream.patch b/php-upstream.patch new file mode 100644 index 0000000..a36a4f9 --- /dev/null +++ b/php-upstream.patch @@ -0,0 +1,131 @@ +From d11211fb5379324e99dc67cdd7a0ec5031874ae7 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Wed, 29 Mar 2017 07:01:14 +0200 +Subject: [PATCH] relax test failing in fast computer + +--- + ext/date/tests/bug73837.phpt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ext/date/tests/bug73837.phpt b/ext/date/tests/bug73837.phpt +index 220deb6..af47cfd 100644 +--- a/ext/date/tests/bug73837.phpt ++++ b/ext/date/tests/bug73837.phpt +@@ -11,7 +11,9 @@ for ( $i = 0; $i < 1000; $i++ ) + $collect[$key] = true; + } + +-echo ( count( $collect ) > 990 ) ? "microseconds differ\n" : "microseconds do not differ enough\n"; ++var_dump($n = count( $collect )); ++echo ( $n > 900 ) ? "microseconds differ\n" : "microseconds do not differ enough\n"; + ?> +---EXPECT-- ++--EXPECTF-- ++int(%d) + microseconds differ +-- +2.1.4 + +From 012dc336a6ae01208c394994b648c221337bf81d Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Wed, 29 Mar 2017 07:25:01 +0200 +Subject: [PATCH] Fix buid with system libsqlite, see bug #74217 + +SQLITE_DETERMINISTIC only exists in recent version +e.g. missing on 3.7 which is the default on RHEL/CentOS-7 +and probably others (wheezy have 3.7, jessie 3.8...) +--- + ext/pdo_sqlite/pdo_sqlite.c | 2 ++ + ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt | 5 ++++- + ext/sqlite3/sqlite3.c | 2 ++ + ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt | 5 ++++- + 4 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c +index 621123b..d0eb182 100644 +--- a/ext/pdo_sqlite/pdo_sqlite.c ++++ b/ext/pdo_sqlite/pdo_sqlite.c +@@ -69,7 +69,9 @@ ZEND_GET_MODULE(pdo_sqlite) + /* {{{ PHP_MINIT_FUNCTION */ + PHP_MINIT_FUNCTION(pdo_sqlite) + { ++#ifdef SQLITE_DETERMINISTIC + REGISTER_PDO_CLASS_CONST_LONG("SQLITE_DETERMINISTIC", (zend_long)SQLITE_DETERMINISTIC); ++#endif + + return php_pdo_register_driver(&pdo_sqlite_driver); + } +diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt +index 4f0b675..d826d93 100644 +--- a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt ++++ b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_with_flags.phpt +@@ -1,7 +1,10 @@ + --TEST-- + PDO_sqlite: Testing sqliteCreateFunction() with flags + --SKIPIF-- +-<?php if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?> ++<?php ++if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ++if (!defined('PDO::SQLITE_DETERMINISTIC')) die('skip system sqlite is to old'); ++?> + --FILE-- + <?php + +diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c +index 5a796e1..f1ed93b 100644 +--- a/ext/sqlite3/sqlite3.c ++++ b/ext/sqlite3/sqlite3.c +@@ -2283,7 +2283,9 @@ PHP_MINIT_FUNCTION(sqlite3) + REGISTER_LONG_CONSTANT("SQLITE3_OPEN_READWRITE", SQLITE_OPEN_READWRITE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("SQLITE3_OPEN_CREATE", SQLITE_OPEN_CREATE, CONST_CS | CONST_PERSISTENT); + ++#ifdef SQLITE_DETERMINISTIC + REGISTER_LONG_CONSTANT("SQLITE3_DETERMINISTIC", SQLITE_DETERMINISTIC, CONST_CS | CONST_PERSISTENT); ++#endif + + return SUCCESS; + } +diff --git a/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt b/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt +index 31fd42b..f9f0b5f 100644 +--- a/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt ++++ b/ext/sqlite3/tests/sqlite3_37_createfunction_flags.phpt +@@ -1,7 +1,10 @@ + --TEST-- + SQLite3::createFunction - Test with flags + --SKIPIF-- +-<?php require_once(__DIR__ . '/skipif.inc'); ?> ++<?php ++require_once(__DIR__ . '/skipif.inc'); ++if (!defined('SQLITE3_DETERMINISTIC')) die('skip system sqlite is to old'); ++?> + --FILE-- + <?php + +-- +2.1.4 + +From cec720857a21873864badc53c10d660b673e38cc Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Wed, 29 Mar 2017 07:38:40 +0200 +Subject: [PATCH] relax more this test + +--- + ext/date/tests/bug73837.phpt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/date/tests/bug73837.phpt b/ext/date/tests/bug73837.phpt +index af47cfd..6fd12f8 100644 +--- a/ext/date/tests/bug73837.phpt ++++ b/ext/date/tests/bug73837.phpt +@@ -12,7 +12,7 @@ for ( $i = 0; $i < 1000; $i++ ) + } + + var_dump($n = count( $collect )); +-echo ( $n > 900 ) ? "microseconds differ\n" : "microseconds do not differ enough\n"; ++echo ( $n > 800 ) ? "microseconds differ\n" : "microseconds do not differ enough ($n)\n"; + ?> + --EXPECTF-- + int(%d) +-- +2.1.4 + @@ -124,13 +124,13 @@ %global db_devel libdb-devel %endif -#global rcver RC1 +%global rcver RC1 %global rpmrel 1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php -Version: 7.1.3 +Version: 7.1.4 Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -185,6 +185,7 @@ Patch47: php-5.6.3-phpinfo.patch Patch91: php-5.6.3-oci8conf.patch # Upstream fixes (100+) +Patch100: php-upstream.patch # Security fixes (200+) @@ -891,6 +892,7 @@ support for JavaScript Object Notation (JSON) to PHP. %patch91 -p1 -b .remi-oci8 # upstream patches +%patch100 -p1 -b .up # security patches @@ -1813,6 +1815,9 @@ fi %changelog +* Tue Mar 28 2017 Remi Collet <remi@fedoraproject.org> 7.1.4-0.1.RC1 +- Update to 7.1.4RC1 + * Tue Mar 14 2017 Remi Collet <remi@fedoraproject.org> - 7.1.3-1 - Update to 7.1.3 - http://www.php.net/releases/7_1_3.php |