SPECS: php.spec - update fpm, daemon startups here, lighttpd can connect to...

[glen]

Author: glen                         Date: Sun Nov 16 15:35:47 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update fpm, daemon startups here, lighttpd can connect to it
- --disable-cli on other sapis

---- Files affected:
SPECS:
   php.spec (1.747 -> 1.748) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.747 SPECS/php.spec:1.748
--- SPECS/php.spec:1.747	Sun Nov 16 00:10:10 2008
+++ SPECS/php.spec	Sun Nov 16 16:35:41 2008
@@ -152,6 +152,8 @@
 Patch43:	%{name}-use-prog_sendmail.patch
 Patch44:	%{name}-fpm.patch
 Patch45:	%{name}-fpm-zts.patch
+Patch46:	%{name}-fpm-libs.patch
+Patch47:	%{name}-fpm-libevent.patch
 URL:		http://www.php.net/
 # Requires review:
 # http://securitytracker.com/alerts/2008/Oct/1020995.html
@@ -176,7 +178,7 @@
 %{?with_fdf:BuildRequires:	fdftk-devel}
 BuildRequires:	flex
 %if %{with mssql} || %{with sybase} || %{with sybase_ct}
-BuildRequires:	freetds-devel >= 0.82
+BuildRequires:	freetds-devel
 %endif
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gd-devel >= 2.0.28-4
@@ -197,7 +199,7 @@
 %{?with_ming:BuildRequires:	ming-devel >= 0.3}
 %{?with_mm:BuildRequires:	mm-devel >= 1.3.0}
 BuildRequires:	mysql-devel >= 4.0.0
-%{?with_mysqli:BuildRequires:	mysql-devel >= 5.1.29}
+%{?with_mysqli:BuildRequires:	mysql-devel >= 4.1}
 BuildRequires:	ncurses-ext-devel
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %if %{with openssl} || %{with ldap}
@@ -228,7 +230,7 @@
 %endif
 %if %{with fpm}
 BuildRequires:	judy-devel
-BuildRequires:	libevent-devel >= 1.2
+BuildRequires:	libevent-devel >= 1.4.7-3
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -335,6 +337,7 @@
 Summary(pl.UTF-8):	php jako program FastCGI
 Group:		Development/Languages/PHP
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+%{?with_fpm:Requires:	libevent >= 1.4.7-3}
 Provides:	webserver(php) = %{version}
 
 %description fcgi
@@ -1645,7 +1648,11 @@
 
 %if %{with fpm}
 %patch44 -p1
-%patch45 -p1
+cd sapi/cgi/fpm
+%patch45 -p0
+cd -
+%patch46 -p1
+%patch47 -p1
 %endif
 
 # conflict seems to be resolved by recode patches
@@ -1729,24 +1736,24 @@
 	sapi_args=''
 	case $sapi in
 	cgi)
-		sapi_args='--enable-discard-path --enable-force-cgi-redirect'
+		sapi_args='--disable-cli --enable-discard-path --enable-force-cgi-redirect'
 		;;
 	cli)
 		sapi_args='--disable-cgi'
 		;;
 	fcgi)
-		sapi_args='--enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect'
+		sapi_args='--disable-cli --enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect'
 		;;
 	fpm)
-		sapi_args='--enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect --enable-fpm'
+		sapi_args='--disable-cli --enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect --enable-fpm'
 		;;
 	apxs1)
 		ver=$(rpm -q --qf '%{V}' apache1-devel)
-		sapi_args="--with-apxs=%{apxs1} --with-apache-version=$ver"
+		sapi_args="--disable-cli --with-apxs=%{apxs1} --with-apache-version=$ver"
 		;;
 	apxs2)
 		ver=$(rpm -q --qf '%{V}' apache-devel)
-		sapi_args="--with-apxs2=%{apxs2} --with-apache-version=$ver"
+		sapi_args="--disable-cli --with-apxs2=%{apxs2} --with-apache-version=$ver"
 		;;
 	esac
 
@@ -1877,6 +1884,7 @@
 
 	cp -f Makefile Makefile.$sapi
 	cp -f main/php_config.h php_config.h.$sapi
+	cp -f config.log config.log.$sapi
 done
 
 # must make this first, so modules can link against it.
@@ -2834,6 +2842,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.748  2008/11/16 15:35:41  glen
+- update fpm, daemon startups here, lighttpd can connect to it
+- --disable-cli on other sapis
+
 Revision 1.747  2008/11/15 23:10:10  arekm
 - release 17
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.747&r2=1.748&f=u