From e39837ac913bd8c4ff0bf2246aeccf33c3082318 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Feb 2017 10:39:27 +0100 Subject: PHP 7.1.2RC1 rebuild with new sources --- failed.txt | 4 +--- php-upstream.patch | 21 --------------------- php71.spec | 9 +++++---- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 php-upstream.patch diff --git a/failed.txt b/failed.txt index c3a947f..38258e0 100644 --- a/failed.txt +++ b/failed.txt @@ -6,15 +6,13 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/el6x/build.log:Tests failed : 0 /var/lib/mock/el7x/build.log:Tests failed : 0 /var/lib/mock/fc23i/build.log:Tests failed : 0 -/var/lib/mock/fc23x/build.log:Tests failed : 1 +/var/lib/mock/fc23x/build.log:Tests failed : 0 /var/lib/mock/fc24i/build.log:Tests failed : 0 /var/lib/mock/fc24x/build.log:Tests failed : 0 /var/lib/mock/fc25i/build.log:Tests failed : 0 /var/lib/mock/fc25x/build.log:Tests failed : 0 -fc23x - php://input is empty when enable_post_data_reading=Off [tests/basic/bug67198.phpt] * proc_open give erratic test results :( diff --git a/php-upstream.patch b/php-upstream.patch deleted file mode 100644 index 2bd7f17..0000000 --- a/php-upstream.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0f1ae93bfa2feb3d0fd0b8d3036148df8ef856e2 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 1 Feb 2017 10:25:30 +0100 -Subject: [PATCH] fix test for 32bits (int -> float) - ---- - ext/standard/tests/serialize/bug72731.phpt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -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) diff --git a/php71.spec b/php71.spec index 53aa1ad..e59ce9e 100644 --- a/php71.spec +++ b/php71.spec @@ -121,7 +121,7 @@ %endif %global rcver RC1 -%global rpmrel 1 +%global rpmrel 2 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -177,7 +177,6 @@ Patch47: php-5.6.3-phpinfo.patch Patch91: php-5.6.3-oci8conf.patch # Upstream fixes (100+) -Patch100: php-upstream.patch # Security fixes (200+) @@ -1027,7 +1026,6 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .upstream # security patches @@ -2053,7 +2051,10 @@ fi %changelog -* Wed Feb 1 2017 Remi Collet 7.1.1-0.2.RC1 +* Thu Feb 2 2017 Remi Collet - 7.1.2-0.2.RC1 +- Update to 7.1.2RC1 (new sources) + +* Wed Feb 1 2017 Remi Collet 7.1.2-0.1.RC1 - Update to 7.1.2RC1 * Wed Jan 18 2017 Remi Collet 7.1.1-3 -- cgit