From: Marcin Krol Date: Tue, 13 Jan 2026 20:09:31 +0000 (+0100) Subject: - drop openssl patch (fixed upstream), fix php-fpm man page link X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=a0db5a04856b91d99183f26750ddd438f948d543;p=packages%2Fphp.git - drop openssl patch (fixed upstream), fix php-fpm man page link --- diff --git a/php.spec b/php.spec index bc8760d..07d95fe 100644 --- a/php.spec +++ b/php.spec @@ -113,7 +113,7 @@ Summary(ru.UTF-8): PHP - язык препроцессирования HTML-фа Summary(uk.UTF-8): PHP - мова препроцесування HTML-файлів, виконувана на сервері Name: %{orgname}%{php_suffix} Version: 8.5.1 -Release: 2 +Release: 3 Epoch: 4 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -122,7 +122,7 @@ License: PHP 3.01 and Zend and BSD Group: Libraries Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz # Source0-md5: 430d08023cadc6f9408fef3354bbab02 -Source1: opcache.ini +Source1: opcache.ini Source2: %{orgname}-mod_php.conf Source3: %{orgname}-cgi-fcgi.ini Source4: %{orgname}-apache.ini @@ -136,8 +136,6 @@ Patch0: %{orgname}-shared.patch Patch1: %{orgname}-tld.patch Patch3: %{orgname}-link-libs.patch Patch4: intl-stdc++.patch -# https://bugs.php.net/bug.php?id=79589 -Patch5: openssl.patch Patch7: %{orgname}-sapi-ini-file.patch Patch10: %{orgname}-ini.patch Patch11: embed.patch @@ -1663,8 +1661,6 @@ cp -p php.ini-production php.ini %patch -P1 -p1 %patch -P3 -p1 %patch -P4 -p1 -%patch -P5 -p1 - %patch -P7 -p1 %patch -P10 -p1 %patch -P14 -p1 @@ -1758,6 +1754,7 @@ sed -i -e 's#-fvisibility=hidden##g' configure* %{__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/class_alias/bug54268.phpt %{__rm} Zend/tests/magic_methods/bug68412.phpt @@ -2360,7 +2357,7 @@ fi %service %{name}-fpm restart update-alternatives \ --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{php_suffix}-fpm %{php_suffix} \ - --slave %{_mandir}/man8/php-fpm.8.gz php-fpm.8.gz %{_mandir}/man8/php-fpm%{php_suffix}.8.gz || : + --slave %{_mandir}/man8/php-fpm.8.gz php-fpm.8.gz %{_mandir}/man8/php%{php_suffix}-fpm.8.gz || : %preun fpm if [ "$1" = "0" ]; then