# - 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.
-# UNPACKAGED EXTENSION NOTES:
-# - com_dotnet is Win32-only
# TODO:
# - fileinfo extension bundles magic db in library: data_file.c (dump of magic.mgc) is 14M
# - 2.3M fileinfo.so php54-fileinfo-5.4.6-0.15.x86_64
%bcond_without mhash # without mhash extension (supported by hash extension)
%bcond_without mssql # without MS SQL extension module
%bcond_without mysql # without ext/mysql support
-%bcond_without mysqli # without mysqli support (Requires mysql > 4.1)
+%bcond_without mysqli # without mysqli support (Requires mysql >= 4.1)
%bcond_without mysqlnd # without mysqlnd support in mysql related extensions
%bcond_with oci # with Oracle oci8 extension module (BR: proprietary libs)
%bcond_without odbc # without ODBC extension module
%undefine with_filter
%endif
-%define rel 1
+%define rel 2
%define orgname php
%define ver_suffix 56
%define php_suffix %{!?with_default_php:%{ver_suffix}}
Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 5.6.29
+Version: 5.6.30
Release: %{rel}
Epoch: 4
# All files licensed under PHP version 3.01, except
License: PHP 3.01 and Zend and BSD
Group: Libraries
Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 190bf5b52d1fc68d5500a8cdc7e33164
+# Source0-md5: 68753955a8964ae49064c6424f81eb3e
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
Patch69: fpm-conf-split.patch
Patch70: mysqlnd-ssl.patch
Patch72: phar-hash-shared.patch
+Patch73: php-pdo-ssl.patch
URL: http://php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
%{?with_pcre:%requires_ge_to pcre pcre-devel}
Suggests: browscap
Obsoletes: php-common < 4:5.3.28-7
+# withdrawn modules
+Obsoletes: php-filepro < 4:5.2.0
+Obsoletes: php-hwapi < 4:5.2.0
+Obsoletes: php-hyperwave < 3:5.0.0
+Obsoletes: php-java < 3:5.0.0
+Obsoletes: php-mcal < 3:5.0.0
Obsoletes: php-pecl-domxml
+Obsoletes: php-qtdom < 3:5.0.0
Conflicts: php4-common < 3:4.4.4-8
Conflicts: php55-common < 4:5.5.10-4
Conflicts: rpm < 4.4.2-0.2
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: php(dba)
Obsoletes: php-dba < 4:5.3.28-7
+# withdrawn module of similar functionality but different API
+Obsoletes: php-db < 3:5.0.0
%description dba
This is a dynamic shared object (DSO) for PHP that will add flat-file
%{?requires_php_extension}
Provides: php(oci8)
Obsoletes: php-oci8 < 4:5.3.28-7
+# withdrawn module of similar functionality but different API
+Obsoletes: php-oracle < 4:5.1.0
%description oci8
This is a dynamic shared object (DSO) for PHP that will add Oracle 7,
Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
Provides: php(pdo-pgsql)
Provides: php(pdo_pgsql)
-Provides: php-pecl-PDO_PGSQL = 4:5.3.28-7
Obsoletes: php-pdo-pgsql < 4:5.3.28-7
Obsoletes: php-pecl-PDO_PGSQL < 4:5.2.1-2
%patch70 -p1
%patch72 -p1
+%patch73 -p1
%{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+# com_dotnet is Win32-only
+%{__rm} -r ext/com_dotnet
+
# conflict seems to be resolved by recode patches
%{__rm} ext/recode/config9.m4
%{__rm} -r ext/sqlite3/tests
%endif
+# ----- Manage known as failed test -------
+# affected by systzdata patch
+%{__rm} ext/date/tests/timezone_location_get.phpt
+%{__rm} ext/date/tests/timezone_version_get.phpt
+%{__rm} ext/date/tests/timezone_version_get_basic1.phpt
+# Should be skipped but fails sometime
+%{__rm} ext/standard/tests/file/file_get_contents_error001.phpt
+# fails sometimes
+%{__rm} ext/sockets/tests/mcast_ipv?_recv.phpt
+# causes stack exhausion
+%{__rm} Zend/tests/bug54268.phpt
+
+# avoid issues when two builds run simultaneously
+%ifarch %{x8664}
+sed -e 's/64321/64322/' -i ext/openssl/tests/*.phpt
+%endif
+
# skip XFAILs
# no point testing stuff that is knowingly broken
-find -name '*.phpt' | xargs grep XFAIL -l | xargs rm -v
+find -name '*.phpt' | xargs grep '^--XFAIL--' -l | xargs rm -v
env \
%ifarch %{ix86}
-ix86= x8664=:
+ix86= x8664=: \
%endif
%ifarch %{x8664}
ix86=: x8664= \
cat <<'EOF' > run-tests.sh
#!/bin/sh
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
+export SKIP_ONLINE_TESTS=1
unset TZ LANG LC_ALL || :
%{__make} test \
EXTENSION_DIR=modules \
%endif
%{__sed} -i -e '
- s#/usr/lib/php#%{php_extensiondir}#
- s#/etc/php#%{_sysconfdir}#
+ s#/usr/lib/php#%{php_extensiondir}#g
+ s#/etc/php/#%{_sysconfdir}/#g
s#@processname@#%{name}-fpm#g
' $RPM_BUILD_ROOT{/etc/{rc.d/init.d/%{name}-fpm,logrotate.d/%{name}-fpm},%{_sysconfdir}/php-fpm.conf,%{_sysconfdir}/fpm.d/www.conf}
%endif
# ensure that paths are correct for current php version and arch
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}#
+ s#/usr/lib/php#%{php_extensiondir}#g
+ s#/etc/php/#%{_sysconfdir}/#g
'
install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
projects / packages / php.git / blobdiff