Patch fpm-config-fix.patch for FPM related Bug #51584

Patch version 2010-04-17 17:53 UTC

• 2010-04-17 17:53 UTC [diff to current]

Developer: rschultz7@gmail.com

diff -ur php-5.3.2-orig-fpm/sapi/fpm/Makefile.frag php-5.3.2/sapi/fpm/Makefile.frag
--- php-5.3.2-orig-fpm/sapi/fpm/Makefile.frag	2010-04-11 15:36:47.000000000 +0200
+++ php-5.3.2/sapi/fpm/Makefile.frag	2010-04-11 15:35:01.000000000 +0200
@@ -14,10 +14,10 @@
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
 	@$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
 
-	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
-	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
+	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(PHP_CONFIG_FILE_PATH)/" && \
+	$(mkinstalldirs) $(INSTALL_ROOT)$(PHP_CONFIG_FILE_PATH) || :
 
-	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
+	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(PHP_CONFIG_FILE_PATH)/php-fpm.conf.default || :
 
 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man1/"
 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
diff -ur php-5.3.2-orig-fpm/sapi/fpm/fpm/fpm_conf.c php-5.3.2/sapi/fpm/fpm/fpm_conf.c
--- php-5.3.2-orig-fpm/sapi/fpm/fpm/fpm_conf.c	2010-04-11 15:33:07.000000000 +0200
+++ php-5.3.2/sapi/fpm/fpm/fpm_conf.c	2010-04-11 15:39:58.000000000 +0200
@@ -631,7 +631,7 @@
 	}
 
 	if (filename == NULL) {
-		spprintf(&filename, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR);
+		spprintf(&filename, 0, "%s/php-fpm.conf", PHP_CONFIG_FILE_PATH);
 		err = xml_conf_load_file(filename);
 		efree(filename);
 	} else {
diff -ur php-5.3.2-orig-fpm/sapi/fpm/init.d.php-fpm.in php-5.3.2/sapi/fpm/init.d.php-fpm.in
--- php-5.3.2-orig-fpm/sapi/fpm/init.d.php-fpm.in	2010-04-11 15:33:08.000000000 +0200
+++ php-5.3.2/sapi/fpm/init.d.php-fpm.in	2010-04-11 16:05:25.000000000 +0200
@@ -14,7 +14,7 @@
 exec_prefix=@exec_prefix@
 
 php_fpm_BIN=@sbindir@/php-fpm
-php_fpm_CONF=@sysconfdir@/php-fpm.conf
+php_fpm_CONF=@EXPANDED_PHP_CONFIG_FILE_PATH@/php-fpm.conf
 php_fpm_PID=@localstatedir@/run/php-fpm.pid