Update to 7.0.23RC1

oci8 version is now 2.1.7

4 files changed, 42 insertions, 66 deletions

diff --git a/failed.txt b/failed.txt
index 84e3481..d87feb0 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,11 +1,11 @@
-===== 7.0.22 (2017-08-03)
+===== 7.0.23RC1 (2017-08-17)
 
 $ 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    :    1
+/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
@@ -13,8 +13,6 @@ $ grep -r 'Tests failed' /var/lib/mock/*/build.log
 /var/lib/mock/fc25x/build.log:Tests failed    :    0
 
 
-fc23i
-	1	Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
 
 
 (1)	proc_open give erratic test results :(
diff --git a/php-sqlite3.patch b/php-sqlite3.patch
deleted file mode 100644
index cdb7d84..0000000
--- a/php-sqlite3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 666cb6c80226467be262c088a26246c48cdef7e5 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Wed, 2 Aug 2017 14:01:56 +0200
-Subject: [PATCH] fix build with old system libsqlite (sqlite3_errstr may be
- missing)
-
----
- ext/sqlite3/config0.m4 | 5 ++++-
- ext/sqlite3/sqlite3.c  | 4 ++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
-index 3aa4492..ba760e1 100644
---- a/ext/sqlite3/config0.m4
-+++ b/ext/sqlite3/config0.m4
-@@ -53,6 +53,9 @@ if test $PHP_SQLITE3 != "no"; then
-     PHP_CHECK_LIBRARY(sqlite3,sqlite3_column_table_name,[
-       AC_DEFINE(SQLITE_ENABLE_COLUMN_METADATA, 1, [have sqlite3 with column metadata enabled])
-     ])
-+    PHP_CHECK_LIBRARY(sqlite3,sqlite3_errstr,[
-+      AC_DEFINE(HAVE_SQLITE3_ERRSTR, 1, [have sqlite3_errstr function])
-+    ])
- 
-     PHP_CHECK_LIBRARY(sqlite3,sqlite3_load_extension,
-     [],
-@@ -75,7 +78,7 @@ if test $PHP_SQLITE3 != "no"; then
-       debug_flags="-DSQLITE_DEBUG=1"
-     fi
- 
--    other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1"
-+    other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DHAVE_SQLITE3_ERRSTR=1"
- 
- 	dnl As long as intl is not shared we can have ICU support
-     if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then
-diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
-index dcbc03c..a22f455 100644
---- a/ext/sqlite3/sqlite3.c
-+++ b/ext/sqlite3/sqlite3.c
-@@ -148,7 +148,11 @@ PHP_METHOD(sqlite3, open)
- #endif
- 	if (rc != SQLITE_OK) {
- 		zend_throw_exception_ex(zend_ce_exception, 0, "Unable to open database: %s",
-+#ifdef HAVE_SQLITE3_ERRSTR
- 				db_obj->db ? sqlite3_errmsg(db_obj->db) : sqlite3_errstr(rc));
-+#else
-+				db_obj->db ? sqlite3_errmsg(db_obj->db) : "");
-+#endif
- 		if (fullpath != filename) {
- 			efree(fullpath);
- 		}
--- 
-2.1.4
-
diff --git a/php-upstream.patch b/php-upstream.patch
new file mode 100644
index 0000000..4b847a0
--- /dev/null
+++ b/php-upstream.patch
@@ -0,0 +1,27 @@
+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 2cea8b9..08eeefe 100644
--- a/php70.spec
+++ b/php70.spec
@@ -14,7 +14,7 @@
 %global pdover      20150127
 # Extension version
 %global fileinfover 1.0.5
-%global oci8ver     2.1.6
+%global oci8ver     2.1.7
 %global zipver      1.13.0
 %global jsonver     1.4.0
 
@@ -120,13 +120,13 @@
 %global db_devel  libdb-devel
 %endif
 
-%global upver        7.0.22
-#global rcver        RC1
+%global upver        7.0.23
+%global rcver        RC1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -162,7 +162,6 @@ Patch6: php-5.6.3-embed.patch
 Patch7: php-5.3.0-recode.patch
 Patch8: php-7.0.2-libdb.patch
 Patch9: php-7.0.7-curl.patch
-Patch10: php-sqlite3.patch
 
 # Functional changes
 Patch40: php-7.0.17-dlopen.patch
@@ -180,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+)
 
@@ -1010,10 +1010,9 @@ httpd -V  | grep -q 'threaded:.*yes' && exit 1
 %if 0%{?rhel}
 %patch9 -p1 -b .curltls
 %endif
-%patch10 -p1 -b .errstr
 
 %patch40 -p1 -b .dlopen
-%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
 %patch42 -p1 -b .systzdata
 %endif
 %patch43 -p1 -b .headers
@@ -1026,6 +1025,7 @@ httpd -V  | grep -q 'threaded:.*yes' && exit 1
 %patch91 -p1 -b .remi-oci8
 
 # upstream patches
+%patch100 -p1 -b .upstream
 
 # security patches
 
@@ -1254,7 +1254,7 @@ ln -sf ../configure
     --with-layout=GNU \
     --with-kerberos \
     --with-libxml-dir=%{_prefix} \
-%if 0%{?fedora} >= 24 || 0%{?rhel} >= 5
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 6
     --with-system-tzdata \
 %endif
     --with-mhash \
@@ -1808,7 +1808,7 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 
 
 %pre common
-%if %{?fedora}%{!?fedora:99} < 24
+%if %{?fedora}%{!?fedora:99} < 25
 echo -e "WARNING : Fedora %{fedora} is now EOL :"
 echo -e "You should consider upgrading to a supported release.\n"
 %endif
@@ -2045,6 +2045,10 @@ fi
 
 
 %changelog
+* 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
+
 * Wed Aug  2 2017 Remi Collet <remi@fedoraproject.org> - 7.0.22-2
 - add patch for EL-6, fix undefined symbol: sqlite3_errstr