From 0e4b54fd34bc7769f066fad41d6d19de00d1c683 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Feb 2017 12:27:16 +0100 Subject: PHP 7.0.16RC1 rebuild with new sources --- failed.txt | 4 +--- php-upstream.patch | 21 --------------------- php70.spec | 7 ++++--- 3 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 php-upstream.patch diff --git a/failed.txt b/failed.txt index 10d8f6b..e20ec30 100644 --- a/failed.txt +++ b/failed.txt @@ -6,7 +6,7 @@ $ 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/fc22i/build.log:Tests failed : 0 -/var/lib/mock/fc22x/build.log:Tests failed : 1 +/var/lib/mock/fc22x/build.log:Tests failed : 0 /var/lib/mock/fc23i/build.log:Tests failed : 0 /var/lib/mock/fc23x/build.log:Tests failed : 0 /var/lib/mock/fc24i/build.log:Tests failed : 0 @@ -15,8 +15,6 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/fc25x/build.log:Tests failed : 0 -fc22x - 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/php70.spec b/php70.spec index df51ca8..8ee96a1 100644 --- a/php70.spec +++ b/php70.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+) @@ -1030,7 +1029,6 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .upstream # security patches @@ -2061,6 +2059,9 @@ fi %changelog +* Thu Feb 2 2017 Remi Collet - 7.0.16-0.2.RC1 +- Update to 7.0.16RC1 (new sources) + * Wed Feb 1 2017 Remi Collet 7.0.16-0.1.RC1 - Update to 7.0.16RC1 -- cgit