[packages/php] - up to 7.1.8; sqlite no longer separately versioned

[arekm]

commit f2e9281812c41ede0b0b471af38cc09e93c42456
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Aug 4 10:34:53 2017 +0200

    - up to 7.1.8; sqlite no longer separately versioned

 php-oracle-instantclient.patch | 17 +++++++----------
 php.spec                       | 18 +++++++++---------
 2 files changed, 16 insertions(+), 19 deletions(-)
---
diff --git a/php.spec b/php.spec
index fecca11..bcf8771 100644
--- a/php.spec
+++ b/php.spec
@@ -149,7 +149,7 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	7.1.6
+Version:	7.1.8
 Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -158,7 +158,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	eafc7a79cc8cc62c9292c96f9c9ccf90
+# Source0-md5:	937dba5d7f12bca3c6864db52ea499e1
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -312,7 +312,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		intlver		1.1.0
 %define		jsonver		1.5.0
 %define		pharver		2.0.2
-%define		sqlite3ver	0.7-dev
+%define		sqlite3ver	%{version}
 %define		zipver		1.13.5
 %define		phpdbgver	0.5.0
 
@@ -2162,12 +2162,12 @@ if test "$ver" != "%{pharver}"; then
 	: Update the pharver macro and rebuild.
 	exit 1
 fi
-ver=$(sed -n '/#define PHP_SQLITE3_VERSION/{s/.* "//;s/".*$//;p}' ext/sqlite3/php_sqlite3.h)
-if test "$ver" != "%{sqlite3ver}"; then
-	: Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
-	: Update the sqlite3ver macro and rebuild.
-	exit 1
-fi
+#ver=$(sed -n '/#define PHP_SQLITE3_VERSION/{s/.* "//;s/".*$//;p}' ext/sqlite3/php_sqlite3.h)
+#if test "$ver" != "%{sqlite3ver}"; then
+#	: Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
+#	: Update the sqlite3ver macro and rebuild.
+#	exit 1
+#fi
 ver=$(sed -n '/#define PHP_ZIP_VERSION /{s/.* "//;s/".*$//;p}' ext/zip/php_zip.h)
 if test "$ver" != "%{zipver}"; then
 	: Error: Upstream ZIP version is now ${ver}, expecting %{zipver}.
diff --git a/php-oracle-instantclient.patch b/php-oracle-instantclient.patch
index d7b7617..7e5ffa9 100644
--- a/php-oracle-instantclient.patch
+++ b/php-oracle-instantclient.patch
@@ -25,18 +25,15 @@
        OCI8INCDIR=$OCISDKRPMINC
 --- php-5.4.0alpha2/ext/pdo_oci/config.m4~	2011-08-07 12:46:31.000000000 +0300
 +++ php-5.4.0alpha2/ext/pdo_oci/config.m4	2011-08-07 12:48:24.712839499 +0300
-@@ -6,8 +6,10 @@
+@@ -17,7 +17,7 @@ fi
+ 
  AC_DEFUN([AC_PDO_OCI_VERSION],[
    AC_MSG_CHECKING([Oracle version])
-   for OCI_VER in $SUPPORTED_LIB_VERS; do
--    if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
-+    if test -f $1/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
-       PDO_OCI_VERSION="$OCI_VER"
-+    elif test -f $1/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
-+      PDO_OCI_VERSION="$OCI_VER"
-     fi
-   done
-   if test -z "$PDO_OCI_VERSION"; then
+-  PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
++  PDO_OCI_LCS_BASE=$1/libclntsh.$SHLIB_SUFFIX_NAME
+   PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1`  # Oracle 10g, 11g, 12c etc
+   if test -f "$PDO_OCI_LCS"; then
+     dnl Oracle 10g, 11g 12c etc.  The x.2 version libraries are named x.1 for drop in compatibility
 @@ -103,6 +103,9 @@
      elif test -f $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include/oci.h ; then
        PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/f2e9281812c41ede0b0b471af38cc09e93c42456