From 8b3be9624180a1b50fb93be59adcc209ed8f7066e4f909a5d15cbe6d0ab4708b Mon Sep 17 00:00:00 2001
From: Arjen de Korte <suse+build@de-korte.org>
Date: Fri, 10 Apr 2020 20:28:24 +0000
Subject: [PATCH] - Update to version 1.10.18 - Remove
 pear-cacheid-array-check.patch (upstreamed) - Contents of .filemap are now
 sorted internally

OBS-URL: https://build.opensuse.org/package/show/devel:languages:php/php7-pear?expand=0&rev=20
---
 install-pear-nozlib.phar       |   4 ++--
 install-pear-nozlib.phar.sig   | Bin 72 -> 95 bytes
 pear-cacheid-array-check.patch |  11 -----------
 php7-pear.changes              |   7 +++++++
 php7-pear.spec                 |  15 +--------------
 5 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 pear-cacheid-array-check.patch

diff --git a/install-pear-nozlib.phar b/install-pear-nozlib.phar
index 2640d98..8ab80f0 100644
--- a/install-pear-nozlib.phar
+++ b/install-pear-nozlib.phar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3dcf9f3b76fc02c3b11f672ceddbdfeadd64625c7fcdc8ccd44215c976c16ce4
-size 3629893
+oid sha256:e5cb19a14f0bffdef7aa58fd072bb7fe0d862f04c6b15d05abfcbb665c1425a5
+size 3633672
diff --git a/install-pear-nozlib.phar.sig b/install-pear-nozlib.phar.sig
index dfef249169efbcb65decee8b2f44fc7f62bdc0adf4ef1aaaa2ce83201d2ad561..66e783c148f89bcbf89f47da50027c210b15f7df37e1784b5c092006e16337c7 100644
GIT binary patch
literal 95
zcmeB(WnmCxVvrS6WD)q*^WDB{iP|^uQq7{pin|WEek^5Wikom=oq>x}049>i&amM4
v^I}~Ck9o@irhNV=-}X3k)@JK<3=1y*VZE4t`L!rpcZ{Iz6qRMl3k&!F%d#gk

literal 72
zcmV-O0Jr~$Mg#y60ssaD0$tUK(*Ozy5OSj-y23^Ab)qW(pFrrER=Z(_Q(3w}la8Y>
e0MbPgCIFr=Zgc%c4sJ*^0$vpkc)aekG4CLKoEnq>

diff --git a/pear-cacheid-array-check.patch b/pear-cacheid-array-check.patch
deleted file mode 100644
index ae7f700..0000000
--- a/pear-cacheid-array-check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/PEAR/REST.php
-+++ b/PEAR/REST.php
-@@ -178,7 +178,7 @@
- 
-         $cachettl = $this->config->get('cache_ttl');
-         // If cache is newer than $cachettl seconds, we use the cache!
--        if (time() - $cacheid['age'] < $cachettl) {
-+        if (is_array($cacheid) && time() - $cacheid['age'] < $cachettl) {
-             return $this->getCache($url);
-         }
- 
diff --git a/php7-pear.changes b/php7-pear.changes
index 54c9e52..bc03d6f 100644
--- a/php7-pear.changes
+++ b/php7-pear.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 10 20:17:07 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
+
+- Update to version 1.10.18
+- Remove pear-cacheid-array-check.patch (upstreamed)
+- Contents of .filemap are now sorted internally
+
 -------------------------------------------------------------------
 Fri Feb 28 08:33:14 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
 
diff --git a/php7-pear.spec b/php7-pear.spec
index feb0ef8..6b773b8 100644
--- a/php7-pear.spec
+++ b/php7-pear.spec
@@ -22,7 +22,7 @@
 %define pear_module_version(m) %(sed -n 's/.*=>.*%{1}-\\(.*\\)\\.tar.*/\\1/p' %{SOURCE0})
 
 Name:           php7-pear
-Version:        1.10.17
+Version:        1.10.18
 Release:        0
 Summary:        PHP Extension and Application Repository
 License:        BSD-2-Clause
@@ -32,8 +32,6 @@ Source0:        https://github.com/pear/pearweb_phars/raw/v%{version}/install-pe
 Source1:        https://github.com/pear/pearweb_phars/raw/v%{version}/install-pear-nozlib.sig#/install-pear-nozlib.phar.sig
 Source2:        %{name}.keyring
 Source3:        %{name}.rpmlintrc
-# PATCH-FIX-UPSTREAM https://bugs.php.net/78890
-Patch0:         pear-cacheid-array-check.patch
 BuildRequires:  php7
 Requires:       php7
 Recommends:     php7-openssl
@@ -98,17 +96,6 @@ php -d date.timezone=UTC -d memory_limit=64M -d short_open_tag=0 -d safe_mode=0
 	--metadata %{metadir} \
 	--www      %{peardir}/htdocs
 
-php -r '$filemap = unserialize(file_get_contents("%{buildroot}%{metadir}/.filemap"));
-	ksort($filemap);
-	foreach($filemap as &$value) {
-		ksort($value);
-	}
-	file_put_contents("%{buildroot}%{metadir}/.filemap", serialize($filemap));'
-
-pushd %{buildroot}%{peardir}
-patch -p1 < %{PATCH0}
-popd
-
 %pre
 if [ -d %{peardir}/.registry -a ! -d %{metadir}/.registry ]; then
     mkdir -p %{metadir}