[packages/php/PHP_5_5] fpm config rediff

glen glen at pld-linux.org
Fri May 22 07:39:01 CEST 2015 

commit 848fed0eeb5abc05d0058c7c2257f664723a4042
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Feb 4 21:04:10 2015 +0200

    fpm config rediff
    
    fpm: snippet to aid creating fpm split config
    refs ef84931a8b2e230e0c2d0891d150acacfd1ab1f2
    
    fpm: rediff fpm patches; apply config split first
    refs 8851ace1cd05b212f30fb848bfea845a03269621

 fpm-conf-split.patch | 60 +++++++++++++++++++++++++++-------------------------
 php-fpm-config.patch | 52 +++++++++++++++++++++------------------------
 php.spec             | 15 ++++++++++++-
 3 files changed, 69 insertions(+), 58 deletions(-)
---
diff --git a/php.spec b/php.spec
index cb4720e..1f3b26c 100644
--- a/php.spec
+++ b/php.spec
@@ -2006,6 +2006,20 @@ cp -p php.ini-production php.ini
 %patch38 -p1
 %patch39 -p1
 %if %{with fpm}
+%if 0
+# create split php-fpm.conf patch. review (restore other diffs) and commit
+cp sapi/fpm/php-fpm.conf.in{,.orig}
+%{__sed} -n -e '/; Start a new pool named/,$p' sapi/fpm/php-fpm.conf.in > sapi/fpm/php-fpm.conf-d.in
+%{__sed} -i -e '/; Include one or more files/,/include=etc\/fpm\.d/d' sapi/fpm/php-fpm.conf.in
+%{__sed} -i -e '/; Start a new pool named/,$d' sapi/fpm/php-fpm.conf.in
+set +e
+cd ..
+diff -u %{orgname}-%{version}/sapi/fpm/php-fpm.conf.in{.orig,} > %{PATCH69}
+diff -u /dev/null %{orgname}-%{version}/sapi/fpm/php-fpm.conf-d.in >> %{PATCH69}
+exit 1
+%else
+%patch69 -p1
+%endif
 %patch41 -p1
 %patch42 -p1
 %endif
@@ -2030,7 +2044,6 @@ cp -p php.ini-production php.ini
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
 %patch67 -p1
-%patch69 -p1
 
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 
diff --git a/fpm-conf-split.patch b/fpm-conf-split.patch
index 7865596..718c83a 100644
--- a/fpm-conf-split.patch
+++ b/fpm-conf-split.patch
@@ -1,6 +1,6 @@
---- php-5.5.20/sapi/fpm/php-fpm.conf.in	2015-01-01 17:48:20.993520423 +0200
-+++ php-5.5.20/sapi/fpm/php-fpm.conf.in	2015-01-01 17:52:53.447616090 +0200
-@@ -6,14 +6,6 @@
+--- php-5.5.25.orig/sapi/fpm/php-fpm.conf.in	2015-05-14 03:02:08.000000000 +0300
++++ php-5.5.25/sapi/fpm/php-fpm.conf.in	2015-05-22 07:40:43.937407570 +0300
+@@ -6,13 +6,6 @@
  ; prefix (@prefix@). This prefix can be dynamically changed by using the
  ; '-p' argument from the command line.
  
@@ -10,12 +10,14 @@
 -; Relative path can also be used. They will be prefixed by:
 -;  - the global prefix if it's been set (-p argument)
 -;  - @prefix@ otherwise
--;include=/etc/php/fpm.d/*.conf
--
+-;include=etc/fpm.d/*.conf
+ 
  ;;;;;;;;;;;;;;;;;;
  ; Global Options ;
- ;;;;;;;;;;;;;;;;;;
-@@ -118,407 +110,8 @@
+@@ -123,410 +116,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 :)
 -
 -; Start a new pool named 'www'.
 -; the variable $pool can we used in any directive and will be replaced by the
@@ -54,7 +56,7 @@
 -;                            (IPv6 and IPv4-mapped) on a specific port;
 -;   '/path/to/unix/socket' - to listen on a unix socket.
 -; Note: This value is mandatory.
--listen = /var/run/php/@processname at .sock
+-listen = 127.0.0.1:9000
 -
 -; Set listen(2) backlog.
 -; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
@@ -75,7 +77,7 @@
 -; must be separated by a comma. If this value is left blank, connections will be
 -; accepted from any ip address.
 -; Default Value: any
--listen.allowed_clients = 127.0.0.1
+-;listen.allowed_clients = 127.0.0.1
 -
 -; Specify the nice(2) priority to apply to the pool processes (only if set)
 -; The value can vary from -19 (highest priority) to 20 (lower priority)
@@ -394,7 +396,7 @@
 -; the current environment.
 -; Default Value: clean env
 -;env[HOSTNAME] = $HOSTNAME
--env[PATH] = $PATH
+-;env[PATH] = /usr/local/bin:/usr/bin:/bin
 -;env[TMP] = /tmp
 -;env[TMPDIR] = /tmp
 -;env[TEMP] = /tmp
@@ -431,7 +433,7 @@
 +;  - @prefix@ otherwise
 +include=/etc/php/fpm.d/*.conf
 --- /dev/null	2007-02-13 18:29:53.000000000 +0200
-+++ php-5.5.20/sapi/fpm/php-fpm.conf-d.in	2015-01-01 17:47:46.328393657 +0200
++++ php-5.5.25/sapi/fpm/php-fpm.conf-d.in	2015-05-22 07:11:49.357411323 +0300
 @@ -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
@@ -470,7 +472,7 @@
 +;                            (IPv6 and IPv4-mapped) on a specific port;
 +;   '/path/to/unix/socket' - to listen on a unix socket.
 +; Note: This value is mandatory.
-+listen = /var/run/php/@processname at .sock
++listen = 127.0.0.1:9000
 +
 +; Set listen(2) backlog.
 +; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
@@ -491,7 +493,7 @@
 +; must be separated by a comma. If this value is left blank, connections will be
 +; accepted from any ip address.
 +; Default Value: any
-+listen.allowed_clients = 127.0.0.1
++;listen.allowed_clients = 127.0.0.1
 +
 +; Specify the nice(2) priority to apply to the pool processes (only if set)
 +; The value can vary from -19 (highest priority) to 20 (lower priority)
@@ -810,7 +812,7 @@
 +; the current environment.
 +; Default Value: clean env
 +;env[HOSTNAME] = $HOSTNAME
-+env[PATH] = $PATH
++;env[PATH] = /usr/local/bin:/usr/bin:/bin
 +;env[TMP] = /tmp
 +;env[TMPDIR] = /tmp
 +;env[TEMP] = /tmp
@@ -839,27 +841,27 @@
 +;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 @@
- 
-   PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
-   PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
--  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
-+  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/php-fpm.conf-d sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
-   PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
- 
-   SAPI_FPM_PATH=sapi/fpm/php-fpm
---- php-5.5.7/sapi/fpm/Makefile.frag~	2013-12-16 17:57:03.000000000 +0200
-+++ php-5.5.7/sapi/fpm/Makefile.frag	2013-12-16 18:01:19.511829907 +0200
+--- php-5.5.25.orig/sapi/fpm/Makefile.frag	2015-05-14 03:02:08.000000000 +0300
++++ php-5.5.25/sapi/fpm/Makefile.frag	2015-05-22 07:40:43.940741076 +0300
 @@ -11,8 +11,9 @@
  	@$(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) || :
 +	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || :
- 	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
-+	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || :
+ 	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
++	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf.default || :
  
  	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
  	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
+--- php-5.5.25.orig/sapi/fpm/config.m4	2015-05-14 03:02:08.000000000 +0300
++++ php-5.5.25/sapi/fpm/config.m4	2015-05-22 07:40:43.940741076 +0300
+@@ -636,7 +636,7 @@
+ 
+   PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
+   PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
+-  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
++  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/php-fpm.conf-d sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
+   PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
+ 
+   SAPI_FPM_PATH=sapi/fpm/php-fpm
diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index 353c012..846dac4 100644
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -1,14 +1,5 @@
 --- php-5.4.7/sapi/fpm/php-fpm.conf.in	2012-10-05 22:16:44.895998479 +0300
 +++ php-5.3.17/sapi/fpm/php-fpm.conf.in	2012-10-12 12:35:47.601602945 +0300
-@@ -12,7 +12,7 @@
- ; Relative path can also be used. They will be prefixed by:
- ;  - the global prefix if it's been set (-p arguement)
- ;  - @prefix@ otherwise
--;include=etc/fpm.d/*.conf
-+;include=/etc/php/fpm.d/*.conf
- 
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
 @@ -22,14 +22,14 @@
  ; Pid file
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
@@ -26,25 +17,28 @@
  
  ; syslog_facility is used to specify what type of program is logging the
  ; message. This lets syslogd specify that messages from different facilities
-@@ -93,7 +93,7 @@
- ;                            specific port;
+--- php-5.5.25/sapi/fpm/php-fpm.conf-d.in~	2015-05-22 07:21:41.000000000 +0300
++++ php-5.5.25/sapi/fpm/php-fpm.conf-d.in	2015-05-22 07:24:22.913173238 +0300
+@@ -35,7 +35,8 @@
+ ;                            (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
++;listen = 127.0.0.1:9000
 +listen = /var/run/php/@processname at .sock
  
- ; Set listen(2) backlog. A value of '-1' means unlimited.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -105,7 +105,7 @@
+ ; Set listen(2) backlog.
+ ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
+@@ -56,7 +57,7 @@
  ; must be separated by a comma. If this value is left blank, connections will be
  ; accepted from any ip address.
  ; Default Value: any
 -;listen.allowed_clients = 127.0.0.1
 +listen.allowed_clients = 127.0.0.1
  
- ; Set permissions for unix socket, if one is used. In Linux, read/write
- ; permissions must be set in order to allow connections from a web server. Many
-@@ -277,7 +277,7 @@
+ ; Specify the nice(2) priority to apply to the pool processes (only if set)
+ ; The value can vary from -19 (highest priority) to 20 (lower priority)
+@@ -375,7 +376,7 @@
  ; the current environment.
  ; Default Value: clean env
  ;env[HOSTNAME] = $HOSTNAME
@@ -53,6 +47,19 @@
  ;env[TMP] = /tmp
  ;env[TMPDIR] = /tmp
  ;env[TEMP] = /tmp
+--- php-5.5.25/sapi/fpm/Makefile.frag~	2015-05-22 07:35:13.000000000 +0300
++++ php-5.5.25/sapi/fpm/Makefile.frag	2015-05-22 07:35:35.001377912 +0300
+@@ -12,8 +12,8 @@
+ 
+ 	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
+ 	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || :
+-	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
+-	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf.default || :
++	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
++	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || :
+ 
+ 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
+ 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
 --- php-5.3.9/sapi/fpm/status.html.in~	2011-10-08 23:43:12.000000000 +0300
 +++ php-5.3.9/sapi/fpm/status.html.in	2012-01-12 02:19:09.573191879 +0200
 @@ -96,7 +96,7 @@
@@ -64,14 +71,3 @@
  
  			ths = document.getElementsByTagName("th");
  			for (var i=0; i<ths.length; i++) {
---- php-5.4.18/sapi/fpm/Makefile.frag~	2013-08-14 08:47:24.000000000 +0300
-+++ php-5.4.18/sapi/fpm/Makefile.frag	2013-08-29 10:20:38.161424172 +0300
-@@ -12,7 +12,7 @@
- 
- 	@echo "Installing PHP FPM config:        $(INSTALL_ROOT)$(sysconfdir)/" && \
- 	$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
--	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
-+	@$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
- 
- 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/848fed0eeb5abc05d0058c7c2257f664723a4042

More information about the pld-cvs-commit mailing list