From ec4b3c8b2dc8b361de312066a2227720be1b5e8f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 5 Jul 2017 14:54:24 +0200 Subject: retag --- failed.txt | 4 +++- php-upstream.patch | 10 ---------- php70.spec | 2 -- 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 php-upstream.patch diff --git a/failed.txt b/failed.txt index 9de5315..20d9093 100644 --- a/failed.txt +++ b/failed.txt @@ -5,7 +5,7 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/el6i/build.log:Tests failed : 0 /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/fc23i/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 @@ -13,6 +13,8 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log /var/lib/mock/fc25x/build.log:Tests failed : 0 +fc23i + (1) Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt] (1) proc_open give erratic test results :( diff --git a/php-upstream.patch b/php-upstream.patch deleted file mode 100644 index 2cdabc6..0000000 --- a/php-upstream.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/ext/standard/tests/serialize/bug74614.phpt b/ext/standard/tests/serialize/bug74614.phpt -index ae96262..794c871 100644 ---- a/ext/standard/tests/serialize/bug74614.phpt -+++ b/ext/standard/tests/serialize/bug74614.phpt -@@ -7,4 +7,4 @@ unserialize('a:3020000000000000000000000000000001:{i:0;a:0:{}i:1;i:2;i:2;i:3;i:3 - - ?> - --EXPECTF-- --Notice: unserialize(): Error at offset 38 of 113 bytes in %s on line %d -+Notice: unserialize(): Error at offset %d of 113 bytes in %s on line %d diff --git a/php70.spec b/php70.spec index 3382814..0365228 100644 --- a/php70.spec +++ b/php70.spec @@ -179,7 +179,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+) @@ -1025,7 +1024,6 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .upstream # security patches -- cgit