- up to 5.6.35

diff --git a/fpm-conf-split.patch b/fpm-conf-split.patch
index 3d4bd92a238d65fc4d263c9e1e3f1014df9b1005..4e36a925214e8c45f6da9594c95e2cbb042788c6 100644 (file)
--- a/fpm-conf-split.patch
+++ b/fpm-conf-split.patch
@@ -15,11 +15,10 @@
  ;;;;;;;;;;;;;;;;;;
  ; Global Options ;
  ;;;;;;;;;;;;;;;;;;
-@@ -115,415 +115,3 @@
- ; ports and different management options.  The name of the pool will be
+@@ -116,420 +116,3 @@
  ; used in logs and stats. There is no limitation on the number of pools which
  ; FPM can handle. Your system will tell you anyway :)
--
+ 
 -; 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)
@@ -93,6 +92,12 @@
 -; Default Value: no set
 -; process.priority = -19
 -
+-; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
+-; or group is differrent than the master process user. It allows to create process
+-; core dump and ptrace the process for the pool user.
+-; Default Value: no
+-; process.dumpable = yes
+-
 -; Choose how the process manager will control the number of child processes.
 -; Possible Values:
 -;   static  - a fixed number (pm.max_children) of child processes;
@@ -433,7 +438,7 @@
 -;php_admin_value[memory_limit] = 32M
 --- /dev/null  2007-02-13 18:29:53.000000000 +0200
 +++ php-5.6.5/sapi/fpm/php-fpm.conf-d.in       2015-02-04 19:23:20.709225773 +0200
-@@ -0,0 +1,411 @@
+@@ -0,0 +1,417 @@
 +; 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)
@@ -507,6 +512,12 @@
 +; Default Value: no set
 +; process.priority = -19
 +
++; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
++; or group is differrent than the master process user. It allows to create process
++; core dump and ptrace the process for the pool user.
++; Default Value: no
++; process.dumpable = yes
++
 +; Choose how the process manager will control the number of child processes.
 +; Possible Values:
 +;   static  - a fixed number (pm.max_children) of child processes;

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index 69a93713d08d6570a8311bc479cb20fc460808e1..f3c0db0d96d319a03d702dd187bf24d359938b9c 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -17,11 +17,11 @@
  
  ; syslog_facility is used to specify what type of program is logging the
  ; message. This lets syslogd specify that messages from different facilities
-@@ -115,3 +115,11 @@
+@@ -115,4 +115,11 @@
  ; 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 :)
-+
+ 
 +; Include one or more files. If glob(3) exists, it is used to include a bunch of
 +; files from a glob(3) pattern. This directive can be used everywhere in the
 +; file.

diff --git a/php.spec b/php.spec
index 1f0294817c2c0bf52cfc23c36a9763dd5a7ea480..ec7697d70641c5da8dff94baccda2aa5493409ff 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -166,7 +166,7 @@ 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.34
+Version:       5.6.35
 Release:       %{rel}
 Epoch:         4
 # All files licensed under PHP version 3.01, except
@@ -175,7 +175,7 @@ Epoch:              4
 License:       PHP 3.01 and Zend and BSD
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: dd28a659b88ad60797a7c102307f2edb
+# Source0-md5: 50afbbc745ad433b9f368c5885bd73bf
 Source2:       %{orgname}-mod_%{orgname}.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini