packages: php/php-fpm-config.patch, php/php.spec - php-fpm fixes

[glen]

Author: glen                         Date: Sun Jul 25 19:38:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- php-fpm fixes

---- Files affected:
packages/php:
   php-fpm-config.patch (1.8 -> 1.9) , php.spec (1.880 -> 1.881) 

---- Diffs:

================================================================
Index: packages/php/php-fpm-config.patch
diff -u packages/php/php-fpm-config.patch:1.8 packages/php/php-fpm-config.patch:1.9
--- packages/php/php-fpm-config.patch:1.8	Sun Jul 25 12:15:50 2010
+++ packages/php/php-fpm-config.patch	Sun Jul 25 21:38:24 2010
@@ -1,5 +1,14 @@
---- php-5.3.3/sapi/fpm/php-fpm.conf.in~	2010-05-29 13:39:35.000000000 +0300
-+++ php-5.3.3/sapi/fpm/php-fpm.conf.in	2010-07-24 22:29:56.752470466 +0300
+--- php-5.3.3/sapi/fpm/php-fpm.conf.in	2010-07-24 22:29:56.752470466 +0300
++++ php-5.3.3/sapi/fpm/php-fpm.conf.in	2010-07-25 22:30:52.547803067 +0300
+@@ -84,7 +84,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
 @@ -245,7 +245,7 @@
  ; the current environment.
  ; Default Value: clean env

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.880 packages/php/php.spec:1.881
--- packages/php/php.spec:1.880	Sun Jul 25 20:06:49 2010
+++ packages/php/php.spec	Sun Jul 25 21:38:24 2010
@@ -1934,7 +1934,7 @@
 		sapi_args='--disable-cgi %{?with_gcov:--enable-gcov}'
 	;;
 	fpm)
-		sapi_args='--disable-cli --with-fpm'
+		sapi_args='--disable-cli --enable-fpm'
 		;;
 	apxs1)
 		ver=$(rpm -q --qf '%{V}' apache1-devel)
@@ -1981,11 +1981,6 @@
 	--enable-hash=shared \
 	--enable-xmlwriter=shared \
 %if %{with fpm}
-	--with-libevent=shared \
-	--with-fpm-conf=%{_sysconfdir}/fpm.conf \
-	--with-fpm-log=/var/log/fpm.log \
-	--with-fpm-pid=/var/run/php/fpm.pid \
-	--with-fpm-port=9000 \
 	--with-fpm-user=http \
 	--with-fpm-group=http \
 %endif
@@ -2223,9 +2218,10 @@
 
 # install FCGI PM
 %if %{with fpm}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/fpm.d
 libtool --silent --mode=install install sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_bindir}/php.fpm
-cp -a sapi/fpm/php-fpm.1 $RPM_BUILD_ROOT%{_mandir}/man1/php-fpm.1
-cp -a sapi/fpm/php_fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}/fpm.conf
+cp -a sapi/fpm/php-fpm.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/php-fpm
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
@@ -2650,7 +2646,8 @@
 %defattr(644,root,root,755)
 %doc %lang(ru) sapi/fpm/readme-ru.markdown
 %doc sapi/fpm/nginx-site-conf.sample
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fpm.conf
+%dir %{_sysconfdir}/fpm.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.conf
 %attr(755,root,root) %{_bindir}/php.fpm
 %{_mandir}/man1/php-fpm.1*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/php-fpm
@@ -3126,6 +3123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.881  2010/07/25 19:38:24  glen
+- php-fpm fixes
+
 Revision 1.880  2010/07/25 18:06:49  glen
 - fix test
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-fpm-config.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.880&r2=1.881&f=u