X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=fpm-conf-split.patch;h=083fbf05e6698f23a9f0310b76b7b933a1e56a40;hb=dcc5b75e7a7f5761a9cbb6af7bd07398afe9fb26;hp=5398f8be147a3b6fcc22baef1d02a5bb94122b26;hpb=614808e04f2c37a7ad7e880d8a25843692d47425;p=packages%2Fphp.git

diff --git a/fpm-conf-split.patch b/fpm-conf-split.patch
index 5398f8b..083fbf0 100644
--- a/fpm-conf-split.patch
+++ b/fpm-conf-split.patch
@@ -1,5 +1,6 @@
---- 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
+diff -urNpa php-5.6.35.orig/sapi/fpm/php-fpm.conf.in php-5.6.35/sapi/fpm/php-fpm.conf.in
+--- php-5.6.35.orig/sapi/fpm/php-fpm.conf.in	2018-03-28 21:28:58.000000000 +0000
++++ php-5.6.35/sapi/fpm/php-fpm.conf.in	2018-04-12 10:03:34.184687949 +0000
 @@ -6,14 +6,6 @@
  ; prefix (@prefix@). This prefix can be dynamically changed by using the
  ; '-p' argument from the command line.
@@ -15,7 +16,7 @@
  ;;;;;;;;;;;;;;;;;;
  ; Global Options ;
  ;;;;;;;;;;;;;;;;;;
-@@ -115,407 +115,3 @@
+@@ -123,421 +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 +28,7 @@
 -
 -; Per pool prefix
 -; It only applies on the following directives:
+-; - 'access.log'
 -; - 'slowlog'
 -; - 'listen' (unixsocket)
 -; - 'chroot'
@@ -46,12 +48,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
@@ -68,8 +72,13 @@
 -;listen.owner = @php_fpm_user@
 -;listen.group = @php_fpm_group@
 -;listen.mode = 0660
+-; When POSIX Access Control Lists are supported you can set them using
+-; these options, value is a comma separated list of user/group names.
+-; When set, listen.owner and listen.group are ignored
+-;listen.acl_users =
+-;listen.acl_groups =
 - 
--; 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
@@ -85,6 +94,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;
@@ -423,9 +438,10 @@
 -;php_admin_value[error_log] = /var/log/fpm-php.www.log
 -;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 @@
+diff -urNpa php-5.6.35.orig/sapi/fpm/php-fpm.conf-d.in php-5.6.35/sapi/fpm/php-fpm.conf-d.in
+--- php-5.6.35.orig/sapi/fpm/php-fpm.conf-d.in	1970-01-01 00:00:00.000000000 +0000
++++ php-5.6.35/sapi/fpm/php-fpm.conf-d.in	2018-04-12 10:04:12.417687518 +0000
+@@ -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)
@@ -433,6 +449,7 @@
 +
 +; Per pool prefix
 +; It only applies on the following directives:
++; - 'access.log'
 +; - 'slowlog'
 +; - 'listen' (unixsocket)
 +; - 'chroot'
@@ -452,12 +469,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
@@ -474,8 +493,13 @@
 +;listen.owner = @php_fpm_user@
 +;listen.group = @php_fpm_group@
 +;listen.mode = 0660
++; When POSIX Access Control Lists are supported you can set them using
++; these options, value is a comma separated list of user/group names.
++; When set, listen.owner and listen.group are ignored
++;listen.acl_users =
++;listen.acl_groups =
 + 
-+; 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
@@ -491,6 +515,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;
@@ -829,9 +859,10 @@
 +;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 @@
+diff -urNpa php-5.6.35.orig/sapi/fpm/config.m4 php-5.6.35/sapi/fpm/config.m4
+--- php-5.6.35.orig/sapi/fpm/config.m4	2018-03-28 21:28:58.000000000 +0000
++++ php-5.6.35/sapi/fpm/config.m4	2018-04-12 10:02:48.432688464 +0000
+@@ -667,7 +667,7 @@ if test "$PHP_FPM" != "no"; then
  
    PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
    PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
@@ -840,9 +871,10 @@
    PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
  
    SAPI_FPM_PATH=sapi/fpm/php-fpm
---- php-5.6.2/sapi/fpm/Makefile.frag~	2014-10-15 15:59:32.000000000 +0300
-+++ php-5.6.2/sapi/fpm/Makefile.frag	2014-10-27 08:12:57.402883790 +0200
-@@ -11,8 +11,9 @@
+diff -urNpa php-5.6.35.orig/sapi/fpm/Makefile.frag php-5.6.35/sapi/fpm/Makefile.frag
+--- php-5.6.35.orig/sapi/fpm/Makefile.frag	2018-03-28 21:28:58.000000000 +0000
++++ php-5.6.35/sapi/fpm/Makefile.frag	2018-04-12 10:02:48.432688464 +0000
+@@ -11,8 +11,9 @@ install-fpm: $(SAPI_FPM_PATH)
  	@$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
  
  	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \