pool/php7-pear
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to version 1.10.18

Browse Source 
- 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
This commit is contained in:
Arjen de Korte 2020-04-10 20:28:24 +00:00 committed by Git OBS Bridge
parent 8560aeb3e8
commit 8b3be96241
5 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install-pear-nozlib.phar
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:3dcf9f3b76fc02c3b11f672ceddbdfeadd64625c7fcdc8ccd44215c976c16ce4 oid sha256:e5cb19a14f0bffdef7aa58fd072bb7fe0d862f04c6b15d05abfcbb665c1425a5
size 3629893 size 3633672

BIN
install-pear-nozlib.phar.sig
View File

Binary file not shown.

11
pear-cacheid-array-check.patch
View File

@ -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);
}

7
php7-pear.changes
View File

@ -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> Fri Feb 28 08:33:14 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>

15
php7-pear.spec
View File

@ -22,7 +22,7 @@
%define pear_module_version(m) %(sed -n 's/.*=>.*%{1}-\\(.*\\)\\.tar.*/\\1/p' %{SOURCE0}) %define pear_module_version(m) %(sed -n 's/.*=>.*%{1}-\\(.*\\)\\.tar.*/\\1/p' %{SOURCE0})
Name: php7-pear Name: php7-pear
Version: 1.10.17 Version: 1.10.18
Release: 0 Release: 0
Summary: PHP Extension and Application Repository Summary: PHP Extension and Application Repository
License: BSD-2-Clause 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 Source1: https://github.com/pear/pearweb_phars/raw/v%{version}/install-pear-nozlib.sig#/install-pear-nozlib.phar.sig
Source2: %{name}.keyring Source2: %{name}.keyring
Source3: %{name}.rpmlintrc Source3: %{name}.rpmlintrc
# PATCH-FIX-UPSTREAM https://bugs.php.net/78890
Patch0: pear-cacheid-array-check.patch
BuildRequires: php7 BuildRequires: php7
Requires: php7 Requires: php7
Recommends: php7-openssl 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} \ --metadata %{metadir} \
--www %{peardir}/htdocs --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 %pre
if [ -d %{peardir}/.registry -a ! -d %{metadir}/.registry ]; then if [ -d %{peardir}/.registry -a ! -d %{metadir}/.registry ]; then
mkdir -p %{metadir} mkdir -p %{metadir}