diff --git a/.gitignore b/.gitignore index 1d9032b..adc2174 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ clog /Archive_Tar-1.4.13.tgz /Archive_Tar-1.4.14.tgz /PEAR-1.10.13.tgz +/PEAR-1.10.14.tgz diff --git a/pear-php82.patch b/pear-php82.patch deleted file mode 100644 index b9f9ff8..0000000 --- a/pear-php82.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4217e3ea503ba6c0651ea2d182fb9cb88f21ce0b Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 20 Feb 2023 16:02:34 +0100 -Subject: [PATCH] Fix: Creation of dynamic property PEAR_Error::$callback is - deprecated - ---- - PEAR.php | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/PEAR.php b/PEAR.php -index fee6638f4..6dba3b010 100644 ---- a/PEAR.php -+++ b/PEAR.php -@@ -859,6 +859,7 @@ class PEAR_Error - var $message = ''; - var $userinfo = ''; - var $backtrace = null; -+ var $callback = null; - - /** - * PEAR_Error constructor -From 5a8e7eccdaa577af8ae816e60819c14669c33376 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 23 Nov 2023 10:46:14 +0100 -Subject: [PATCH] fix Using ${var} in strings is deprecated - ---- - PEAR/Installer.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/PEAR/Installer.php b/PEAR/Installer.php -index c6e4a99fc..e7f5ce107 100644 ---- a/PEAR/Installer.php -+++ b/PEAR/Installer.php -@@ -1271,7 +1271,7 @@ function install($pkgfile, $options = array()) - if (count($test)) { - $msg = "$channel/$pkgname: conflicting files found:\n"; - $longest = max(array_map("strlen", array_keys($test))); -- $fmt = "%${longest}s (%s)\n"; -+ $fmt = "%{$longest}s (%s)\n"; - foreach ($test as $file => $info) { - if (!is_array($info)) { - $info = array('pear.php.net', $info); diff --git a/php-pear.spec b/php-pear.spec index 3c2f5e2..3baf753 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -26,12 +26,12 @@ Summary: PHP Extension and Application Repository framework Name: php-pear -Version: 1.10.13 -Release: 7%{?dist} +Version: 1.10.14 +Release: 1%{?dist} Epoch: 1 # BSD-2-Clause: PEAR, PEAR_Manpages, Archive_Tar, Console_Getopt # BSD-3-Clause: XML_Util -# LGPL-3.0-or-later: Structures_Graph is LGPLv3+ +# LGPL-3.0-or-later: Structures_Graph License: BSD-2-Clause AND BSD-3-Clause AND LGPL-3.0-or-later URL: http://pear.php.net/package/PEAR Source0: http://download.pear.php.net/package/PEAR-%{version}%{?pearprever}.tgz @@ -48,9 +48,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 -# Fix PHP 8.2 deprecations -Patch0: pear-php82.patch - BuildArch: noarch BuildRequires: php(language) > 5.4 BuildRequires: php-cli @@ -223,7 +220,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 ? @@ -336,6 +333,11 @@ fi %changelog +%changelog +* Mon Nov 27 2023 Remi Collet - 1.10.14-1 +- update to 1.10.14 +- drop patches merged upstream + * Thu Nov 23 2023 Remi Collet - 1.10.13-7 - fix more deprecations from https://github.com/pear/pear-core/pull/127 diff --git a/sources b/sources index 9754f15..bfc1da3 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (Archive_Tar-1.4.14.tgz) = a0277086221acf0cd01ec342af5afd62f01055a8b3bb4942d7a96d3517cce466a0c8a086411671a18d0f7a0a5e4187a76bad0d5c410c93fefe8cc58992327789 SHA512 (Console_Getopt-1.4.3.tgz) = 7803e063576e9dac6833064b5a1479d22ca31c2a8ef8036ae530271e4e824fedb94e54d63266be8929f90f8df745b3ada7185dc98319b331f8dc5e9cac5445a0 -SHA512 (PEAR-1.10.13.tgz) = 2a08134365b7bd92840880a23149ef457b0a3a04b78dc71f5db475911b49def58d8cb825332151df8d3eb5941b54157ae80879f36fc8de59037f301fc0565740 +SHA512 (PEAR-1.10.14.tgz) = 579b9754b8d117b6b00c4189c2267e10a2dee183a5f2ee4b1e7513b3ddc870eda46c65bc56712d93e03e14fad7a82160b007c3f6cd6787fa29467ddc95963832 SHA512 (PEAR_Manpages-1.10.0.tgz) = 3fe21c2e1518b24aca3e41f9f3d77e0ad207e48be7a3d4b96253d4970791f1aa8d9c9dcdf4e916eb558ab048882811326bd16792563edd1aa455e7c545816fa1 SHA512 (Structures_Graph-1.1.1.tgz) = 28465396cd540fd1619e0c1bec68fa8c3dff440a6e89c3c5583570edbd3de285e101de7c00e60d49d791ff10d8311f8a38d73ea3cdf52cfc74ecbe2f1842693f SHA512 (XML_Util-1.4.5.tgz) = dd373c15ea8057e1a31953a10d75a4821bb9ad63d55ec5ccdbe17c114895ac9b9a57871d50f9f83bca7e3920b461417aa09063cb06051834996d4a8aebfa84c9