diff options
| author | Remi Collet <remi@remirepo.net> | 2026-01-21 11:27:21 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-01-21 11:27:21 +0100 |
| commit | f0fc79382e366d344b83079855aa90de989a5014 (patch) | |
| tree | 8d7049202815bff3a153b1ccc272b7b135b0e4db | |
| parent | fc1997b477356cb2bd433e3ee0419f0893b3cc6e (diff) | |
https://github.com/pear/pear-core/pull/164
| -rw-r--r-- | 164.patch | 32 | ||||
| -rw-r--r-- | php-pear.spec | 10 |
2 files changed, 40 insertions, 2 deletions
diff --git a/164.patch b/164.patch new file mode 100644 index 0000000..6e175d0 --- /dev/null +++ b/164.patch @@ -0,0 +1,32 @@ +From bd6e13252fa91a9cabaac51a583e28988fec5fba Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 21 Jan 2026 08:44:22 +0100 +Subject: [PATCH] don't use report_memleaks with 8.5+ + +--- + .github/workflows/build.yml | 2 +- + PEAR/RunTest.php | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/PEAR/RunTest.php b/PEAR/RunTest.php +index dd5bb1c34..cbe504335 100644 +--- a/PEAR/RunTest.php ++++ b/PEAR/RunTest.php +@@ -64,7 +64,6 @@ class PEAR_RunTest + 'display_errors=1', + 'log_errors=0', + 'html_errors=0', +- 'report_memleaks=0', + 'report_zend_debug=0', + 'docref_root=', + 'docref_ext=.html', +@@ -93,6 +92,9 @@ function __construct($logger = null, $options = array()) + $excluded_error_reporting |= E_STRICT; + } + $this->ini_overwrites[] = 'error_reporting=' . (E_ALL & ~$excluded_error_reporting); ++ if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 80500) { ++ $this->ini_overwrites[] = 'report_memleaks=0'; ++ } + if (is_null($logger)) { + require_once 'PEAR/Common.php'; + $logger = new PEAR_Common; diff --git a/php-pear.spec b/php-pear.spec index 1b806fb..bb6e9b3 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -40,7 +40,7 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear Version: 1.10.17 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 # BSD-2-Clause: PEAR, PEAR_Manpages, Archive_Tar, Console_Getopt # BSD-3-Clause: XML_Util @@ -62,6 +62,8 @@ Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz +Patch0: 164.patch + BuildArch: noarch BuildRequires: %{?scl_prefix}php(language) > 5.4 BuildRequires: %{?scl_prefix}php-cli @@ -254,7 +256,7 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd %{buildroot}%{peardir} - : none + patch -p1 <%{PATCH0} popd # Why this file here ? @@ -383,6 +385,10 @@ fi %changelog +* Wed Jan 21 2026 Remi Collet <remi@remirepo.net> - 1.10.17-2 +- remove report_memleaks usage with PHP 8.5 using patch from + https://github.com/pear/pear-core/pull/164 + * Mon Dec 15 2025 Remi Collet <remi@remirepo.net> - 1.10.17-1 - update to 1.10.17 |