[packages/php: 24/27] Merge branch 'dev-7.0' into master

[glen]

commit f2bd7859f5c5d4890d8fb0b5087103f4c437f777
Merge: 9e9d8ae 4fd5548
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Sep 27 21:39:43 2015 +0300

    Merge branch 'dev-7.0' into master

 dep-tests.sh                         |   5 +-
 mysql-lib-ver-mismatch.patch         |  11 ----
 pcre-shared.patch                    |  44 +++++++++-----
 php-fcgi-error_log-no-newlines.patch |  10 +--
 php-fcgi-graceful.patch              |  31 +++++-----
 php-fpm-config.patch                 |  30 +++------
 php-fpm-shared.patch                 |  20 +++---
 php-ini.patch                        |  66 +++++++-------------
 php-pldlogo.patch                    |  16 ++---
 php-sapi-ini-file.patch              |  24 +++++---
 php-shared.patch                     |  90 ++++++++++++++++++++++++---
 php-silent-session-cleanup.patch     |   8 +--
 php-zlib-for-getimagesize.patch      |  12 ++--
 php.spec                             | 114 ++++++++++++++++++-----------------
 skip-tests.sh                        |  46 +-------------
 spl-shared.patch                     |   8 +--
 16 files changed, 272 insertions(+), 263 deletions(-)
---
diff --cc php.spec
index 7a86ee9,1c1b23f..0340f76
--- a/php.spec
+++ b/php.spec
@@@ -77,13 -61,10 +75,13 @@@
  %bcond_without	imap		# without IMAP extension module
  %bcond_without	interbase	# without InterBase extension module
  %bcond_without	intl		# without Intl extension module
 +%bcond_without	json		# without json extension module
  %bcond_without	ldap		# without LDAP extension module
 +%bcond_without	mbstring	# without mbstring extension module
 +%bcond_without	mcrypt		# without mbcrypt extension module
  %bcond_without	mhash		# without mhash extension (supported by hash extension)
- %bcond_without	mssql		# without MS SQL extension module
- %bcond_without	mysql		# without ext/mysql support
+ %bcond_with	mssql		# without MS SQL extension module (ext removed)
+ %bcond_with	mysql		# without ext/mysql support (ext removed)
  %bcond_without	mysqli		# without mysqli support (Requires mysql > 4.1)
  %bcond_without	mysqlnd		# without mysqlnd support in mysql related extensions
  %bcond_with	oci		# with Oracle oci8 extension module	(BR: proprietary libs)
@@@ -266,10 -241,10 +266,10 @@@ BuildRequires:	libjpeg-deve
  BuildRequires:	libltdl-devel >= 1.4
  BuildRequires:	libmcrypt-devel >= 2.4.4
  BuildRequires:	libpng-devel >= 1.0.8
- %{?with_webp:BuildRequires:	libvpx-devel}
+ %{?with_webp:BuildRequires:	libwebp-devel}
  BuildRequires:	tokyocabinet-devel
  %if "%{pld_release}" != "ac"
 -BuildRequires:	libtool >= 2:2.2
 +BuildRequires:	libtool >= 2:2.4.6
  %else
  BuildRequires:	libtool >= 1.4.3
  %endif
================================================================

---- gitweb:

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