X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php.spec;h=14e581db0e3664515580051c1a34ea66c4916d54;hb=e7931c970fc25d44ac6358cc638aa94a395ba048;hp=2d7ea87c6382e47a447c93a7334a3b3c3ccc32a5;hpb=8391bb23242fe8e54e6756bdd7d73a791ae7f42c;p=packages%2Fphp.git diff --git a/php.spec b/php.spec index 2d7ea87..14e581d 100644 --- a/php.spec +++ b/php.spec @@ -1,20 +1,11 @@ # TODO 5.4: # - do not remove PatchX: definitions until merged to HEAD, needed for tracking their state # - check php-sapi-ini-file.patch for safe mode removal -# - enable suhoshin patch (needs api porting) -# - enable litespeed (needs api porting) # - update imap annotations patch (needs api porting) # - update imap myrights patch (needs api porting) # --with-libmbfl=DIR MBSTRING: Use external libmbfl. DIR is the libmbfl base install directory BUNDLED # --with-onig=DIR MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. # - uses libvpx for webp support, should use libwebp-devel instead? -# - fpm -qn check fails, as it still loads /etc/php/php.ini -# - co-install with php 5.3: -# file /etc/rc.d/init.d/php-fpm from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686 -# file /usr/sbin/php-fpm from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686 -# file /usr/share/man/man8/php-fpm.8.gz from install of php54-fpm-5.4.5-0.2.i686 conflicts with file from package php-fpm-5.3.14-1.i686 -# file /usr/bin/php.cli from install of php54-cli-5.4.5-0.2.i686 conflicts with file from package php-cli-5.3.14-1.i686 -# file /usr/share/man/man1/php.1.gz from install of php54-cli-5.4.5-0.2.i686 conflicts with file from package php-cli-5.3.14-1.i686 # NOTE: mysqlnd does not support ssl or compression (see FAQ at http://dev.mysql.com/downloads/connector/php-mysqlnd/) # UNPACKAGED EXTENSION NOTES: # - com_dotnet is Win32-only @@ -53,13 +44,15 @@ %bcond_with instantclient # build Oracle oci8 extension module against oracle-instantclient package %bcond_with system_gd # with system gd (we prefer internal since it enables few more features) %bcond_with system_libzip # with system libzip (reported broken currently) +%bcond_with default_php # use this PHP as default PHP in distro %bcond_without curl # without CURL extension module %bcond_without enchant # without Enchant extension module %bcond_without filter # without filter extension module %bcond_without imap # without IMAP extension module %bcond_without interbase # without InterBase extension module +%bcond_without intl # without Intl extension module %bcond_without kerberos5 # without Kerberos5 support -%bcond_with litespeed # build litespeed module +%bcond_without litespeed # build litespeed module %bcond_without ldap # without LDAP extension module %bcond_without mhash # without mhash extension (supported by hash extension) %bcond_without mm # without mm support for session storage @@ -89,14 +82,13 @@ %bcond_without cgi # disable CGI/FCGI SAPI %bcond_without fpm # disable FPM %bcond_with embed # disable Embedded API -%bcond_with suhosin # with suhosin patch +%bcond_without suhosin # with suhosin patch %bcond_with tests # default off; test process very often hangs on builders, approx run time 45m; perform "make test" %bcond_with gcov # Enable Code coverage reporting %bcond_with type_hints # experimental support for strict typing/casting %define apxs1 /usr/sbin/apxs1 %define apxs2 /usr/sbin/apxs -%define litespeed_version 5.5 # disable all sapis %if %{with gcov} @@ -132,10 +124,10 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif +%define rel 1 %define orgname php -%define php_suffix 54 - -%define rel 0.15 +%define ver_suffix 54 +%define php_suffix %{!?with_default_php:%{ver_suffix}} Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -143,13 +135,13 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 5.4.6 +Version: 5.4.19 Release: %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci} Epoch: 4 License: PHP Group: Libraries Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2 -# Source0-md5: c9aa0f4996d1b91ee9e45afcfaeb5d2e +# Source0-md5: f06f99b9872b503758adab5ba7a7e755 Source2: %{orgname}-mod_%{orgname}.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -161,9 +153,6 @@ Source11: %{orgname}-fpm.logrotate Source12: %{orgname}-branch.sh Source13: dep-tests.sh Source14: skip-tests.sh -# Source15Download: http://litespeedtech.com/lsapi-downloads.html -Source15: http://litespeedtech.com/packages/lsapi/%{orgname}-litespeed-%{litespeed_version}.tgz -# Source15-md5: 9d58485d5fd6b5f5fefcec41b9ce283e Patch0: %{orgname}-shared.patch Patch1: %{orgname}-pldlogo.patch Patch2: %{orgname}-mail.patch @@ -173,7 +162,6 @@ Patch5: %{orgname}-filter-shared.patch Patch6: %{orgname}-build_modules.patch Patch7: %{orgname}-sapi-ini-file.patch Patch8: %{orgname}-config-file-scan-dir.patch -Patch9: %{orgname}-sh.patch Patch10: %{orgname}-ini.patch Patch11: embed.patch %if %{with type_hints} @@ -222,8 +210,9 @@ Patch60: %{orgname}-oracle-instantclient.patch Patch62: mcrypt-libs.patch Patch63: %{orgname}-mysql-nowarning.patch #Patch64: %{orgname}-m4.patch # not needed on 5.4 branch -# http://spot.fedorapeople.org/php-5.3.6-libzip.patch Patch65: system-libzip.patch +Patch66: php-db.patch +Patch67: php-bug-60598.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} @@ -237,9 +226,8 @@ BuildRequires: db-devel >= 4.0 BuildRequires: elfutils-devel %{?with_enchant:BuildRequires: enchant-devel >= 1.1.3} #BuildRequires: fcgi-devel -#BuildRequires: flex %{?with_kerberos5:BuildRequires: heimdal-devel} -%{?with_system_libzip:BuildRequires: libzip-devel >= 0.10-3} +%{?with_system_libzip:BuildRequires: libzip-devel >= 0.10.1-2} %{!?with_mysqlnd:BuildRequires: mysql-devel} BuildRequires: pkgconfig BuildRequires: sed >= 4.0 @@ -254,7 +242,7 @@ BuildRequires: gd-devel(imagerotate) = 5.2.0 BuildRequires: gdbm-devel BuildRequires: gmp-devel %{?with_imap:BuildRequires: imap-devel >= 1:2007e-2} -BuildRequires: libicu-devel +%{?with_intl:BuildRequires: libicu-devel} BuildRequires: libjpeg-devel BuildRequires: libltdl-devel >= 1.4 BuildRequires: libmcrypt-devel >= 2.4.4 @@ -450,8 +438,11 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: %{name}-fcgi = %{epoch}:%{version}-%{release} Provides: php(cgi) Provides: php(fcgi) -Provides: webserver(php) +Provides: webserver(php) = %{version} Obsoletes: php-fcgi < 4:5.3.0 +%if "%{pld_release}" != "ac" +Conflicts: logrotate < 3.8.0 +%endif %description cgi PHP as CGI or FastCGI program. @@ -527,7 +518,7 @@ Group: Libraries Requires(post): sed >= 4.0 # because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit Requires: glibc >= 6:2.3.5 -Requires: php-dirs +Requires: php-dirs >= 1.4 Requires: rpm-whiteout >= 1.28 Requires: tzdata Provides: %{name}(debug) = %{php_debug} @@ -535,10 +526,12 @@ Provides: %{name}(modules_api) = %{php_api_version} Provides: %{name}(thread-safety) = %{zend_zts} Provides: %{name}(zend_extension_api) = %{zend_extension_api} Provides: %{name}(zend_module_api) = %{zend_module_api} +Provides: %{name}-core Provides: %{name}-date Provides: %{name}-ereg Provides: %{name}-reflection Provides: %{name}-standard +Provides: php(core) = %{version} Provides: php(date) Provides: php(ereg) Provides: php(hash) @@ -1405,11 +1398,12 @@ Group: Libraries URL: http://www.php.net/manual/en/book.phar.php Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-spl = %{epoch}:%{version}-%{release} +Suggests: %{name}-cli # zlib is required by phar program, but as phar cli is optional should the dep be too Suggests: %{name}-zlib -Suggests: php-program Provides: php(phar) = %{pharver} Obsoletes: php-pecl-phar < %{pharver} +Conflicts: php-ioncube < 4.0.9 %description phar This is a dynamic shared object (DSO) for PHP that will add phar @@ -1845,7 +1839,7 @@ Summary(pl.UTF-8): Zarządzanie archiwami zip Group: Libraries URL: http://www.php.net/manual/en/book.zip.php Requires: %{name}-common = %{epoch}:%{version}-%{release} -%{?with_system_libzip:Requires: libzip >= 0.10-3} +%{?with_system_libzip:Requires: libzip >= 0.10.1-2} Provides: php(zip) = %{zipver} Obsoletes: php-pecl-zip < %{zipver} @@ -1873,8 +1867,6 @@ Moduł PHP umożliwiający używanie kompresji zlib. %prep %setup -q -n %{orgname}-%{version} -# prep for suhosin patch -%undos Zend/Zend.dsp Zend/ZendTS.dsp %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -1884,7 +1876,6 @@ Moduł PHP umożliwiający używanie kompresji zlib. %patch6 -p1 %patch8 -p1 %patch7 -p1 -%patch9 -p1 cp -p php.ini-production php.ini %patch10 -p1 %if %{with type_hints} @@ -1936,8 +1927,8 @@ cp -p php.ini-production php.ini %patch62 -p1 %patch63 -p1 %{?with_system_libzip:%patch65 -p1} -%{__rm} -r sapi/litespeed -gzip -dc %{SOURCE15} | tar xf - -C sapi/ +%patch66 -p1 +%patch67 -p1 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 @@ -1973,6 +1964,21 @@ sed -i -e 's#-fvisibility=hidden##g' configure* # says just "Terminated" twice and fails mv sapi/cli/tests/022.phpt{,.broken} +# really dumb test, executable binary name is .libs/ something when building +# https://bugs.php.net/bug.php?id=54514 +mv tests/basic/bug54514.phpt{,.disable} + +# breaks whole testsuite unexpectedly: +# Fatal error: Call to undefined function gzencode() in run-tests.php on line 1714 +# probably broken as zlib is built as shared +mv ext/soap/tests/server019.phpt{,disable} +# Fatal error: Call to undefined function gzcompress() in run-tests.php on line 1728 +mv ext/soap/tests/server020.phpt{,disable} + +# runs out of memory and kills carme vserver +# PASS Bug #39438 (Fatal error: Out of memory) [Zend/tests/bug39438.phpt] +mv Zend/tests/bug39438.phpt{,.disable} + # php-5.3.3/ext/standard/tests/file/statpage.phpt %{__rm} ext/standard/tests/file/statpage.phpt @@ -1981,7 +1987,24 @@ mv sapi/cli/tests/022.phpt{,.broken} # probably pointless. %{__rm} ext/standard/tests/file/disk_free_space_basic.phpt -#sh -xe %{_sourcedir}/skip-tests.sh +%ifarch %{x8664} +# all pdo_sqlite, sqlite3 tests die with Aborted on carme +%{__rm} -r ext/pdo_sqlite/tests +%{__rm} -r ext/sqlite3/tests +%endif + +# skip XFAILs +# no point testing stuff that is knowingly broken +find -name '*.phpt' | xargs grep XFAIL -l | xargs rm -v + +env \ +%ifarch %{ix86} +ix86= x8664=: +%endif +%ifarch %{x8664} +ix86=: x8664= \ +%endif + sh -xe %{_sourcedir}/skip-tests.sh %build API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h) @@ -2147,7 +2170,7 @@ for sapi in $sapis; do --enable-fileinfo=shared \ --enable-ftp=shared \ --enable-gd-native-ttf \ - --enable-intl=shared \ + %{?with_intl:--enable-intl=shared} \ --enable-libxml \ --enable-mbstring=shared,all \ --enable-mbregex \ @@ -2276,7 +2299,6 @@ cp -pf php_config.h.cgi-fcgi main/php_config.h %if %{with fpm} cp -pf php_config.h.fpm main/php_config.h %{__make} -f Makefile.fpm -./sapi/fpm/php-fpm -n -m [ $(./sapi/fpm/php-fpm -n -m | grep cgi-fcgi) = "cgi-fcgi" ] %endif @@ -2330,11 +2352,6 @@ cp -pf Makefile.cli Makefile exit 1 %endif -%if %{with tests} -# Run tests, using the CLI SAPI -cp -pf php_config.h.cli main/php_config.h -cp -pf Makefile.cli Makefile - cat <<'EOF' > run-tests.sh #!/bin/sh export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 @@ -2345,17 +2362,23 @@ unset TZ LANG LC_ALL || : RUN_TESTS_SETTINGS="-q $*" EOF chmod +x run-tests.sh -./run-tests.sh -w failed.log -s test.log + +%if %{with tests} +# Run tests, using the CLI SAPI +cp -pf php_config.h.cli main/php_config.h +cp -pf Makefile.cli Makefile + +./run-tests.sh -w failed.log -s tests.log # collect failed tests into cleanup script used in prep. -sed -ne '/FAILED TEST SUMMARY/,/^===/p' test.log | sed -e '1,/^---/d;/^===/,$d' > tests-failed.log -sed -ne '/\[.*\]/{s/\(.*\) \[\(.*\)\]/# \1\nmv \2{,.skip}/p}' tests-failed.log \ +sed -ne '/^FAILED TEST SUMMARY/,/^===/p' tests.log | sed -e '1,/^---/d;/^===/,$d' > tests-failed.log +sed -ne '/^via/d;/\[.*\]/{s/\t*\(.*\) \[\(.*\)\]\(.*\)/# \1\3\nmv \2{,.skip}/p}' tests-failed.log \ >> %{_sourcedir}/skip-tests.sh -failed=$(wc -l < tests-failed.log) -if [ "$failed" != 0 ]; then - exit 1 -fi +# if on builders, dump test log +tty -q || cat tests.log + +test ! -s failed.log %endif %install @@ -2373,14 +2396,21 @@ cp -pf Makefile.cli Makefile # make link relative ln -sfn phar.phar $RPM_BUILD_ROOT%{_bindir}/phar +# version suffix +v=$(echo %{version} | cut -d. -f1-2) + # install Apache1 DSO module %if %{with apache1} libtool --mode=install install -p sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1 +mv $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5{,-$v}.so +ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.so %endif # install Apache2 DSO module %if %{with apache2} libtool --mode=install install -p sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache +mv $RPM_BUILD_ROOT%{_libdir}/apache/libphp5{,-$v}.so +ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.so %endif # install litespeed sapi @@ -2406,13 +2436,17 @@ cp -p sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}-fpm.8 cp -p 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/%{name}-fpm +install -d $RPM_BUILD_ROOT/etc/logrotate.d +cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm +%if "%{pld_release}" == "ac" +%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm +%endif + %{__sed} -i -e ' s#/usr/lib/php#%{php_extensiondir}# s#/etc/php#%{_sysconfdir}# s#@processname@#%{name}-fpm#g -' $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-fpm $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf -install -d $RPM_BUILD_ROOT/etc/logrotate.d -cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm +' $RPM_BUILD_ROOT{/etc/{rc.d/init.d/%{name}-fpm,logrotate.d/%{name}-fpm},%{_sysconfdir}/php-fpm.conf} %endif # install Embedded API @@ -2424,10 +2458,11 @@ cp -p sapi/embed/php_embed.h $RPM_BUILD_ROOT%{_includedir}/php/sapi/embed %endif # install CLI -libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/%{name} -cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 -echo ".so %{name}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1 -ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/php +# versioned suffix is always installed +libtool --mode=install install -p sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php%{ver_suffix} +cp -p sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php%{ver_suffix}.1 +echo ".so php%{ver_suffix}.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.1 +ln -sf php%{ver_suffix} $RPM_BUILD_ROOT%{_bindir}/php cp -p php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini @@ -2447,7 +2482,7 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/php-apache2handler.ini %endif # ensure that paths are correct for current php version and arch -grep -El '/etc/php/|/usr/lib/php/' %{_sysconfdir}/*.ini | xargs -r \ +grep -El '/etc/php/|/usr/lib/php/' $RPM_BUILD_ROOT%{_sysconfdir}/*.ini | xargs -r \ %{__sed} -i -e ' s#/usr/lib/php#%{php_extensiondir}# s#/etc/php#%{_sysconfdir}# @@ -2651,6 +2686,7 @@ fi %dir %{_sysconfdir}/apache.d %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini %attr(755,root,root) %{_libdir}/apache1/libphp5.so +%attr(755,root,root) %{_libdir}/apache1/libphp5-*.*.so %endif %if %{with apache2} @@ -2660,6 +2696,7 @@ fi %dir %{_sysconfdir}/apache2handler.d %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini %attr(755,root,root) %{_libdir}/apache/libphp5.so +%attr(755,root,root) %{_libdir}/apache/libphp5-*.*.so %endif %if %{with litespeed} @@ -2687,8 +2724,8 @@ fi %defattr(644,root,root,755) %dir %{_sysconfdir}/cli.d %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-cli.ini -%attr(755,root,root) %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* +%attr(755,root,root) %{_bindir}/php%{ver_suffix} +%{_mandir}/man1/php%{ver_suffix}.1* %files program %defattr(644,root,root,755) @@ -2779,11 +2816,13 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/dom.ini %attr(755,root,root) %{php_extensiondir}/dom.so +%if %{with enchant} %files enchant %defattr(644,root,root,755) %doc ext/enchant/{CREDITS,docs/examples} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/enchant.ini %attr(755,root,root) %{php_extensiondir}/enchant.so +%endif %files exif %defattr(644,root,root,755) @@ -2857,11 +2896,13 @@ fi %attr(755,root,root) %{php_extensiondir}/interbase.so %endif +%if %{with intl} %files intl %defattr(644,root,root,755) %doc ext/intl/{CREDITS,TODO} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/intl.ini %attr(755,root,root) %{php_extensiondir}/intl.so +%endif %files json %defattr(644,root,root,755) @@ -2922,7 +2963,7 @@ fi %if %{with oci8} %files oci8 %defattr(644,root,root,755) -%doc ext/ico8/{CREDITS,README} +%doc ext/oci8/{CREDITS,README} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/oci8.ini %attr(755,root,root) %{php_extensiondir}/oci8.so %endif