X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php.spec;h=d12d02df3abdeffc20cfc0a02ed81041e3d2ffbb;hp=9c569133db6dae76354e17afdd28e8bdadf8ab2b;hb=46bd0dc461bcd4546603f6360c1e93bf7d2c3d19;hpb=1051d36561ff1b3400fdf13b1c71ce44fa3dff26 diff --git a/php.spec b/php.spec index 9c56913..d12d02d 100644 --- a/php.spec +++ b/php.spec @@ -1,4 +1,4 @@ -# NOTES +# NOTES # - mysqlnd driver doesn't support reconnect: https://bugs.php.net/bug.php?id=52561 # TODO 7.2: # - https://github.com/php/php-src/blob/php-7.2.0/UPGRADING @@ -146,8 +146,8 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} -Version: 7.2.5 -Release: 2 +Version: 7.2.9 +Release: 4 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -155,7 +155,7 @@ Epoch: 4 License: PHP 3.01 and Zend and BSD Group: Libraries Source0: http://php.net/distributions/%{orgname}-%{version}.tar.xz -# Source0-md5: 0f2e2c6d749a4bc3913b50d1f7bb95fa +# Source0-md5: d529efc4017840e3db970b0bc25aef9c Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini @@ -210,6 +210,7 @@ Patch69: fpm-conf-split.patch Patch70: mysqlnd-ssl.patch Patch71: libdb-info.patch Patch72: phar-hash-shared.patch +Patch73: revert-mysql-8-auth-fix.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} @@ -306,7 +307,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define jsonver 1.6.0 %define pharver 2.0.2 %define sqlite3ver %{version} -%define zipver 1.15.2 +%define zipver 1.15.3 %define phpdbgver 0.5.0 %define sodiumver %{version} @@ -1968,6 +1969,7 @@ cp -p php.ini-production php.ini %patch70 -p1 %patch71 -p1 %patch72 -p1 -b .phar-shared +%patch73 -p1 %{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 @@ -2667,7 +2669,7 @@ update-alternatives \ %postun cli if [ $1 -eq 0 ]; then - update-alternatives --remove php %{_bindir}/php || : + update-alternatives --remove php %{_bindir}/php%{php_suffix} || : fi %post common -p /sbin/ldconfig @@ -2683,8 +2685,8 @@ update-alternatives \ %postun devel if [ $1 -eq 0 ]; then - update-alternatives --remove phpize %{_bindir}/phpize || : - update-alternatives --remove php-config %{_bindir}/php-config || : + update-alternatives --remove phpize %{_bindir}/phpize%{php_suffix} || : + update-alternatives --remove php-config %{_bindir}/php-config%{php_suffix} || : fi %pre fpm @@ -2699,7 +2701,7 @@ update-alternatives --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{php_s if [ "$1" = "0" ]; then %service %{name}-fpm stop /sbin/chkconfig --del %{name}-fpm - update-alternatives --remove php-fpm %{_sbindir}/php-fpm || : + update-alternatives --remove php-fpm %{_sbindir}/php%{php_suffix}-fpm || : fi %postun fpm @@ -2862,7 +2864,7 @@ update-alternatives \ %postun phar %ext_postun if [ $1 -eq 0 ]; then - update-alternatives --remove phar %{_bindir}/phar || : + update-alternatives --remove phar %{_bindir}/phar%{php_suffix}.phar || : fi %if %{with apache2}