v7.2.0alpha2

4 files changed, 47 insertions, 49 deletions

diff --git a/failed.txt b/failed.txt
index e4438bb..462d312 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,15 +1,13 @@
-===== 7.1.0alpha1 (20170608)
+===== 7.1.0alpha2 (2017-06-22)
 
 $ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log
 /var/lib/mock/scl72el6x/build.log:Tests failed    :     0
 /var/lib/mock/scl72el7x/build.log:Tests failed    :     0
 /var/lib/mock/scl70fc24x/build.log:Tests failed    :    0
-/var/lib/mock/scl70fc25x/build.log:Tests failed    :    1
+/var/lib/mock/scl70fc25x/build.log:Tests failed    :    0
 /var/lib/mock/scl70fc26x/build.log:Tests failed    :    0
 
 
-fc25x
-	(3)	ext/date/tests/bug73837.phpt
 
 
 (1)	proc_open give erratic test results :(
diff --git a/php-5.6.3-oci8conf.patch b/php-5.6.3-oci8conf.patch
deleted file mode 100644
index f2d8f99..0000000
--- a/php-5.6.3-oci8conf.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up php5.3-201104170830/ext/ldap/php_ldap.h.remi-oci8 php5.3-201104170830/ext/ldap/php_ldap.h
---- php5.3-201104170830/ext/ldap/php_ldap.h.remi-oci8	2011-01-01 04:37:23.000000000 +0100
-+++ php5.3-201104170830/ext/ldap/php_ldap.h	2011-04-17 11:55:25.630871609 +0200
-@@ -27,7 +27,7 @@
- #include <lber.h>
- #endif
- 
--#include <ldap.h>
-+#include "/usr/include/ldap.h"
- 
- extern zend_module_entry ldap_module_entry;
- #define ldap_module_ptr &ldap_module_entry
-diff -up php5.3-201104170830/ext/oci8/config.m4.remi-oci8 php5.3-201104170830/ext/oci8/config.m4
---- php5.3-201104170830/ext/oci8/config.m4.remi-oci8	2011-03-30 00:35:22.000000000 +0200
-+++ php5.3-201104170830/ext/oci8/config.m4	2011-04-17 11:55:25.628871315 +0200
-@@ -376,6 +376,7 @@ if test "$PHP_OCI8" != "no"; then
- 
-     dnl Header directory for Instant Client SDK RPM install
-     OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'`
-+    OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/\(lib64\|lib\)/oracle/\(.*\)/\(client64\|client\)/lib[/]*$!/usr/include/oracle/\2/\3!'`
- 
-     dnl Header directory for Instant Client SDK zip file install
-     OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
-diff -up php5.3-201104170830/ext/pdo_oci/config.m4.remi-oci8 php5.3-201104170830/ext/pdo_oci/config.m4
---- php5.3-201104170830/ext/pdo_oci/config.m4.remi-oci8	2011-04-02 04:35:24.000000000 +0200
-+++ php5.3-201104170830/ext/pdo_oci/config.m4	2011-04-17 12:02:42.837194120 +0200
-@@ -104,8 +104,10 @@ You need to tell me where to find your O
-     else
-       AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
-     fi
--    if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
--    PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib"
-+    if test -f "$PDO_OCI_IC_PREFIX/lib64/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
-+      PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib64/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib"
-+    elif test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
-+      PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib"
-     elif test -f "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
-       PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/lib"
-     elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.$SHLIB_SUFFIX_NAME" ; then
diff --git a/php-7.2.0-oci8conf.patch b/php-7.2.0-oci8conf.patch
new file mode 100644
index 0000000..0ad16a1
--- /dev/null
+++ b/php-7.2.0-oci8conf.patch
@@ -0,0 +1,35 @@
+diff -up ./ext/ldap/php_ldap.h.remi-oci8 ./ext/ldap/php_ldap.h
+--- ./ext/ldap/php_ldap.h.remi-oci8	2017-06-20 15:45:35.000000000 +0200
++++ ./ext/ldap/php_ldap.h	2017-06-20 16:55:01.640203868 +0200
+@@ -27,7 +27,7 @@
+ #include <lber.h>
+ #endif
+ 
+-#include <ldap.h>
++#include "/usr/include/ldap.h"
+ 
+ extern zend_module_entry ldap_module_entry;
+ #define ldap_module_ptr &ldap_module_entry
+diff -up ./ext/oci8/config.m4.remi-oci8 ./ext/oci8/config.m4
+--- ./ext/oci8/config.m4.remi-oci8	2017-06-20 15:45:39.000000000 +0200
++++ ./ext/oci8/config.m4	2017-06-20 16:55:01.640203868 +0200
+@@ -372,6 +372,7 @@ if test "$PHP_OCI8" != "no"; then
+ 
+     dnl Header directory for Instant Client SDK RPM install
+     OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'`
++    OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/\(lib64\|lib\)/oracle/\(.*\)/\(client64\|client\)/lib[/]*$!/usr/include/oracle/\2/\3!'`
+ 
+     dnl Header directory for Instant Client SDK zip file install
+     OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
+diff -up ./ext/pdo_oci/config.m4.remi-oci8 ./ext/pdo_oci/config.m4
+--- ./ext/pdo_oci/config.m4.remi-oci8	2017-06-20 16:55:01.640203868 +0200
++++ ./ext/pdo_oci/config.m4	2017-06-20 17:16:03.053538358 +0200
+@@ -93,7 +93,7 @@ if test "$PHP_PDO_OCI" != "no"; then
+ 
+     AC_MSG_CHECKING([for oci.h])
+     dnl Header directory for Instant Client SDK RPM install
+-    OCISDKRPMINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib/oracle/\(.*\)/\('${PDO_OCI_CLIENT_DIR}'\)/lib[/]*$!\1/include/oracle/\2/\3!'`
++    OCISDKRPMINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/\(lib64\|lib\)/oracle/\(.*\)/\('${PDO_OCI_CLIENT_DIR}'\)/lib[/]*$!\1/include/oracle/\3/\4!'`
+ 
+     dnl Header directory for manual installation
+     OCISDKMANINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib[/]*$!\1/include!'`
diff --git a/php.spec b/php.spec
index d994696..137fb67 100644
--- a/php.spec
+++ b/php.spec
@@ -23,10 +23,10 @@
 
 # API/ABI check
 %global apiver      20160731
-%global zendver     20160303
+%global zendver     20160731
 %global pdover      20170320
 # Extension version
-%global oci8ver     2.1.4
+%global oci8ver     2.1.5
 
 # Adds -z now to the linker flags
 %global _hardened_build 1
@@ -133,8 +133,8 @@
 #global gh_date      20170602
 %global gh_owner     php
 %global gh_project   php-src
-%global rcver        alpha1
-%global rpmrel       8
+%global rcver        alpha2
+%global rpmrel       9
 
 
 Summary: PHP scripting language for creating dynamic web sites
@@ -195,7 +195,7 @@ Patch46: php-7.2.0-fixheader.patch
 Patch47: php-5.6.3-phpinfo.patch
 
 # RC Patch
-Patch91: php-5.6.3-oci8conf.patch
+Patch91: php-7.2.0-oci8conf.patch
 
 # Upstream fixes (100+)
 
@@ -1190,7 +1190,7 @@ build --libdir=%{_libdir}/php \
       --with-mysql-sock=%{mysql_sock} \
 %if %{with_oci8}
       --with-oci8=shared,instantclient,%{_root_libdir}/oracle/%{oraclever}/client64/lib,%{oraclever} \
-      --with-pdo-oci=shared,instantclient,%{_root_prefix},%{oraclever} \
+      --with-pdo-oci=shared,instantclient,%{_root_libdir}/oracle/%{oraclever}/client64/lib,%{oraclever} \
 %endif
 %if %{with_interbase}
       --with-interbase=shared \
@@ -1821,6 +1821,10 @@ fi
 
 
 %changelog
+* Tue Jun 20 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.9.alpha2
+- update to 7.2.0alpha2
+- oci8 version is now 2.1.5
+
 * Tue Jun  6 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.8.alpha1
 - update to 7.2.0alpha1