diff -ur php5-fpm-fcgi-5.4.15.20130509.orig/config.m4 php5-fpm-fcgi-5.4.15.20130509/config.m4 --- php5-fpm-fcgi-5.4.15.20130509.orig/config.m4 2013-05-18 14:05:52.000000000 +0400 +++ php5-fpm-fcgi-5.4.15.20130509/config.m4 2013-05-18 14:05:52.000000000 +0400 @@ -657,3 +657,4 @@ else AC_MSG_RESULT(no) fi +AC_OUTPUT($PHP_OUTPUT_FILES) diff -ur php5-fpm-fcgi-5.4.15.20130509.orig/fpm/fpm_conf.c php5-fpm-fcgi-5.4.15.20130509/fpm/fpm_conf.c --- php5-fpm-fcgi-5.4.15.20130509.orig/fpm/fpm_conf.c 2013-05-17 01:16:20.000000000 +0400 +++ php5-fpm-fcgi-5.4.15.20130509/fpm/fpm_conf.c 2013-05-18 14:05:52.000000000 +0400 @@ -1119,9 +1119,10 @@ { struct fpm_worker_pool_s *wp; - if (fpm_global_config.pid_file) { - fpm_evaluate_full_path(&fpm_global_config.pid_file, NULL, PHP_LOCALSTATEDIR, 0); + if (!fpm_global_config.pid_file) { + fpm_global_config.pid_file = strdup("run/php@phpsuffix@-fpm/php@phpsuffix@-fpm.pid"); } + fpm_evaluate_full_path(&fpm_global_config.pid_file, NULL, PHP_LOCALSTATEDIR, 0); if (force_daemon >= 0) { /* forced from command line options */ @@ -1160,7 +1161,7 @@ } if (!fpm_global_config.error_log) { - fpm_global_config.error_log = strdup("log/php-fpm.log"); + fpm_global_config.error_log = strdup("log/php@phpsuffix@-fpm/php@phpsuffix@-fpm.log"); } #ifdef HAVE_SYSTEMD @@ -1171,7 +1172,7 @@ #ifdef HAVE_SYSLOG_H if (!fpm_global_config.syslog_ident) { - fpm_global_config.syslog_ident = strdup("php-fpm"); + fpm_global_config.syslog_ident = strdup("php@phpsuffix@-fpm"); } if (fpm_global_config.syslog_facility < 0) { @@ -1608,11 +1609,7 @@ if (fpm_globals.config == NULL) { char *tmp; - if (fpm_globals.prefix == NULL) { - spprintf(&tmp, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR); - } else { - spprintf(&tmp, 0, "%s/etc/php-fpm.conf", fpm_globals.prefix); - } + spprintf(&tmp, 0, "/etc/fpm@phpsuffix@/php-fpm.conf"); if (!tmp) { zlog(ZLOG_SYSERROR, "spprintf() failed (tmp for fpm_globals.config)"); diff -ur php5-fpm-fcgi-5.4.15.20130509.orig/fpm/fpm_config.h php5-fpm-fcgi-5.4.15.20130509/fpm/fpm_config.h --- php5-fpm-fcgi-5.4.15.20130509.orig/fpm/fpm_config.h 2013-05-17 01:16:20.000000000 +0400 +++ php5-fpm-fcgi-5.4.15.20130509/fpm/fpm_config.h 2013-05-18 14:05:52.000000000 +0400 @@ -2,6 +2,7 @@ /* (c) 2007,2008 Andrei Nigmatulin */ #include +#include "config.h" /* Solaris does not have it */ #ifndef INADDR_NONE diff -ur php5-fpm-fcgi-5.4.15.20130509.orig/fpm/fpm_main.c php5-fpm-fcgi-5.4.15.20130509/fpm/fpm_main.c --- php5-fpm-fcgi-5.4.15.20130509.orig/fpm/fpm_main.c 2013-05-17 01:16:20.000000000 +0400 +++ php5-fpm-fcgi-5.4.15.20130509/fpm/fpm_main.c 2013-05-18 14:05:52.000000000 +0400 @@ -31,6 +31,7 @@ #include "zend_ini_scanner.h" #include "zend_globals.h" #include "zend_stream.h" +#include "config.h" #include "SAPI.h" diff -ur php5-fpm-fcgi-5.4.15.20130509.orig/fpm/fpm_php.h php5-fpm-fcgi-5.4.15.20130509/fpm/fpm_php.h --- php5-fpm-fcgi-5.4.15.20130509.orig/fpm/fpm_php.h 2013-05-17 01:16:20.000000000 +0400 +++ php5-fpm-fcgi-5.4.15.20130509/fpm/fpm_php.h 2013-05-18 14:05:52.000000000 +0400 @@ -8,7 +8,7 @@ #include #include "php.h" -#include "build-defs.h" /* for PHP_ defines */ +#include /* for PHP_ defines */ #include "fpm/fpm_conf.h" #define FPM_PHP_INI_TO_EXPAND \ diff -ur php5-fpm-fcgi-5.4.15.20130509.orig/init.d.php-fpm.in php5-fpm-fcgi-5.4.15.20130509/init.d.php-fpm.in --- php5-fpm-fcgi-5.4.15.20130509.orig/init.d.php-fpm.in 2013-05-17 01:16:20.000000000 +0400 +++ php5-fpm-fcgi-5.4.15.20130509/init.d.php-fpm.in 2013-05-18 14:05:52.000000000 +0400 @@ -13,9 +13,9 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -php_fpm_BIN=@sbindir@/php-fpm -php_fpm_CONF=@sysconfdir@/php-fpm.conf -php_fpm_PID=@localstatedir@/run/php-fpm.pid +php_fpm_BIN=@sbindir@/php@phpsuffix@-fpm +php_fpm_CONF=@sysconfdir@/fpm@phpsuffix@/php-fpm.conf +php_fpm_PID=@localstatedir@/run/php@phpsuffix@-fpm.pid php_opts="--fpm-config $php_fpm_CONF --pid $php_fpm_PID" --- php7-fpm-fcgi-7.1.3/Makefile.frag.a 2017-03-20 15:33:55.293000000 +0300 +++ php7-fpm-fcgi-7.1.3/Makefile.frag 2017-03-20 15:49:34.508000000 +0300 @@ -10,13 +10,13 @@ @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT) - @if test -f "$(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf"; then \ + @if test -f "$(INSTALL_ROOT)$(sysconfdir)/fpm@phpsuffix@/php-fpm.conf"; then \ echo "Installing PHP FPM defconfig: skipping"; \ else \ - echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \ - $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \ - $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ - $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ + echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/fpm@phpsuffix@" && \ + $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm@phpsuffix@/php-fpm.d; \ + $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/fpm@phpsuffix@/php-fpm.conf; \ + $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm@phpsuffix@/php-fpm.d/www.conf; \ fi @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" --- php7-fpm-fcgi-7.2.12/php-fpm.8.in.a 2018-11-06 10:33:06.000000000 +0000 +++ php7-fpm-fcgi-7.2.12/php-fpm.8.in 2018-11-12 11:31:53.627660434 +0000 @@ -1,16 +1,16 @@ .TH PHP-FPM 8 "2018" "The PHP Group" "Scripting Language" .SH NAME .TP 15 -php-fpm \- PHP FastCGI Process Manager 'PHP-FPM' +php7-fpm \- PHP FastCGI Process Manager 'PHP-FPM' .SH SYNOPSIS -.B php-fpm +.B php@phpsuffix@-fpm [options] .LP .SH DESCRIPTION \fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for -Web development and can be embedded into HTML. This is a variant of PHP that will run in the background as a daemon, listening for CGI requests. Output is logged to @php_fpm_localstatedir@/log/php-fpm.log. +Web development and can be embedded into HTML. This is a variant of PHP that will run in the background as a daemon, listening for CGI requests. Output is logged to @php_fpm_localstatedir@/log/php@phpsuffix@-fpm.log. .LP -Most options are set in the configuration file. The configuration file is @php_fpm_sysconfdir@/php-fpm.conf. By default, php-fpm will respond to CGI requests listening on localhost http port 9000. Therefore php-fpm expects your webserver to forward all requests for '.php' files to port 9000 and you should edit your webserver configuration file appropriately. +Most options are set in the configuration file. The configuration file is @php_fpm_sysconfdir@/php-fpm.conf. By default, php@phpsuffix@-fpm will respond to CGI requests listening on localhost http port 9000. Therefore php7-fpm expects your webserver to forward all requests for '.php' files to port 9000 and you should edit your webserver configuration file appropriately. .SH OPTIONS .TP 15 .B \-C @@ -95,7 +95,7 @@ .TP .PD 1 .B \-y -Specify alternative path to FastCGI process manager configuration file (the default is @php_fpm_sysconfdir@/php-fpm.conf) +Specify alternative path to FastCGI process manager configuration file (the default is @php_fpm_sysconfdir@/fpm/php@phpsuffix@-fpm.conf) .TP .PD 0 .B \-\-test @@ -134,27 +134,27 @@ Allow pool to run as root (disabled by default) .SH FILES .TP 15 -.B php-fpm.conf -The configuration file for the php-fpm daemon. +.B php@phpsuffix@-fpm.conf +The configuration file for the php7-fpm daemon. .TP .B php.ini The standard php configuration file. .SH EXAMPLES -For any unix systems which use init.d for their main process manager, you should use the init script provided to start and stop the php-fpm daemon. +For any unix systems which use init.d for their main process manager, you should use the init script provided to start and stop the php@phpsuffix@-fpm daemon. .P .PD 1 .RS -sudo /etc/init.d/php-fpm start +sudo /etc/init.d/php@phpsuffix@-fpm start .RE .TP -For any unix systems which use systemd for their main process manager, you should use the unit file provided to start and stop the php-fpm daemon. +For any unix systems which use systemd for their main process manager, you should use the unit file provided to start and stop the php@phpsuffix@-fpm daemon. .P .PD 1 .RS -sudo systemctl start php-fpm.service +sudo systemctl start php@phpsuffix@-fpm.service .RE .TP -If your installation has no appropriate init script, launch php-fpm with no arguments. It will launch as a daemon (background process) by default. The file @php_fpm_localstatedir@/run/php-fpm.pid determines whether php-fpm is already up and running. Once started, php-fpm then responds to several POSIX signals: +If your installation has no appropriate init script, launch php@phpsuffix@-fpm with no arguments. It will launch as a daemon (background process) by default. The file @php_fpm_localstatedir@/run/php@phpsuffix@-fpm.pid determines whether php@phpsuffix@-fpm is already up and running. Once started, php@phpsuffix@-fpm then responds to several POSIX signals: .P .PD 0 .RS @@ -169,11 +169,11 @@ .PD 1 .P .SH TIPS -The PHP-FPM CGI daemon will work well with most popular webservers, including Apache2, lighttpd and nginx. +The php@phpsuffix@-fpm CGI daemon will work well with most popular webservers, including Apache2, lighttpd and nginx. .PD 1 .P .SH SEE ALSO -The PHP-FPM website: +The php@phpsuffix@-fpm website: .PD 0 .P .B http://php-fpm.org @@ -211,7 +211,7 @@ And last but not least PHP was developed with the help of a huge amount of contributors all around the world. .SH VERSION INFORMATION -This manpage describes \fBphp-fpm\fP, version @PHP_VERSION@. +This manpage describes \fBphp@phpsuffix@-fpm\fP, version @PHP_VERSION@. .SH COPYRIGHT Copyright \(co 1997\-2018 The PHP Group .PD 0