[packages/php/PHP_5_6] up to 5.6.4, fixes CVE-2014-8142
glen
glen at pld-linux.org
Thu Jan 1 16:44:28 CET 2015
commit ba9835b0645df3198c9bb6fcc7470ce0170d4ad0
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jan 1 17:29:31 2015 +0200
up to 5.6.4, fixes CVE-2014-8142
fpm-conf-split.patch | 28 +++++++++++++++++-----------
php.spec | 4 ++--
2 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/php.spec b/php.spec
index 88dc501..fae7f9c 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.3
+Version: 5.6.4
Release: %{rel}%{?with_type_hints:.th}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 7635f344145a4edd7dff6ecec795aaea
+# Source0-md5: bf824c5e5c7f49ca5f7350d72cba4881
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 5398f8b..bae2ef7 100644
--- a/fpm-conf-split.patch
+++ b/fpm-conf-split.patch
@@ -1,5 +1,5 @@
---- 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
+--- php-5.6.4/sapi/fpm/php-fpm.conf.in~ 2015-01-01 17:18:30.000000000 +0200
++++ php-5.6.4/sapi/fpm/php-fpm.conf.in 2015-01-01 17:20:31.203799290 +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 ;
;;;;;;;;;;;;;;;;;;
-@@ -115,407 +115,3 @@
+@@ -115,410 +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 :)
@@ -27,6 +27,7 @@
-
-; Per pool prefix
-; It only applies on the following directives:
+-; - 'access.log'
-; - 'slowlog'
-; - 'listen' (unixsocket)
-; - 'chroot'
@@ -46,12 +47,14 @@
-
-; The address on which to accept FastCGI requests.
-; Valid syntaxes are:
--; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on
+-; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 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
+-; 'port' - to listen on a TCP socket to all IPv4 addresses on a
-; specific port;
+-; '[::]:port' - to listen on a TCP socket to all addresses
+-; (IPv6 and IPv4-mapped) on a specific port;
-; '/path/to/unix/socket' - to listen on a unix socket.
-; Note: This value is mandatory.
-listen = 127.0.0.1:9000
@@ -69,7 +72,7 @@
-;listen.group = @php_fpm_group@
-;listen.mode = 0660
-
--; List of ipv4 addresses of FastCGI clients which are allowed to connect.
+-; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
-; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
-; must be separated by a comma. If this value is left blank, connections will be
@@ -424,8 +427,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.3/sapi/fpm/php-fpm.conf-d.in 2014-11-17 20:05:20.559494174 +0200
-@@ -0,0 +1,403 @@
++++ php-5.6.4/sapi/fpm/php-fpm.conf-d.in 2015-01-01 17:19:55.621958470 +0200
+@@ -0,0 +1,406 @@
+; 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)
@@ -433,6 +436,7 @@
+
+; Per pool prefix
+; It only applies on the following directives:
++; - 'access.log'
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
@@ -452,12 +456,14 @@
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
-+; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on
++; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 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
++; 'port' - to listen on a TCP socket to all IPv4 addresses on a
+; specific port;
++; '[::]:port' - to listen on a TCP socket to all addresses
++; (IPv6 and IPv4-mapped) on a specific port;
+; '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 127.0.0.1:9000
@@ -475,7 +481,7 @@
+;listen.group = @php_fpm_group@
+;listen.mode = 0660
+
-+; List of ipv4 addresses of FastCGI clients which are allowed to connect.
++; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/ba9835b0645df3198c9bb6fcc7470ce0170d4ad0
More information about the pld-cvs-commit
mailing list