diff options
| -rw-r--r-- | failed.txt | 10 | ||||
| -rw-r--r-- | php-upstream.patch | 35 | ||||
| -rw-r--r-- | php56.spec | 7 |
3 files changed, 28 insertions, 24 deletions
@@ -1,9 +1,9 @@ -===== 5.6.30RC1 (2017-01-06) +===== 5.6.30 (2017-01-19) $ grep -r 'Tests failed' /var/lib/mock/*/build.log -/var/lib/mock/el5i/build.log:Tests failed : 8 -/var/lib/mock/el5x/build.log:Tests failed : 3 +/var/lib/mock/el5i/build.log:Tests failed : 7 +/var/lib/mock/el5x/build.log:Tests failed : 2 /var/lib/mock/el6i/build.log:Tests failed : 5 /var/lib/mock/el6x/build.log:Tests failed : 0 /var/lib/mock/el7x/build.log:Tests failed : 0 @@ -17,9 +17,7 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log el5i, el5x openssl_error_string() tests [ext/openssl/tests/openssl_error_string_basic.phpt] -el5i, el5x sni_server [ext/openssl/tests/sni_server.phpt] - * Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt] el5i, el6i, fc22i, fc23i, fc24i Bug #53437 DateInterval unserialize bad data, 32 bit [ext/date/tests/bug53437_var3.phpt] ** Bug #64146 (serialize incorrectly saving objects when they are cloned) [ext/standard/tests/serialize/bug64146.phpt] @@ -31,4 +29,4 @@ el5i, el6i * proc_open have erratic results... :( ** #64146 known issue, no fix found - +*** test fixed upstream diff --git a/php-upstream.patch b/php-upstream.patch index 790f457..16f00e6 100644 --- a/php-upstream.patch +++ b/php-upstream.patch @@ -1,21 +1,24 @@ -From db890956ecc11c090716a536b00a07f2499fa73a Mon Sep 17 00:00:00 2001 +From fb935fdaca0b1b65248c69315b1c21bd6857988c Mon Sep 17 00:00:00 2001 From: Remi Collet <remi@php.net> -Date: Fri, 6 Jan 2017 06:23:59 +0100 -Subject: [PATCH] add skip when json not loaded +Date: Thu, 19 Jan 2017 07:37:28 +0100 +Subject: [PATCH] fix test for 32bits (int -> float) --- - ext/standard/tests/serialize/bug72610_3.phpt | 2 ++ - 1 file changed, 2 insertions(+) + ext/standard/tests/serialize/bug72731.phpt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/ext/standard/tests/serialize/bug72610_3.phpt b/ext/standard/tests/serialize/bug72610_3.phpt -index 4e69087..86941f2 100644 ---- a/ext/standard/tests/serialize/bug72610_3.phpt -+++ b/ext/standard/tests/serialize/bug72610_3.phpt -@@ -1,5 +1,7 @@ - --TEST-- - __wakeup should be able to modify dynamic properties without affecting copies of those properties -+--SKIPIF-- -+<?php if (!extension_loaded("json")) print "skip json_encode needed"; ?> - --FILE-- - <?php +diff --git a/ext/standard/tests/serialize/bug72731.phpt b/ext/standard/tests/serialize/bug72731.phpt +index 3d7d1e7..020fb32 100644 +--- a/ext/standard/tests/serialize/bug72731.phpt ++++ b/ext/standard/tests/serialize/bug72731.phpt +@@ -14,5 +14,5 @@ $poc = 'O:8:"stdClass":1:{i:0;O:3:"obj":1:{s:4:"ryat";R:1;}}'; + var_dump(unserialize($poc)); + ?> +---EXPECT-- +-int(73588229205) ++--EXPECTF-- ++%s(73588229205) +-- +2.9.3 + @@ -143,7 +143,7 @@ %global db_devel libdb-devel %endif -%global rcver RC1 +#global rcver RC1 %global rpmrel 1 Summary: PHP scripting language for creating dynamic web sites @@ -970,7 +970,7 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .skip +%patch100 -p1 -b .upstream # security patches @@ -1999,6 +1999,9 @@ fi %changelog +* Thu Jan 19 2017 Remi Collet <remi@fedoraproject.org> 5.6.30-1 +- Update to 5.6.30 - http://www.php.net/releases/5_6_30.php + * Fri Jan 6 2017 Remi Collet <remi@fedoraproject.org> 5.6.30-0.1.RC1 - update to 5.6.30RC1 |