- use SCRIPT_NAME instead of REQUEST_URI (won't leak passwords and such things in...

[packages/php.git] / php.spec

diff --git a/php.spec b/php.spec
index 39b1786f513764ca1888de8775d6930c4be2d0e5..685f3429fb43813d6e2c1c54cbaf61f603ee0541 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -1,6 +1,5 @@
 #
 # TODO:
-# - fastcgi option in cgi SAPI? or separate fcgi SAPI?
 # - make sure that session-unregister patch is no longer needed
 #   (any crash reports related to session modules?)
 #
@@ -30,7 +29,7 @@
 %bcond_without pcre            # without PCRE extension module
 %bcond_without pdf             # without PDF extension module
 %bcond_without pgsql           # without PostgreSQL extension module
-%bcond_without aspell          # without pspell extension module
+%bcond_without pspell          # without pspell extension module
 %bcond_without recode          # without recode extension module
 %bcond_without qtdom           # without QT DOM extension module
 %bcond_without snmp            # without SNMP extension module
@@ -61,14 +60,16 @@ Summary(pt_BR):     A linguagem de script PHP
 Summary(ru):   PHP ÷ÅÒÓÉÉ 4 -- ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ
 Summary(uk):   PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
-Version:       4.3.4
-Release:       3
+Version:       4.3.5
+%define        _pre    RC4
+%define        _version        4.3.5%{_pre}
+Release:       0.%{_pre}
 Epoch:         3
 Group:         Libraries
 License:       PHP
 #Source0:      http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-Source0:       http://downloads.php.net/ilia/%{name}-%{version}.tar.bz2
-# Source0-md5: b9dd601863e08e52e3c4d5e02c2627cf
+Source0:       http://downloads.php.net/ilia/%{name}-%{_version}.tar.bz2
+# Source0-md5: 677df559363411d0251c009c15d4eada
 Source1:       FAQ.%{name}
 Source2:       zend.gif
 Source4:       %{name}-module-install
@@ -91,24 +92,22 @@ Patch11:    %{name}-mcal-shared-lib.patch
 Patch12:       %{name}-msession-shared-lib.patch
 Patch13:       %{name}-build_modules.patch
 Patch14:       %{name}-sapi-ini-file.patch
-Patch15:       %{name}-ncurses.patch
-Patch16:       %{name}-no-metaccld.patch
-Patch17:       %{name}-session-unregister.patch
-Patch18:       %{name}-ini.patch
-Patch19:       %{name}-acam.patch
-Patch20:       %{name}-xmlrpc-fix.patch
-Patch21:       %{name}-libtool.patch
-Patch22:       %{name}-allow-db31.patch
-Patch23:       %{name}-threads-acfix.patch
-Patch24:       %{name}-tsrmlsfetchgcc2.patch
-Patch25:       %{name}-qt.patch
-Patch26:       %{name}-no_pear_install.patch
-Patch27:       %{name}-zlib.patch
-Patch28:       %{name}-db-shared.patch
-Patch29:       %{name}-sybase-fix.patch
-Patch30:       %{name}-mssql-fix.patch
-Patch31:       %{name}-phpize_fixes.patch
-Patch32:       %{name}-db42.patch
+Patch15:       %{name}-no-metaccld.patch
+Patch16:       %{name}-session-unregister.patch
+Patch17:       %{name}-ini.patch
+Patch18:       %{name}-acam.patch
+Patch19:       %{name}-xmlrpc-fix.patch
+Patch20:       %{name}-libtool.patch
+Patch21:       %{name}-allow-db31.patch
+Patch22:       %{name}-threads-acfix.patch
+Patch23:       %{name}-tsrmlsfetchgcc2.patch
+Patch24:       %{name}-qt.patch
+Patch25:       %{name}-no_pear_install.patch
+Patch26:       %{name}-zlib.patch
+Patch27:       %{name}-db-shared.patch
+Patch28:       %{name}-sybase-fix.patch
+Patch29:       %{name}-mssql-fix.patch
+Patch30:       %{name}-lib64.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
@@ -159,7 +158,7 @@ BuildRequires:      mysql-devel >= 3.23.32
 BuildRequires: ncurses-devel
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.0}
 %if %{with openssl} || %{with ldap}
-BuildRequires: openssl-devel >= 0.9.7c
+BuildRequires: openssl-devel >= 0.9.7d
 %endif
 BuildRequires: pam-devel
 %{?with_pdf:BuildRequires:     pdflib-devel >= 4.0.0}
@@ -181,7 +180,7 @@ BuildRequires:      t1lib-devel
 BuildRequires: zip
 BuildRequires: zlib-devel >= 1.0.9
 BuildRequires: zziplib-devel
-#BuildRequires:        fcgi-devel
+BuildRequires: fcgi-devel
 # apache 1.3 vs apache 2.0
 %if %{_apache2}
 BuildRequires:  apr-devel >= 1:0.9.4-1
@@ -201,6 +200,7 @@ Obsoletes:  apache-mod_php
 %define                _sysconfdir     /etc/php
 %define                extensionsdir   %{_libdir}/php
 %define                httpdir         /home/services/httpd
+%define                _ulibdir        %{_prefix}/lib
 
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
@@ -268,6 +268,19 @@ PHP4 - 
 ÍÁ¤ÔÅ ÔÁËÏÖ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÅÔ %{name}-common. ñËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÅÎ
 ¦ÎÔÅÒÐÒÅÔÁÔÏÒ PHP × ÑËÏÓÔ¦ ÍÏÄÕÌÑ apache, ×ÓÔÁÎÏצÔØ ÐÁËÅÔ apache-php.
 
+%package fcgi
+Summary:       PHP as FastCGI program
+Summary(pl):   PHP jako program FastCGI
+Group:         Development/Languages/PHP
+PreReq:                %{name}-common = %{epoch}:%{version}
+Provides:      php-program = %{epoch}:%{version}-%{release}
+
+%description fcgi
+PHP as FastCGI program.
+
+%description fcgi -l pl
+PHP jako program FastCGI.
+
 %package cgi
 Summary:       PHP as CGI program
 Summary(pl):   PHP jako program CGI
@@ -1349,7 +1362,7 @@ handlers for different XML events.
 
 %description xml -l pl
 Modu³ PHP umo¿liwiaj±cy parsowanie plików XML i obs³ugê zdarzeñ
-zwi±zanych z tymi plikami. Pozwala on tworzyæ analizatory XML i
+zwi±zanych z tymi plikami. Pozwala on tworzyæ analizatory XML-a i
 nastêpnie definiowaæ procedury obs³ugi dla ró¿nych zdarzeñ XML.
 
 %package xmlrpc
@@ -1470,7 +1483,7 @@ PEAR/*.php), dostarczanych z PHP, zainstaluj odpowiednie pakiety
 php-pear-* (php-pear-PEAR, php-pear-Archive_Tar, itp).
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -1488,11 +1501,11 @@ php-pear-* (php-pear-PEAR, php-pear-Archive_Tar, itp).
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
 cp php.ini-dist php.ini
-%patch18 -p1
+%patch17 -p1
 # for ac2.53b/am1.6b - AC_LANG_CXX has AM_CONDITIONAL, so cannot be invoked
 # conditionally...
+%patch18 -p1
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
@@ -1504,9 +1517,9 @@ cp php.ini-dist php.ini
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%ifarch amd64
 %patch30 -p1
-%patch31 -p0
-%patch32 -p1
+%endif
 
 %build
 CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"
@@ -1516,7 +1529,7 @@ EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR
 %{__aclocal}
 %{__autoconf}
 PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL
-for i in cgi cli apxs ; do
+for i in fcgi cgi cli apxs ; do
 %configure \
        `[ $i = cgi ] && echo --enable-discard-path` \
        `[ $i = cli ] && echo --disable-cgi` \
@@ -1647,6 +1660,15 @@ done
 %{__perl} -pi -e "s|^libdir=.*|libdir='%{_libdir}/apache'|" libphp4.la
 %{__perl} -pi -e 's|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache |' libphp4.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
+
+%{__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"
+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
@@ -1654,10 +1676,6 @@ done
 %{__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"
 
-# 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
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache},%{_sysconfdir}/{apache,cgi}} \
@@ -1668,7 +1686,7 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache},%{_sysconfdir}/{apache,cgi}}
 
 %{__make} install \
        INSTALL_ROOT=$RPM_BUILD_ROOT \
-       INSTALL_IT="\$(LIBTOOL) --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} ; \$(LIBTOOL) --mode=install install libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache ; \$(LIBTOOL) --mode=install install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php.cgi" \
+       INSTALL_IT="\$(LIBTOOL) --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir} ; \$(LIBTOOL) --mode=install install libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache ; \$(LIBTOOL) --mode=install install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php.cgi ; \$(LIBTOOL) --mode=install install sapi/fcgi/php $RPM_BUILD_ROOT%{_bindir}/php.fcgi" \
        INSTALL_CLI="\$(LIBTOOL) --mode=install install sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli"
 
 # compatibility (/usr/bin/php used to be CGI SAPI)
@@ -1678,6 +1696,7 @@ ln -sf php.cgi $RPM_BUILD_ROOT%{_bindir}/php
 
 install php.ini        $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
 install %{SOURCE6} %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
 install %{SOURCE2} php.gif $RPM_BUILD_ROOT%{httpdir}/icons
 install %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/70_mod_php.conf
@@ -1689,6 +1708,10 @@ cp -f Zend/LICENSE{,.Zend}
 # Directories created for pear:
 install -d $RPM_BUILD_ROOT%{php_pear_dir}/{Archive,Console,Crypt,HTML/Template,Image,Net,Science,XML}
 
+%ifarch amd64
+ln -sf ../../lib/%{name}/build $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+%endif
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp4.la
 
 %clean
@@ -2317,6 +2340,11 @@ fi
 %attr(755,root,root) %{_libdir}/apache/libphp4.so
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini
 
+%files fcgi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/php.fcgi
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-cgi-fcgi.ini
+
 %files cgi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/php.cgi
@@ -2354,6 +2382,9 @@ fi
 %{_libdir}/libphp_common.la
 %{_includedir}/php
 %{_libdir}/php/build
+%ifarch amd64
+%{_ulibdir}/php/build
+%endif
 
 %files bcmath
 %defattr(644,root,root,755)