[packages/php: 48/49] Merge branch 'PHP_5_6'

[glen]

commit 76178fddebceacb12ce8000f092333cbee4c1c9a
Merge: 762ec2e 1a0f4cc
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Feb 27 17:30:11 2015 +0200

    Merge branch 'PHP_5_6'
    
    Conflicts:
          fpm-conf-split.patch
          php.spec

 fpm-conf-split.patch |  54 +++++++++--------
 libtool-tag.patch    |  12 ++++
 milter.patch         |  28 +++++++++
 mysqlnd-ssl.patch    |  24 ++++++++
 php-fpm-config.patch |  66 +++++++++++++--------
 php-ini.patch        |  48 ++++++++-------
 php-pldlogo.patch    |  12 ++--
 php.spec             | 163 ++++++++++++++++++++++++++++++++++++++++++---------
 8 files changed, 306 insertions(+), 101 deletions(-)
---
diff --cc php.spec
index 714710d,441df91..15577f8
--- a/php.spec
+++ b/php.spec
@@@ -105,7 -108,12 +108,12 @@@
  %undefine	with_mm
  %endif
  
+ # milter requires ZTS
+ %if %{with milter} && %{without zts}
+ %undefine	with_milter
+ %endif
+ 
 -%ifnarch %{ix86} %{x8664} sparc sparcv9 alpha
 +%ifnarch %{ix86} %{x8664} x32 sparc sparcv9 alpha
  # ppc disabled (broken on th-ppc)
  %undefine	with_interbase
  %endif
@@@ -126,9 -134,9 +134,9 @@@ ERROR: You need to select at least one 
  %undefine	with_filter
  %endif
  
 -%define		rel	1
 +%define		rel	4
  %define		orgname	php
- %define		ver_suffix 55
+ %define		ver_suffix 56
  %define		php_suffix %{!?with_default_php:%{ver_suffix}}
  Summary:	PHP: Hypertext Preprocessor
  Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
@@@ -204,8 -214,8 +213,9 @@@ Patch63:	%{orgname}-mysql-nowarning.pat
  Patch65:	system-libzip.patch
  Patch66:	php-db.patch
  Patch67:	mysql-lib-ver-mismatch.patch
 +Patch68:	x32.patch
  Patch69:	fpm-conf-split.patch
+ Patch70:	mysqlnd-ssl.patch
  URL:		http://www.php.net/
  %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
  %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@@ -2025,8 -2069,7 +2068,8 @@@ exit 
  %{?with_system_libzip:%patch65 -p1}
  %patch66 -p1
  %patch67 -p1
 +%patch68 -p1
- %patch69 -p1
+ %patch70 -p1
  
  sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
  
================================================================

---- gitweb:

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