Merge lp:~grant-delaney/ius/php53 into lp:~ius-coredev/ius/php53u

[Grant Delaney]

Adding support for php-fpm

[BJ Dierkes (derks)]

This looks really good... and from what I can tell, FPM is only built into the php-fpm binary which would be required as to not mess with core php. A couple issues and thoughts:

 - Wrap a '_with_fpm' condition in there (similar to _with_zts, _with_psa, etc). So everything added for 'fpm' should be within a '%if 0%{?_with_fpm}' condition. I think I would prefer to put this in there optionally (meaning users can rebuild from the srpm if they want fpm)... until I am comfortable adding it by default.

 - "Requires: %{name}-%{version}" ... should be "Requires: %{name} = %{version}-%{release}" under %package fpm

 - "Provides: php-fpm" should be "Provides: %{real_name}-fpm = %{version}-%{release}

 - Under '%install' sometimes you reference %{_sysconfdir} and others raw '/etc'... should use the macro consistently.

 - %defattr missing from %files fpm

 - Any README, LICENSE, COPYING, from the fpm source need to be included under a %doc under %files fpm

review: Needs Fixing

[lp:~grant-delaney/ius/php53]

29. By grant.delaney <email address hidden> on 2010-07-15

added the fpm post/preun chkconfig

=== added file 'SOURCES/fpm_svn_r300604.tar.gz'
Binary files SOURCES/fpm_svn_r300604.tar.gz	1970-01-01 00:00:00 +0000 and SOURCES/fpm_svn_r300604.tar.gz	2010-07-15 11:09:43 +0000 differ
=== added file 'SOURCES/php-fpm.conf'
--- SOURCES/php-fpm.conf	1970-01-01 00:00:00 +0000
+++ SOURCES/php-fpm.conf	2010-07-15 11:09:43 +0000
@@ -0,0 +1,273 @@
+;;;;;;;;;;;;;;;;;;;;;
+; FPM Configuration ;
+;;;;;;;;;;;;;;;;;;;;;
+
+; All relative paths in this configuration file are relative to PHP's install
+; prefix.
+
+; 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.
+;include=/etc/fpm.d/*.conf
+
+;;;;;;;;;;;;;;;;;;
+; Global Options ;
+;;;;;;;;;;;;;;;;;;
+
+[global]
+; Pid file
+; Default Value: none
+;pid = /var/run/php-fpm.pid
+
+; Error log file
+; Default Value: /var/log/php-fpm.log
+;error_log = /var/log/php-fpm.log
+
+; Log level
+; Possible Values: alert, error, warning, notice, debug
+; Default Value: notice
+;log_level = notice
+
+; If this number of child processes exit with SIGSEGV or SIGBUS within the time
+; interval set by emergency_restart_interval then FPM will restart. A value
+; of '0' means 'Off'.
+; Default Value: 0
+;emergency_restart_threshold = 0
+
+; Interval of time used by emergency_restart_interval to determine when 
+; a graceful restart will be initiated.  This can be useful to work around
+; accidental corruptions in an accelerator's shared memory.
+; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;emergency_restart_interval = 0
+
+; Time limit for child processes to wait for a reaction on signals from master.
+; Available units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
+;process_control_timeout = 0
+
+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+; Default Value: yes
+;daemonize = yes
+
+;;;;;;;;;;;;;;;;;;;;
+; Pool Definitions ; 
+;;;;;;;;;;;;;;;;;;;;
+
+; Multiple pools of child processes may be started with different listening
+; 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'.
+[www]
+
+; 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
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses 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
+
+; Set listen(2) backlog. A value of '-1' means unlimited.
+; Default Value: -1
+;listen.backlog = -1
+ 
+; List of ipv4 addresses 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
+; accepted from any ip address.
+; Default Value: any
+;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
+; BSD-derived systems allow connections regardless of permissions. 
+; Default Values: user and group are set as the running user
+;                 mode is set to 0666
+;listen.owner = nobody
+;listen.group = nobody
+;listen.mode = 0666
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+user = nobody
+group = nobody
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives:
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    number then some children will be created.
+;             pm.max_spare_servers - the maximum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes to be created when pm is set to 'dynamic'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI.
+; Note: Used when pm is set to either 'static' or 'dynamic'
+; Note: This value is mandatory.
+pm.max_children = 50
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+;pm.start_servers = 20
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+;pm.min_spare_servers = 5
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+;pm.max_spare_servers = 35
+ 
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+;pm.max_requests = 500
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. By default, the status page shows the following
+; information:
+;   accepted conn    - the number of request accepted by the pool;
+;   pool             - the name of the pool;
+;   process manager  - static or dynamic;
+;   idle processes   - the number of idle processes;
+;   active processes - the number of active processes;
+;   total processes  - the number of idle + active processes.
+; The values of 'idle processes', 'active processes' and 'total processes' are
+; updated each second. The value of 'accepted conn' is updated in real time.
+; Example output:
+;   accepted conn:   12073
+;   pool:             www
+;   process manager:  static
+;   idle processes:   35
+;   active processes: 65
+;   total processes:  100
+; By default the status page output is formatted as text/plain. Passing either
+; 'html' or 'json' as a query string will return the corresponding output
+; syntax. Example:
+;   http://www.foo.bar/status
+;   http://www.foo.bar/status?json
+;   http://www.foo.bar/status?html
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set 
+;pm.status_path = /status
+ 
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;ping.path = /ping
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+;ping.response = pong
+ 
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+ 
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+ 
+; The log file for slow requests
+; Default Value: /var/log/php-fpm.log.slow
+;slowlog = /var/log/php-fpm.log.slow
+ 
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+;rlimit_files = 1024
+ 
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+ 
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: chrooting is a great security feature and should be used whenever 
+;       possible. However, all PHP paths will be relative to the chroot
+;       (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot = 
+ 
+; Chdir to this directory at the start. This value must be an absolute path.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+ 
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Default Value: no
+;catch_workers_output = yes
+ 
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+;env[HOSTNAME] = $HOSTNAME
+;env[PATH] = /usr/local/bin:/usr/bin:/bin
+;env[TMP] = /tmp
+;env[TMPDIR] = /tmp
+;env[TEMP] = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+;   php_value/php_flag             - you can set classic ini defines which can
+;                                    be overwritten from PHP call 'ini_set'. 
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Default Value: nothing is defined by default except the values in php.ini and
+;                specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f [e-mail]
+;php_flag[display_errors] = off
+;php_admin_value[error_log] = /var/log/fpm-php.www.log
+;php_admin_flag[log_errors] = on
+;php_admin_value[memory_limit] = 32M

=== added file 'SOURCES/php-fpm.initd'
--- SOURCES/php-fpm.initd	1970-01-01 00:00:00 +0000
+++ SOURCES/php-fpm.initd	2010-07-15 11:09:43 +0000
@@ -0,0 +1,140 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides:          php-fpm
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     3 5
+# Default-Stop:      0 1 6
+# Short-Description: starts php-fpm
+# Description:       starts the PHP FastCGI Process Manager daemon
+### END INIT INFO
+
+prefix=/usr
+exec_prefix=/usr
+
+php_fpm_BIN=/usr/sbin/php-fpm
+php_fpm_CONF=/etc/php-fpm.conf
+php_fpm_PID=/var/run/php-fpm.pid
+
+
+php_opts="--fpm-config $php_fpm_CONF"
+
+
+wait_for_pid () {
+	try=0
+
+	while test $try -lt 35 ; do
+
+		case "$1" in
+			'created')
+			if [ -f "$2" ] ; then
+				try=''
+				break
+			fi
+			;;
+
+			'removed')
+			if [ ! -f "$2" ] ; then
+				try=''
+				break
+			fi
+			;;
+		esac
+
+		echo -n .
+		try=`expr $try + 1`
+		sleep 1
+
+	done
+
+}
+
+case "$1" in
+	start)
+		echo -n "Starting php-fpm "
+
+		$php_fpm_BIN $php_opts
+
+		if [ "$?" != 0 ] ; then
+			echo " failed"
+			exit 1
+		fi
+
+		wait_for_pid created $php_fpm_PID
+
+		if [ -n "$try" ] ; then
+			echo " failed"
+			exit 1
+		else
+			echo " done"
+		fi
+	;;
+
+	stop)
+		echo -n "Gracefully shutting down php-fpm "
+
+		if [ ! -r $php_fpm_PID ] ; then
+			echo "warning, no pid file found - php-fpm is not running ?"
+			exit 1
+		fi
+
+		kill -QUIT `cat $php_fpm_PID`
+
+		wait_for_pid removed $php_fpm_PID
+
+		if [ -n "$try" ] ; then
+			echo " failed. Use force-exit"
+			exit 1
+		else
+			echo " done"
+		fi
+	;;
+
+	force-quit)
+		echo -n "Terminating php-fpm "
+
+		if [ ! -r $php_fpm_PID ] ; then
+			echo "warning, no pid file found - php-fpm is not running ?"
+			exit 1
+		fi
+
+		kill -TERM `cat $php_fpm_PID`
+
+		wait_for_pid removed $php_fpm_PID
+
+		if [ -n "$try" ] ; then
+			echo " failed"
+			exit 1
+		else
+			echo " done"
+		fi
+	;;
+
+	restart)
+		$0 stop
+		$0 start
+	;;
+
+	reload)
+
+		echo -n "Reload service php-fpm "
+
+		if [ ! -r $php_fpm_PID ] ; then
+			echo "warning, no pid file found - php-fpm is not running ?"
+			exit 1
+		fi
+
+		kill -USR2 `cat $php_fpm_PID`
+
+		echo " done"
+	;;
+
+	*)
+		echo "Usage: $0 {start|stop|force-quit|restart|reload}"
+		exit 1
+	;;
+
+esac

=== modified file 'SPECS/php53.spec'
--- SPECS/php53.spec	2010-06-15 10:22:24 +0000
+++ SPECS/php53.spec	2010-07-15 11:09:43 +0000
@@ -36,7 +36,7 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: %{name}
 Version: 5.3.2
-Release: 6.ius%{?dist}
+Release: 7.ius%{?dist}
 License: The PHP License v3.01
 Group: Development/Languages
 Vendor: IUS Community Project 
@@ -48,6 +48,9 @@
 Source3: macros.php
 Source4: macros.pear 
 Source5: README.psa-compat
+Source6: fpm_svn_r300604.tar.gz 
+Source7: php-fpm.conf
+Source8: php-fpm.initd
 
 Patch1: php-5.2.4-gnusrc.patch
 Patch2: php-5.3.2-install.patch
@@ -72,7 +75,6 @@
 BuildRequires: apr-devel, elfutils-libelf-devel, apr-util-devel
 BuildRequires: t1lib-devel, pcre-devel >= 6.6
 BuildRequires: libtool-ltdl-devel, e2fsprogs-devel
-
 # Enforce Apache module ABI compatibility
 Requires: httpd-mmn = %{httpd_mmn} 
 Requires: file >= 3.39
@@ -458,6 +460,21 @@
 support to PHP using system interfaces for inter-process
 communication.
 
+%if 0%{?_with_fpm}
+%package fpm
+Summary: Alternative PHP FastCGI implementation
+Group: Development/Languages
+Provides: %{real_name}-fpm = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+BuildRequires: libevent-devel
+
+%description fpm
+PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI 
+implementation with some additional features useful for sites 
+of any size, especially busier sites.
+
+%endif
+
 # Optional module support
 
 %if 0%{?_with_embedded}
@@ -544,6 +561,10 @@
 %setup -q -n %{real_name}-%{version} 
 cp -a %SOURCE5 . # README.psa-compat
 
+%if 0%{?_with_fpm}
+tar -xvzf %SOURCE6
+%endif
+
 %patch2 -p1 -b .install
 %patch6 -p1 -b .embed
 %patch7 -p1 -b .recode
@@ -565,7 +586,10 @@
 cp ext/ereg/regex/COPYRIGHT regex_COPYRIGHT
 
 # Multiple builds for multiple SAPIs 
-mkdir build-cgi build-apache build-embedded build-zts
+mkdir build-cgi build-apache build-embedded build-zts 
+%if 0%{?_with_fpm}
+mkdir build-fpm
+%endif
 
 # Remove bogus test; position of read position after fopen(, "a+")
 # is not defined by C standard, so don't presume anything.
@@ -629,6 +653,7 @@
 libtoolize --force --copy
 cat `aclocal --print-ac-dir`/libtool.m4 > build/libtool.m4
 
+
 # Regenerate configure scripts (patches change config.m4's)
 ./buildconf --force
 
@@ -762,6 +787,15 @@
 build --with-apxs2=%{_sbindir}/apxs %{without_shared} 
 popd
 
+%if 0%{?_with_fpm}
+#build fpm
+pushd build-fpm
+build --enable-fpm
+#cp ../sapi/fpm/LICENSE ../sapi/fpm/FPM_LICENSE
+#cp ../sapi/fpm/CREDITS ../sapi/fpm/FPM_CREDITS
+popd
+%endif
+
 %if 0%{?_with_embedded:1}
 # Build for inclusion as embedded script language into applications,
 # /usr/lib[64]/libphp5.so
@@ -805,11 +839,26 @@
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
+%if 0%{?_with_fpm}
+#install php-fpm and create the folder in /etc
+pushd build-fpm
+make install INSTALL_ROOT=%{buildroot} 
+cp -a  %SOURCE7 $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
+rm $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf.default
+install -m 755 -d  %{buildroot}%{_sysconfdir}/fpm.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
+install -m 755 %SOURCE8 $RPM_BUILD_ROOT%{_sysconfdir}/init.d/php-fpmd
+popd
+#cp sapi/fpm/LICENSE $RPM_BUILD_ROOT/fpm_LICENSE
+#cp sapi/fpm/CREDITS $RPM_BUILD_ROOT/fpm_CREDITS
+%endif
+
 # Install the version for embedded script language in applications + php_embed.h
 %if 0%{?_with_embedded}
 make -C build-embedded install-sapi install-headers INSTALL_ROOT=%{buildroot}
 %endif
 
+
 # Install everything from the CGI SAPI build
 pushd build-cgi
 make install INSTALL_ROOT=%{buildroot} 
@@ -930,6 +979,14 @@
 %postun embedded -p /sbin/ldconfig
 %endif
 
+%if 0%{?_with_fpm}
+%post fpm
+chkconfig --add php-fpmd
+%preun fpm
+chkconfig --del php-fpmd
+%endif
+
+
 %if 0%{?_with_psa}
 %post psa-compat
 mysql -uadmin -p`cat /etc/psa/.psa.shadow` psa -e 'update Components set 
@@ -961,6 +1018,7 @@
 %{_bindir}/php-cgi
 %{_mandir}/man1/php.1*
 
+
 %files devel
 %defattr(-,root,root)
 %{_bindir}/php-config
@@ -971,6 +1029,18 @@
 %{_mandir}/man1/phpize.1*
 %config %{_sysconfdir}/rpm/macros.php
 
+%if 0%{?_with_fpm}
+%files fpm
+%defattr(-,root,root)
+%config %{_sysconfdir}/php-fpm.conf
+%{_sbindir}/php-fpm
+%{_mandir}/man1/php-fpm.1.gz
+%{_sysconfdir}/fpm.d
+%{_sysconfdir}/init.d/php-fpmd
+%doc sapi/fpm/CREDITS 
+%doc sapi/fpm/LICENSE
+%endif
+
 %files pgsql -f files.pgsql
 %files mysql -f files.mysql
 %files odbc -f files.odbc