up to 5.5.19

diff --git a/fpm-conf-split.patch b/fpm-conf-split.patch
index be1b1bc2594589f8d3bca81c76bfd739ec4b051b..caf7f212942bd98d2a3d47ac48b07a88bb3adc69 100644 (file)
--- a/fpm-conf-split.patch
+++ b/fpm-conf-split.patch
@@ -1,5 +1,5 @@
---- php-5.5.7/sapi/fpm/php-fpm.conf.in~        2013-12-16 17:57:03.000000000 +0200
-+++ php-5.5.7/sapi/fpm/php-fpm.conf.in 2013-12-16 17:58:37.618025260 +0200
+--- php-5.5.19/sapi/fpm/php-fpm.conf.in~       2014-11-18 21:43:01.000000000 +0200
++++ php-5.5.19/sapi/fpm/php-fpm.conf.in        2014-11-18 21:44:54.727742022 +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 ;
  ;;;;;;;;;;;;;;;;;;
-@@ -116,404 +116,10 @@
+@@ -116,406 +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 :)
  
@@ -47,6 +47,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.
@@ -428,10 +430,8 @@
 +;  - @prefix@ otherwise
 +include=/etc/php/fpm.d/*.conf
 --- /dev/null  2007-02-13 18:29:53.000000000 +0200
-+++ php-5.6.0beta1/sapi/fpm/php-fpm.conf-d.in  2014-04-21 21:58:46.191751631 +0300
++++ php-5.5.19/sapi/fpm/php-fpm.conf-d.in      2014-11-18 21:44:32.469960258 +0200
 @@ -0,0 +1,403 @@
-+; vim:ft=dosini
-+;
 +; 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)
@@ -460,6 +460,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.

diff --git a/php.spec b/php.spec
index d7fa0983fdd68ea57c84c92455a817e89fcdd2ad..9a56874db1a04501e3be04bf9540c52889165667 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -137,13 +137,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.18
+Version:       5.5.19
 Release:       %{rel}%{?with_type_hints:.th}
 Epoch:         4
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 3984f32985842afebe5795457e26931f
+# Source0-md5: c63dcfd8b318d12127ba6d39ecc8a444
 Source2:       %{orgname}-mod_%{orgname}.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini