From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 13 Nov 2017 10:11:32 +0000 (+0000)
Subject: - updated to 7.1.11
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=fc50e4061f8dc8a9a4cbcfa7deec2a3f33a723ad;p=packages%2Fphp.git

- updated to 7.1.11
---

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index c392321..da235fc 100644
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -72,16 +72,16 @@
  			for (var i=0; i<ths.length; i++) {
 --- php7.0-7.0/sapi/fpm/Makefile.frag~	2015-05-21 17:57:06.000000000 +0300
 +++ php7.0-7.0/sapi/fpm/Makefile.frag	2015-05-23 11:01:51.383332821 +0300
-@@ -11,9 +11,9 @@
- 	@$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
- 
- 	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
--	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d || :
--	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
--	@$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default || :
-+	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || :
-+	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
-+	@$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || :
- 
+@@ -14,9 +14,9 @@
+ 		echo "Installing PHP FPM defconfig:     skipping"; \
+ 	else \
+ 		echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
+-		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+-		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+-		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d; \
++		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf; \
+ 	fi
+ 	
  	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
diff --git a/php-libtool.patch b/php-libtool.patch
index c95f37f..5f2cf6e 100644
--- a/php-libtool.patch
+++ b/php-libtool.patch
@@ -8,12 +8,12 @@
  builddir="`pwd`"
  SED="@SED@"
  
--FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
+-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4"
 +FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool"
 +if [ -f "$aclocaldir/ltsugar.m4" ]; then
-+    LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
++    LIBTOOL_FILES="libtool.m4 ax_check_compile_flag.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
 +else
-+    LIBTOOL_FILES="libtool.m4"
++    LIBTOOL_FILES="libtool.m4 ax_check_compile_flag.m4"
 +fi
  FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
  CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
diff --git a/php-oracle-instantclient.patch b/php-oracle-instantclient.patch
deleted file mode 100644
index d7b7617..0000000
--- a/php-oracle-instantclient.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- php-5.3.3/ext/oci8/config.m4.orig	2010-06-25 23:18:09.000000000 +0200
-+++ php-5.3.3/ext/oci8/config.m4	2010-09-10 19:37:23.484315002 +0200
-@@ -304,6 +304,9 @@
- 
-     AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
- 
-+    dnl Header directory for Instant Client SDK PLD RPM install
-+    OCISDKPLDINC=$PHP_OCI8_INSTANT_CLIENT/../include/oracle/client
-+
-     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!'`
- 
-@@ -313,7 +316,11 @@
-     dnl Header directory for manual installation
-     OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib[/]*$!\1/include!'`
- 
--    if test -f "$OCISDKRPMINC/oci.h"; then
-+    if test -f "$OCISDKPLDINC/oci.h"; then
-+      AC_MSG_RESULT($OCISDKPLDINC)
-+      PHP_ADD_INCLUDE($OCISDKPLDINC)
-+      OCI8INCDIR=$OCISDKPLDINC
-+    elif test -f "$OCISDKRPMINC/oci.h"; then
-       AC_MSG_RESULT($OCISDKRPMINC)
-       PHP_ADD_INCLUDE($OCISDKRPMINC)
-       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 @@
- 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
-@@ -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)
-       AC_MSG_RESULT($PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include)
-+    elif test -f $PDO_OCI_IC_PREFIX/../include/oracle/client/oci.h ; then
-+      PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/../include/oracle/client)
-+      AC_MSG_RESULT($PDO_OCI_IC_PREFIX/../include/oracle/client)
-     else
-       AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
-     fi
-@@ -103,7 +103,12 @@
-     else
-       AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your Instant Client install])
-     fi
--    PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
-+    __PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
-+    if test -n "$__PDO_OCI_VERSION" ; then
-+      PDO_OCI_VERSION=$__PDO_OCI_VERSION
-+    else
-+      AC_PDO_OCI_VERSION($PDO_OCI_IC_PREFIX)
-+    fi
-   else
-     AC_PDO_OCI_CHECK_LIB_DIR($PDO_OCI_DIR)
- 
diff --git a/php.spec b/php.spec
index 5c09bbd..12c5ef9 100644
--- a/php.spec
+++ b/php.spec
@@ -142,8 +142,8 @@ 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.1
-Release:	0.1
+Version:	7.1.11
+Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -151,7 +151,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	65eef256f6e7104a05361939f5e23ada
+# Source0-md5:	bbf4dfe4f501143a1763eb86b6a0a454
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -199,7 +199,6 @@ Patch52:	pcre-shared.patch
 Patch53:	fix-test-run.patch
 Patch55:	bug-52078-fileinode.patch
 Patch59:	%{orgname}-systzdata.patch
-Patch60:	%{orgname}-oracle-instantclient.patch
 Patch62:	mcrypt-libs.patch
 Patch65:	system-libzip.patch
 Patch66:	php-db.patch
@@ -1966,7 +1965,6 @@ cp -p php.ini-production php.ini
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 %patch55 -p1
 %patch59 -p1
-%patch60 -p1
 %patch62 -p1
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
@@ -2114,8 +2112,8 @@ 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
+ver=$(awk '/#define PHP_SQLITE3_VERSION/ {print $3}' ext/sqlite3/php_sqlite3.h | xargs)
+if test "$ver" != "PHP_VERSION"; then
 	: Error: Upstream Sqlite3 version is now ${ver}, expecting %{sqlite3ver}.
 	: Update the sqlite3ver macro and rebuild.
 	exit 1