SPECS (DEVEL): php.spec - add -fcgi-graceful.patch

[glen]

Author: glen                         Date: Wed Nov  7 20:38:52 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- add -fcgi-graceful.patch

---- Files affected:
SPECS:
   php.spec (1.688.2.5 -> 1.688.2.6) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.5 SPECS/php.spec:1.688.2.6
--- SPECS/php.spec:1.688.2.5	Wed Nov  7 15:42:22 2007
+++ SPECS/php.spec	Wed Nov  7 21:38:45 2007
@@ -13,6 +13,7 @@
 # - make additional headers and checking added by mail patch configurable
 # - apply -hardened patch by default ?
 # - modularize session, standard (output from pure php -m)?
+# - sapi/cgi has fastcgi always built in, ie -fcgi and -cgi packages are the same
 #
 # Conditional build:
 %bcond_with	fdf		# with FDF (PDF forms) module		(BR: proprietary lib)
@@ -72,7 +73,7 @@
 %undefine	with_filter
 %endif
 
-%define	_rel	0.3
+%define	_rel	0.13
 %define	_snap	200711071330
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
@@ -129,6 +130,7 @@
 Patch28:	%{name}-pear.patch
 Patch29:	%{name}-config-dir.patch
 Patch30:	%{name}-bug-42952.patch
+Patch31:	%{name}-fcgi-graceful.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1591,6 +1593,7 @@
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1635,6 +1638,7 @@
 	touch _built-conf
 fi
 export PROG_SENDMAIL="/usr/lib/sendmail"
+export CPPFLAGS=-DDEBUG_FASTCGI
 
 sapis="
 %if %{with fcgi}
@@ -1822,7 +1826,7 @@
 cp -af php_config.h.cgi main/php_config.h
 rm -rf sapi/cgi/.libs sapi/cgi/*.lo
 %{__make} sapi/cgi/php-cgi -f Makefile.cgi
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -q)" = cgi ] || exit 1
+#[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -q)" = cgi ] || exit 1
 
 # CLI
 cp -af php_config.h.cli main/php_config.h
@@ -2733,6 +2737,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.688.2.6  2007/11/07 20:38:45  glen
+- add -fcgi-graceful.patch
+
 Revision 1.688.2.5  2007/11/07 14:42:22  glen
 - 200711071330 snapshot, cgi thinks it is fcgi ;(
 - merges from HEAD
================================================================

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