[packages/php] up to 5.5.12, fixes CVE-2014-0185

[glen]

commit 4d2419195efa4b1eca05f679be12eccf6489e887
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri May 2 11:15:05 2014 +0300

    up to 5.5.12, fixes CVE-2014-0185

 fpm-conf-split.patch | 12 ++++++------
 php.spec             |  8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/php.spec b/php.spec
index 563e1c6..978af4a 100644
--- a/php.spec
+++ b/php.spec
@@ -139,13 +139,13 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	5.5.11
+Version:	5.5.12
 Release:	%{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	1559ef6444d5020670ec52ea752501ee
+# Source0-md5:	3fb091987063135fd86b3b5ba5010479
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -2326,6 +2326,10 @@ cp -af Makefile.cli Makefile
 %{__make} -f Makefile.litespeed
 %endif
 
+%if %{with embed}
+%{__make} -f Makefile.embed libphp5.la
+%endif
+
 # CGI/FCGI
 %if %{with cgi}
 cp -pf php_config.h.cgi-fcgi main/php_config.h
diff --git a/fpm-conf-split.patch b/fpm-conf-split.patch
index f8b898a..be1b1bc 100644
--- a/fpm-conf-split.patch
+++ b/fpm-conf-split.patch
@@ -61,10 +61,10 @@
 -; permissions must be set in order to allow connections from a web server. Many
 -; BSD-derived systems allow connections regardless of permissions. 
 -; Default Values: user and group are set as the running user
--;                 mode is set to 0666
+-;                 mode is set to 0660
 -;listen.owner = @php_fpm_user@
 -;listen.group = @php_fpm_group@
--;listen.mode = 0666
+-;listen.mode = 0660
 - 
 -; List of ipv4 addresses of FastCGI clients which are allowed to connect.
 -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
@@ -80,7 +80,7 @@
 -;       - The pool processes will inherit the master process priority
 -;         unless it specified otherwise
 -; Default Value: no set
--; priority = -19
+-; process.priority = -19
 -
 -; Choose how the process manager will control the number of child processes.
 -; Possible Values:
@@ -474,10 +474,10 @@
 +; permissions must be set in order to allow connections from a web server. Many
 +; BSD-derived systems allow connections regardless of permissions. 
 +; Default Values: user and group are set as the running user
-+;                 mode is set to 0666
++;                 mode is set to 0660
 +;listen.owner = @php_fpm_user@
 +;listen.group = @php_fpm_group@
-+;listen.mode = 0666
++;listen.mode = 0660
 + 
 +; List of ipv4 addresses of FastCGI clients which are allowed to connect.
 +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
@@ -493,7 +493,7 @@
 +;       - The pool processes will inherit the master process priority
 +;         unless it specified otherwise
 +; Default Value: no set
-+; priority = -19
++; process.priority = -19
 +
 +; Choose how the process manager will control the number of child processes.
 +; Possible Values:
================================================================

---- gitweb:

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