SPECS: php.spec - rel 2 - fix phpize in builddir.patch - force-cgi...

arekm arekm at pld-linux.org
Sat Sep 10 22:15:25 CEST 2005


Author: arekm                        Date: Sat Sep 10 20:15:25 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2
- fix phpize in builddir.patch
- force-cgi-redirect enabled for cgi-like SAPIs
- enable zts mode for all SAPIs
- use php_config.h.fcgi.${sapi} instead of hardcoded CFLAGS
- install SAPI so's using libtool

---- Files affected:
SPECS:
   php.spec (1.470 -> 1.471) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.470 SPECS/php.spec:1.471
--- SPECS/php.spec:1.470	Sat Sep 10 00:51:12 2005
+++ SPECS/php.spec	Sat Sep 10 22:15:20 2005
@@ -78,7 +78,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
 Version:	5.0.5
-Release:	1%{?with_hardening:hardened}
+Release:	2%{?with_hardening:hardened}
 Epoch:		4
 Group:		Libraries
 License:	PHP
@@ -126,6 +126,7 @@
 Patch29:	%{name}-gcc4.patch
 Patch30:	%{name}-hardening-fix.patch
 Patch31:	%{name}-both-apxs.patch
+Patch32:	%{name}-builddir.patch
 Icon:		php.gif
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
@@ -1474,15 +1475,11 @@
 patch -p1 < %{PATCH30}
 %endif
 %patch31 -p1
+%patch32 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
 
-# fix lib path in phpize
-cd scripts/
-sed -i -e 's,lib/php,%{_lib}/php,' phpize.in
-cd ..
-
 # new apr
 sed -i -e 's#apr-config#apr-1-config#g' sapi/apache*/*.m4
 
@@ -1519,13 +1516,13 @@
 	`
 	case $sapi in
 	cgi)
-		echo --enable-discard-path
+		echo --enable-discard-path --enable-force-cgi-redirect
 	;;
 	cli)
 		echo --disable-cgi
 	;;
 	fcgi)
-		echo --enable-fastcgi --with-fastcgi=/usr
+		echo --enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect
 	;;
 	apxs1)
 		ver=%(rpm -q --qf '%%{version}' apache1-apxs)
@@ -1533,7 +1530,7 @@
 	;;
 	apxs2)
 		ver=%(rpm -q --qf '%%{version}' apache-apxs)
-		echo --with-apxs2=%{apxs2} --with-apache-version=$ver --enable-maintainer-zts
+		echo --with-apxs2=%{apxs2} --with-apache-version=$ver
 	;;
 	esac
 	` \
@@ -1542,6 +1539,7 @@
 	--with-config-file-scan-dir=%{_sysconfdir}/conf.d \
 	--with-exec-dir=%{_bindir} \
 	--%{!?debug:dis}%{?debug:en}able-debug \
+	--enable-maintainer-zts \
 	--enable-memory-limit \
 	--enable-bcmath=shared \
 	--enable-calendar=shared \
@@ -1652,9 +1650,6 @@
 # fix install paths, avoid evil rpaths
 sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la
 
-# for fcgi: -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0
-# -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1(die) -DHAVE_SYS_PARAM_H=1
-# -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1
 %if %{with apache1}
 %{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp5.la -f Makefile.apxs1
 sed -i -e "
@@ -1669,19 +1664,18 @@
 s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache |" sapi/apache2handler/libphp5.la
 %endif
 
-%{__make} sapi/cgi/php -f Makefile.fcgi \
-	CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1 -DHAVE_SYS_PARAM_H=1 -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1"
+# FCGI
+cp -af php_config.h.fcgi main/php_config.h
+%{__make} sapi/cgi/php -f Makefile.fcgi
 cp -r sapi/cgi sapi/fcgi
 rm -rf sapi/cgi/.libs sapi/cgi/*.lo
 
-# notes:
-# -DENABLE_CHROOT_FUNC=1 (cgi,fcgi) is used in ext/standard/dir.c (libphp_common)
-# -DPHP_WRITE_STDOUT is used also for cli, but not set by its config.m4
-
-%{__make} sapi/cgi/php -f Makefile.cgi \
-	CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DPHP_WRITE_STDOUT=1"
+# CGI
+cp -af php_config.h.cgi main/php_config.h
+%{__make} sapi/cgi/php -f Makefile.cgi
 
 # CLI
+cp -af php_config.h.cli main/php_config.h
 %{__make} sapi/cli/php -f Makefile.cli
 
 %install
@@ -1696,21 +1690,19 @@
 # install apache1 DSO module
 %if %{with apache1}
 # TODO: use libtool here
-install sapi/apache/.libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.so
+libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1/
 %endif
 
 # install apache2 DSO module
 %if %{with apache2}
-# TODO: use libtool here
-install sapi/apache2handler/.libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.so
+libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache/
 %endif
 
 libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir}
 
 # install the apache modules' files
 make install-headers install-build install-modules install-programs \
-	INSTALL_ROOT=$RPM_BUILD_ROOT \
-	phpbuilddir=%{_libdir}/php/build
+	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # as of 5.0.5, phpextdist isn't installed by default
 install scripts/dev/phpextdist $RPM_BUILD_ROOT%{_bindir}
@@ -2916,6 +2908,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.471  2005/09/10 20:15:20  arekm
+- rel 2
+- fix phpize in builddir.patch
+- force-cgi-redirect enabled for cgi-like SAPIs
+- enable zts mode for all SAPIs
+- use php_config.h.fcgi.${sapi} instead of hardcoded CFLAGS
+- install SAPI so's using libtool
+
 Revision 1.470  2005/09/09 22:51:12  arekm
 - rel 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.470&r2=1.471&f=u




More information about the pld-cvs-commit mailing list