diff options
| -rw-r--r-- | failed.txt | 2 | ||||
| -rw-r--r-- | php-upstream.patch | 10 | ||||
| -rw-r--r-- | php70.spec | 7 |
3 files changed, 17 insertions, 2 deletions
@@ -1,4 +1,4 @@ -===== 7.0.21RC1 (2017-06-22) +===== 7.0.21 (2017-07-06) $ grep -r 'Tests failed' /var/lib/mock/*/build.log diff --git a/php-upstream.patch b/php-upstream.patch new file mode 100644 index 0000000..2cdabc6 --- /dev/null +++ b/php-upstream.patch @@ -0,0 +1,10 @@ +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 @@ -121,7 +121,7 @@ %endif %global upver 7.0.21 -%global rcver RC1 +#global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -179,6 +179,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+) @@ -1024,6 +1025,7 @@ httpd -V | grep -q 'threaded:.*yes' && exit 1 %patch91 -p1 -b .remi-oci8 # upstream patches +%patch100 -p1 -b .upstream # security patches @@ -2043,6 +2045,9 @@ fi %changelog +* Tue Jul 4 2017 Remi Collet <remi@fedoraproject.org> - 7.0.21-1 +- Update to 7.0.21 - http://www.php.net/releases/7_0_21.php + * Wed Jun 21 2017 Remi Collet <remi@fedoraproject.org> - 7.0.21~RC1-1 - Update to 7.0.21RC1 - oci8 version is now 2.1.5 |