diff options
| author | Remi Collet <remi@remirepo.net> | 2026-01-26 06:23:39 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-01-26 06:23:39 +0100 |
| commit | e6b03df161a482f5f425d49b7169d990fc5244f0 (patch) | |
| tree | e93e4d75d4f6f5971945d3174bfa87d9b035e5ac | |
| parent | f0fc79382e366d344b83079855aa90de989a5014 (diff) | |
drop patch merged upstream
| -rw-r--r-- | 164.patch | 32 | ||||
| -rw-r--r-- | php-pear.spec | 12 |
2 files changed, 7 insertions, 37 deletions
diff --git a/164.patch b/164.patch deleted file mode 100644 index 6e175d0..0000000 --- a/164.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 bb6e9b3..9434fe2 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -39,8 +39,8 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear -Version: 1.10.17 -Release: 2%{?dist} +Version: 1.10.18 +Release: 1%{?dist} Epoch: 1 # BSD-2-Clause: PEAR, PEAR_Manpages, Archive_Tar, Console_Getopt # BSD-3-Clause: XML_Util @@ -62,8 +62,6 @@ 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 @@ -256,7 +254,7 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd %{buildroot}%{peardir} - patch -p1 <%{PATCH0} + : none popd # Why this file here ? @@ -385,6 +383,10 @@ fi %changelog +* Mon Jan 26 2026 Remi Collet <remi@remirepo.net> - 1.10.18-1 +- update to 1.10.18 +- drop patch merged upstream + * 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 |