# 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 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
%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 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
%define apxs1 /usr/sbin/apxs1
%define apxs2 /usr/sbin/apxs
-%define litespeed_version 5.5
# disable all sapis
%if %{with gcov}
%undefine with_filter
%endif
+%define rel 1
%define orgname php
-%define php_suffix 54
-
-%define rel 0.17
+%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
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
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
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}
Patch63: %{orgname}-mysql-nowarning.patch
#Patch64: %{orgname}-m4.patch # not needed on 5.4 branch
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}
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.1-2}
%{!?with_mysqlnd:BuildRequires: mysql-devel}
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.
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}
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
%patch6 -p1
%patch8 -p1
%patch7 -p1
-%patch9 -p1
cp -p php.ini-production php.ini
%patch10 -p1
%if %{with type_hints}
%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
# 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)
%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
cp -pf php_config.h.cli main/php_config.h
cp -pf Makefile.cli Makefile
-./run-tests.sh -w failed.log -s test.log
+./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
# 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
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
%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
%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}
%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}
%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)
%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)
%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
projects / packages / php.git / blobdiff