[packages/php] up to 5.5.11

[glen]

commit 3790806ad7e619390fb9e7bd31b20187d283e18f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Apr 27 12:00:36 2014 +0300

    up to 5.5.11

 fpm-conf-split.patch | 25 +++++++++++++++++++++----
 php.spec             | 13 +++++++------
 2 files changed, 28 insertions(+), 10 deletions(-)
---
diff --git a/php.spec b/php.spec
index 0d13036..25af9bb 100644
--- a/php.spec
+++ b/php.spec
@@ -128,7 +128,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	5
+%define		rel	1
 %define		orgname	php
 %define		ver_suffix 55
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -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.10
+Version:	5.5.11
 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:	ff7ac75abd986f591fd6fc8e997be33e
+# Source0-md5:	1559ef6444d5020670ec52ea752501ee
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
@@ -321,7 +321,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		hashver		1.0
 %define		intlver		1.1.0
 %define		jsonver		1.2.1
-%define		opcachever	7.0.3
+%define		opcachever	7.0.4-dev
 %define		pharver		2.0.2
 %define		sqlite3ver	0.7-dev
 %define		zipver		1.11.0
@@ -1982,6 +1982,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 #%{__rm} -r ext/soap/interop
 %{__rm} -r ext/xmlrpc/libxmlrpc
 #%{__rm} -r ext/zip/lib
+%{__rm} ext/date/lib/timezonedb.h
 
 cp -pf Zend/LICENSE{,.Zend}
 install -p %{SOURCE13} dep-tests.sh
@@ -2085,9 +2086,9 @@ if test "$ver" != "%{jsonver}"; then
 	: Update the jsonver macro and rebuild.
 	exit 1
 fi
-ver=$(sed -n '/#define ACCELERATOR_VERSION /{s/.* "//;s/".*$//;p}' ext/opcache/ZendAccelerator.h)
+ver=$(sed -n '/#define PHP_ZENDOPCACHE_VERSION /{s/.* "//;s/".*$//;p}' ext/opcache/ZendAccelerator.h)
 if test "$ver" != "%{opcachever}"; then
-	: Error: Upstream Zend Opcachge version is now ${ver}, expecting %{opcachever}.
+	: Error: Upstream Zend Opcache version is now ${ver}, expecting %{opcachever}.
 	: Update the opcachever macro and rebuild.
 	exit 1
 fi
diff --git a/fpm-conf-split.patch b/fpm-conf-split.patch
index 2bce0f7..f8b898a 100644
--- a/fpm-conf-split.patch
+++ b/fpm-conf-split.patch
@@ -15,7 +15,7 @@
  ;;;;;;;;;;;;;;;;;;
  ; Global Options ;
  ;;;;;;;;;;;;;;;;;;
-@@ -124,395 +116,10 @@
+@@ -116,404 +116,10 @@
  ; used in logs and stats. There is no limitation on the number of pools which
  ; FPM can handle. Your system will tell you anyway :)
  
@@ -370,6 +370,15 @@
 -; Default Value: no
 -;catch_workers_output = yes
 -
+-; Clear environment in FPM workers
+-; Prevents arbitrary environment variables from reaching FPM worker processes
+-; by clearing the environment in workers before env vars specified in this
+-; pool configuration are added.
+-; Setting to "no" will make all environment variables available to PHP code
+-; via getenv(), $_ENV and $_SERVER.
+-; Default Value: yes
+-;clear_env = no
+-
 -; Limits the extensions of the main script FPM will allow to parse. This can
 -; prevent configuration mistakes on the web server side. You should only limit
 -; FPM to .php extensions to prevent malicious users to use other extensions to
@@ -419,8 +428,8 @@
 +;  - @prefix@ otherwise
 +include=/etc/php/fpm.d/*.conf
 --- /dev/null	2007-02-13 18:29:53.000000000 +0200
-+++ php-5.5.7/sapi/fpm/php-fpm.conf-d.in	2013-12-16 17:58:04.073218925 +0200
-@@ -0,0 +1,395 @@
++++ php-5.6.0beta1/sapi/fpm/php-fpm.conf-d.in	2014-04-21 21:58:46.191751631 +0300
+@@ -0,0 +1,403 @@
 +; vim:ft=dosini
 +;
 +; Start a new pool named 'www'.
@@ -774,6 +783,15 @@
 +; Default Value: no
 +;catch_workers_output = yes
 +
++; Clear environment in FPM workers
++; Prevents arbitrary environment variables from reaching FPM worker processes
++; by clearing the environment in workers before env vars specified in this
++; pool configuration are added.
++; Setting to "no" will make all environment variables available to PHP code
++; via getenv(), $_ENV and $_SERVER.
++; Default Value: yes
++;clear_env = no
++
 +; Limits the extensions of the main script FPM will allow to parse. This can
 +; prevent configuration mistakes on the web server side. You should only limit
 +; FPM to .php extensions to prevent malicious users to use other extensions to
@@ -815,7 +833,6 @@
 +;php_admin_value[error_log] = /var/log/fpm-php.www.log
 +;php_admin_flag[log_errors] = on
 +;php_admin_value[memory_limit] = 32M
-+
 --- php-5.5.7/sapi/fpm/config.m4~	2013-12-16 17:57:03.000000000 +0200
 +++ php-5.5.7/sapi/fpm/config.m4	2013-12-16 18:00:34.936527309 +0200
 @@ -609,7 +609,7 @@
================================================================

---- gitweb:

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