[packages/php/PHP_5_6] up to 5.6.3

glen glen at pld-linux.org
Mon Nov 17 21:34:11 CET 2014


commit b68c8f6cf6adb14ca5178d69a337cac7db8690e9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Nov 17 20:10:40 2014 +0200

    up to 5.6.3

 fpm-conf-split.patch | 14 +++++++++-----
 php.spec             |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/php.spec b/php.spec
index 7178f89..88dc501 100644
--- a/php.spec
+++ b/php.spec
@@ -145,13 +145,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.6.2
+Version:	5.6.3
 Release:	%{rel}%{?with_type_hints:.th}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	c976f54d429a0e5214659b0098e44e37
+# Source0-md5:	7635f344145a4edd7dff6ecec795aaea
 Source2:	%{orgname}-mod_%{orgname}.conf
 Source3:	%{orgname}-cgi-fcgi.ini
 Source4:	%{orgname}-apache.ini
diff --git a/fpm-conf-split.patch b/fpm-conf-split.patch
index 0b1784b..5398f8b 100644
--- a/fpm-conf-split.patch
+++ b/fpm-conf-split.patch
@@ -1,5 +1,5 @@
---- php-5.6.2/sapi/fpm/php-fpm.conf.in~	2014-10-15 15:59:32.000000000 +0300
-+++ php-5.6.2/sapi/fpm/php-fpm.conf.in	2014-10-27 08:12:12.930858749 +0200
+--- php-5.6.3/sapi/fpm/php-fpm.conf.in~	2014-11-17 20:03:42.000000000 +0200
++++ php-5.6.3/sapi/fpm/php-fpm.conf.in	2014-11-17 20:04:50.287981731 +0200
 @@ -6,14 +6,6 @@
  ; prefix (@prefix@). This prefix can be dynamically changed by using the
  ; '-p' argument from the command line.
@@ -15,7 +15,7 @@
  ;;;;;;;;;;;;;;;;;;
  ; Global Options ;
  ;;;;;;;;;;;;;;;;;;
-@@ -123,405 +115,3 @@
+@@ -115,407 +115,3 @@
  ; ports and different management options.  The name of the pool will be
  ; used in logs and stats. There is no limitation on the number of pools which
  ; FPM can handle. Your system will tell you anyway :)
@@ -48,6 +48,8 @@
 -; Valid syntaxes are:
 -;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific address on
 -;                            a specific port;
+-;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+-;                            a specific port;
 -;   'port'                 - to listen on a TCP socket to all addresses on a
 -;                            specific port;
 -;   '/path/to/unix/socket' - to listen on a unix socket.
@@ -422,8 +424,8 @@
 -;php_admin_flag[log_errors] = on
 -;php_admin_value[memory_limit] = 32M
 --- /dev/null	2007-02-13 18:29:53.000000000 +0200
-+++ php-5.6.2/sapi/fpm/php-fpm.conf-d.in	2014-10-27 08:12:03.327088104 +0200
-@@ -0,0 +1,401 @@
++++ php-5.6.3/sapi/fpm/php-fpm.conf-d.in	2014-11-17 20:05:20.559494174 +0200
+@@ -0,0 +1,403 @@
 +; Start a new pool named 'www'.
 +; the variable $pool can we used in any directive and will be replaced by the
 +; pool name ('www' here)
@@ -452,6 +454,8 @@
 +; Valid syntaxes are:
 +;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific address on
 +;                            a specific port;
++;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
++;                            a specific port;
 +;   'port'                 - to listen on a TCP socket to all addresses on a
 +;                            specific port;
 +;   '/path/to/unix/socket' - to listen on a unix socket.
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list