From 821d2903265a2faf81d294dc5e1a6e8ce499bed4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Apr 20 2020 05:25:31 +0000
Subject: update PEAR to 1.10.12

update XML_Util to 1.4.5
drop patch merged upstream

---

diff --git a/.gitignore b/.gitignore
index 1711474..818b559 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,5 @@ clog
 /Archive_Tar-1.4.9.tgz
 /XML_Util-1.4.4.tgz
 /PEAR-1.10.11.tgz
+/PEAR-1.10.12.tgz
+/XML_Util-1.4.5.tgz
diff --git a/103.patch b/103.patch
deleted file mode 100644
index c5e9666..0000000
--- a/103.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 76e3fae5072624639045a15fbe88d22e198ad649 Mon Sep 17 00:00:00 2001
-From: Damon <damon.tu@outlook.com>
-Date: Fri, 29 Nov 2019 10:44:05 +0800
-Subject: [PATCH] Fix undefined constant name
-
----
- PEAR/Builder.php | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/PEAR/Builder.php b/PEAR/Builder.php
-index a7b464341..bfc2ca221 100644
---- a/PEAR/Builder.php
-+++ b/PEAR/Builder.php
-@@ -402,9 +402,9 @@ function build($descfile, $callback = null)
-                 }
-                 if (substr($option['name'], 0, 5) === 'with-' &&
-                     ($response === 'yes' || $response === 'autodetect')) {
--                    $configure_command .= " --{$option[name]}";
-+                    $configure_command .= " --{$option['name']}";
-                 } else {
--                    $configure_command .= " --{$option[name]}=".trim($response);
-+                    $configure_command .= " --{$option['name']}=".trim($response);
-                 }
-             }
-         }
diff --git a/12.patch b/12.patch
deleted file mode 100644
index 48448bf..0000000
--- a/12.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e2c9854408bc0b45206336060e28603de3371c99 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 12 Dec 2019 14:17:38 +0100
-Subject: [PATCH] fix Trying to access array offset on value of type int
-
----
- XML/Util.php               |  2 +-
- tests/IsValidNameTests.php | 24 ++++++++++++++++++++++++
- 2 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/XML/Util.php b/XML/Util.php
-index df37e07..1ba45ac 100644
---- a/XML/Util.php
-+++ b/XML/Util.php
-@@ -918,7 +918,7 @@ public static function splitQualifiedName($qname, $defaultNs = null)
-     public static function isValidName($string)
-     {
-         // check for invalid chars
--        if (!preg_match('/^[[:alpha:]_]\\z/', $string[0])) {
-+        if (!is_string($string) || !strlen($string) || !preg_match('/^[[:alpha:]_]\\z/', $string[0])) {
-             return XML_Util::raiseError(
-                 'XML names may only start with letter or underscore',
-                 XML_UTIL_ERROR_INVALID_START
-
diff --git a/php-pear.spec b/php-pear.spec
index 919b73c..8bd984d 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -13,7 +13,7 @@
 # https://pear.php.net/bugs/bug.php?id=19367
 # Structures_Graph 1.0.4 - incorrect FSF address
 %global structver 1.1.1
-%global xmlutil   1.4.4
+%global xmlutil   1.4.5
 %global manpages  1.10.0
 
 # Tests are only run with rpmbuild --with tests
@@ -26,7 +26,7 @@
 
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
-Version: 1.10.11
+Version: 1.10.12
 Release: 1%{?dist}
 Epoch: 1
 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
@@ -47,8 +47,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:   https://patch-diff.githubusercontent.com/raw/pear/XML_Util/pull/12.patch
-
 BuildArch: noarch
 BuildRequires: php(language) > 5.4
 BuildRequires: php-cli
@@ -221,7 +219,7 @@ install -m 644 -D macros.pear \
 
 # apply patches on installed PEAR tree
 pushd %{buildroot}%{peardir}
-patch -p1 < %{PATCH0}
+: no patch
 popd
 
 # Why this file here ?
@@ -334,6 +332,11 @@ fi
 
 
 %changelog
+* Mon Apr 20 2020 Remi Collet <remi@remirepo.net> - 1.10.12-1
+- update PEAR to 1.10.12
+- update XML_Util to 1.4.5
+- drop patch merged upstream
+
 * Tue Apr 14 2020 Remi Collet <remi@remirepo.net> - 1.10.11-1
 - update to 1.10.11
 - drop patch merged upstream
diff --git a/sources b/sources
index 32098ef..3c7e696 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
 SHA512 (Archive_Tar-1.4.9.tgz) = c0cce8213926aa9fde07bf46d77015b2dfbfe878cf386df43fcd4cf346b4ffdb2587676cfb69fc917cc31b63507c33702938a22aeb26e16b5ea27039c525c4e1
 SHA512 (Console_Getopt-1.4.3.tgz) = 7803e063576e9dac6833064b5a1479d22ca31c2a8ef8036ae530271e4e824fedb94e54d63266be8929f90f8df745b3ada7185dc98319b331f8dc5e9cac5445a0
-SHA512 (PEAR-1.10.11.tgz) = bf4e1873215f8451e689c0e1a2b3cf6b36034cbb27bf8e425288ad73d807c01503e287470bdbfd958a9538bc03393b3588788f8a051ed0789b96e25129d26102
+SHA512 (PEAR-1.10.12.tgz) = 1ce478800a150d7906f8aa4fa4371d3d190fa2af44691c9aa193babfe76f1b031b493f48df15b93e93dd5518a6d62ba6a7d5b1799b62d5a968f7a84f3677b971
 SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833
 SHA512 (Structures_Graph-1.1.1.tgz) = cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284
-SHA512 (XML_Util-1.4.4.tgz) = 3c2ae4492e76729da561398a43416cd540284297b497d2c1526515c00ba2918b9d520b580e21111cf9f9e133d473289cc9c896bc28ddd0c64a849ee66f897e42
+SHA512 (XML_Util-1.4.5.tgz) = dd373c15ea8057e1a31953a10d75a4821bb9ad63d55ec5ccdbe17c114895ac9b9a57871d50f9f83bca7e3920b461417aa09063cb06051834996d4a8aebfa84c9