Update to 7.0.23 - http://www.php.net/releases/7_0_23.php

3 files changed, 8 insertions, 47 deletions

diff --git a/failed.txt b/failed.txt
index d87feb0..9e7e82c 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,18 +1,18 @@
-===== 7.0.23RC1 (2017-08-17)
+===== 7.0.23 (2017-08-31)
 
 $ 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/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
 
 
+el7x:
+	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 4b847a0..0000000
--- a/php-upstream.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3bc12268041bdeec9941c99f08b71620f7572eb0 Mon Sep 17 00:00:00 2001
-From: Dmitry Stogov <dmitry@zend.com>
-Date: Tue, 15 Aug 2017 13:12:54 +0300
-Subject: [PATCH] Made test 32/64-bit independent
-
----
- ext/standard/tests/serialize/bug74103.phpt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ext/standard/tests/serialize/bug74103.phpt b/ext/standard/tests/serialize/bug74103.phpt
-index 3d474b3..8123cff 100644
---- a/ext/standard/tests/serialize/bug74103.phpt
-+++ b/ext/standard/tests/serialize/bug74103.phpt
-@@ -2,8 +2,8 @@
- Bug #74103: heap-use-after-free when unserializing invalid array size
- --FILE--
- <?php
--var_dump(unserialize('a:7:{i:0;i:04;s:1:"a";i:2;i:00009617006;i:4;s:1:"a";i:4;s:1:"a";R:5;s:1:"7";R:3;s:1:"a";R:5;;s:18;}}'));
-+var_dump(unserialize('a:7:{i:0;i:04;s:1:"a";i:2;i:9617006;i:4;s:1:"a";i:4;s:1:"a";R:5;s:1:"7";R:3;s:1:"a";R:5;;s:18;}}'));
- ?>
- --EXPECTF--
--Notice: unserialize(): Error at offset 68 of 100 bytes in %s on line %d
-+Notice: unserialize(): Error at offset 64 of 96 bytes in %s on line %d
- bool(false)
--- 
-2.1.4
-
diff --git a/php70.spec b/php70.spec
index 08eeefe..f68d537 100644
--- a/php70.spec
+++ b/php70.spec
@@ -52,11 +52,7 @@
 %global with_libpcre  0
 %endif
 
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 %global with_sqlite3  1
-%else
-%global with_sqlite3  0
-%endif
 
 # Build ZTS extension or only NTS
 %global with_zts      1
@@ -100,17 +96,8 @@
 %global with_nginx     0
 %endif
 
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-%global with_dtrace 1
-%else
-%global with_dtrace 0
-%endif
-%if 0%{?fedora} < 14 && 0%{?rhel} < 5
-%global with_libgd   0
-%else
+%global with_dtrace  1
 %global with_libgd   1
-%endif
-
 %global with_libzip  1
 %global with_zip     0
 
@@ -121,7 +108,7 @@
 %endif
 
 %global upver        7.0.23
-%global rcver        RC1
+#global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
@@ -179,7 +166,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 +1011,6 @@ httpd -V  | grep -q 'threaded:.*yes' && exit 1
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
-%patch100 -p1 -b .upstream
 
 # security patches
 
@@ -2045,6 +2030,9 @@ fi
 
 
 %changelog
+* Tue Aug 29 2017 Remi Collet <remi@fedoraproject.org> - 7.0.23-1
+- Update to 7.0.23 - http://www.php.net/releases/7_0_23.php
+
 * Tue Aug 15 2017 Remi Collet <remi@fedoraproject.org> - 7.0.23~RC1-1
 - Update to 7.0.23RC1
 - oci8 version is now 2.1.7