From cc09016dd79f2a294e27413024af223a781d4f55 Mon Sep 17 00:00:00 2001 From: lixuebing Date: Tue, 20 Aug 2024 14:14:51 +0800 Subject: [PATCH 1/2] Replaced declaration of help subpackage with the 'package_help' macro. --- php.spec | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/php.spec b/php.spec index 870e334..5e1e10c 100644 --- a/php.spec +++ b/php.spec @@ -26,7 +26,7 @@ Name: php Version: %{upver} -Release: 5 +Release: 6 Summary: PHP scripting language for creating dynamic web sites License: PHP-3.01 AND Zend-2.0 AND BSD-2-Clause AND MIT AND Apache-1.0 AND NCSA AND BSL-1.0 URL: http://www.php.net/ @@ -482,11 +482,7 @@ scripting language and therefore develop “system code” more productively. For PHP, FFI opens a way to write PHP extensions and bindings to C libraries in pure PHP. -%package help -Summary: help - -%description help -help +%package_help %prep %autosetup -n php-%{upver} -p1 @@ -553,6 +549,10 @@ chmod 644 README.* cp %{SOURCE50} %{SOURCE51} %{SOURCE52} . +%ifarch x86_64 +sed -e '/opcache.huge_code_pages/s/0/1/' -i 10-opcache.ini +%endif + %build export SOURCE_DATE_EPOCH=$(date +%s -r NEWS) @@ -1086,25 +1086,22 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog +* Tue Aug 20 2024 Xuebing Li - 8.0.30-6 +- Replaced declaration of help subpackage with the 'package_help' macro. + * Wed Jun 12 2024 Funda Wang - 8.0.30-5 - Update licenses declaration * Fri Jun 07 2024 Funda Wang - 8.0.30-4 - fix CVE-2024-5458 -* Fri Apr 12 2024 Funda Wang - 8.0.30-3 +* Mon Apr 15 2024 Funda Wang - 8.0.30-3 - fix CVE-2024-2756, CVE-2024-3096 -* Tue Nov 7 2023 beta - 8.0.30-2 -- disable opcache.huge_code_pages on x86_64 - * Fri Aug 4 2023 Funda Wang - 8.0.30-1 - CVE-2023-3823, CVE-2023-3824 - update to 8.0.30 -* Thu Jun 15 2023 Dillon Chen - 8.0.29-1 -- update to 8.0.29 to Fixed bug GHSA-76gg-c692-v2mw - * Tue Feb 21 2023 Dillon Chen - 8.0.28-1 - CVE-2023-0567,CVE-2023-0568,CVE-2023-0662 - update to 8.0.28 -- Gitee From 67da980677bf473ae2b870588cebbd3140cad564 Mon Sep 17 00:00:00 2001 From: lixuebing Date: Tue, 20 Aug 2024 14:33:17 +0800 Subject: [PATCH 2/2] Replaced declaration of help subpackage with the 'package_help' macro. --- php.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/php.spec b/php.spec index 5e1e10c..1e8ce0a 100644 --- a/php.spec +++ b/php.spec @@ -549,10 +549,6 @@ chmod 644 README.* cp %{SOURCE50} %{SOURCE51} %{SOURCE52} . -%ifarch x86_64 -sed -e '/opcache.huge_code_pages/s/0/1/' -i 10-opcache.ini -%endif - %build export SOURCE_DATE_EPOCH=$(date +%s -r NEWS) @@ -1095,13 +1091,19 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : * Fri Jun 07 2024 Funda Wang - 8.0.30-4 - fix CVE-2024-5458 -* Mon Apr 15 2024 Funda Wang - 8.0.30-3 +* Fri Apr 12 2024 Funda Wang - 8.0.30-3 - fix CVE-2024-2756, CVE-2024-3096 +* Tue Nov 7 2023 beta - 8.0.30-2 +- disable opcache.huge_code_pages on x86_64 + * Fri Aug 4 2023 Funda Wang - 8.0.30-1 - CVE-2023-3823, CVE-2023-3824 - update to 8.0.30 +* Thu Jun 15 2023 Dillon Chen - 8.0.29-1 +- update to 8.0.29 to Fixed bug GHSA-76gg-c692-v2mw + * Tue Feb 21 2023 Dillon Chen - 8.0.28-1 - CVE-2023-0567,CVE-2023-0568,CVE-2023-0662 - update to 8.0.28 -- Gitee