update Archive_Tar to 1.4.9
add patch for XML_Util and PHP 7.4 from https://github.com/pear/XML_Util/pull/11
This commit is contained in:
parent
6d77419306
commit
6a497dad34
1
.gitignore
vendored
1
.gitignore
vendored
@ -51,3 +51,4 @@ clog
|
|||||||
/Archive_Tar-1.4.8.tgz
|
/Archive_Tar-1.4.8.tgz
|
||||||
/PEAR-1.10.10.tgz
|
/PEAR-1.10.10.tgz
|
||||||
/Console_Getopt-1.4.3.tgz
|
/Console_Getopt-1.4.3.tgz
|
||||||
|
/Archive_Tar-1.4.9.tgz
|
||||||
|
22
11.patch
Normal file
22
11.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
From 9ae15ac27d8618ee7d402b47b0c239b6c41c45d9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Remi Collet <remi@remirepo.net>
|
||||||
|
Date: Thu, 28 Nov 2019 15:51:00 +0100
|
||||||
|
Subject: [PATCH] fix phplint warning
|
||||||
|
|
||||||
|
---
|
||||||
|
XML/Util.php | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/XML/Util.php b/XML/Util.php
|
||||||
|
index 2a008d3..df37e07 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 (!preg_match('/^[[:alpha:]_]\\z/', $string[0])) {
|
||||||
|
return XML_Util::raiseError(
|
||||||
|
'XML names may only start with letter or underscore',
|
||||||
|
XML_UTIL_ERROR_INVALID_START
|
@ -9,7 +9,7 @@
|
|||||||
%global metadir %{_localstatedir}/lib/pear
|
%global metadir %{_localstatedir}/lib/pear
|
||||||
|
|
||||||
%global getoptver 1.4.3
|
%global getoptver 1.4.3
|
||||||
%global arctarver 1.4.8
|
%global arctarver 1.4.9
|
||||||
# https://pear.php.net/bugs/bug.php?id=19367
|
# https://pear.php.net/bugs/bug.php?id=19367
|
||||||
# Structures_Graph 1.0.4 - incorrect FSF address
|
# Structures_Graph 1.0.4 - incorrect FSF address
|
||||||
%global structver 1.1.1
|
%global structver 1.1.1
|
||||||
@ -27,7 +27,7 @@
|
|||||||
Summary: PHP Extension and Application Repository framework
|
Summary: PHP Extension and Application Repository framework
|
||||||
Name: php-pear
|
Name: php-pear
|
||||||
Version: 1.10.10
|
Version: 1.10.10
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
|
# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
|
||||||
# Structures_Graph is LGPLv3+
|
# Structures_Graph is LGPLv3+
|
||||||
@ -47,6 +47,8 @@ Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
|
|||||||
Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
|
Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
|
||||||
Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz
|
Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz
|
||||||
|
|
||||||
|
Patch0: https://patch-diff.githubusercontent.com/raw/pear/XML_Util/pull/11.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: php(language) > 5.4
|
BuildRequires: php(language) > 5.4
|
||||||
BuildRequires: php-cli
|
BuildRequires: php-cli
|
||||||
@ -219,7 +221,7 @@ install -m 644 -D macros.pear \
|
|||||||
|
|
||||||
# apply patches on installed PEAR tree
|
# apply patches on installed PEAR tree
|
||||||
pushd %{buildroot}%{peardir}
|
pushd %{buildroot}%{peardir}
|
||||||
: no patch
|
patch -p1 < %{PATCH0}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Why this file here ?
|
# Why this file here ?
|
||||||
@ -333,6 +335,11 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 5 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-3
|
||||||
|
- update Archive_Tar to 1.4.9
|
||||||
|
- add patch for XML_Util and PHP 7.4 from
|
||||||
|
https://github.com/pear/XML_Util/pull/11
|
||||||
|
|
||||||
* Thu Nov 21 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-2
|
* Thu Nov 21 2019 Remi Collet <remi@remirepo.net> - 1:1.10.10-2
|
||||||
- update Console_Getopt to 1.4.3
|
- update Console_Getopt to 1.4.3
|
||||||
- drop patches merged upstream
|
- drop patches merged upstream
|
||||||
|
2
sources
2
sources
@ -1,4 +1,4 @@
|
|||||||
SHA512 (Archive_Tar-1.4.8.tgz) = b4fe4944a6f261de0c9e28aeee7f50fc7220400c6abad3093c81b1b3b98cbb179abb17b53e90071af6f2fb0f13dfabb24a51d826f4bc632631f1e60e038728e1
|
SHA512 (Archive_Tar-1.4.9.tgz) = c0cce8213926aa9fde07bf46d77015b2dfbfe878cf386df43fcd4cf346b4ffdb2587676cfb69fc917cc31b63507c33702938a22aeb26e16b5ea27039c525c4e1
|
||||||
SHA512 (Console_Getopt-1.4.3.tgz) = 7803e063576e9dac6833064b5a1479d22ca31c2a8ef8036ae530271e4e824fedb94e54d63266be8929f90f8df745b3ada7185dc98319b331f8dc5e9cac5445a0
|
SHA512 (Console_Getopt-1.4.3.tgz) = 7803e063576e9dac6833064b5a1479d22ca31c2a8ef8036ae530271e4e824fedb94e54d63266be8929f90f8df745b3ada7185dc98319b331f8dc5e9cac5445a0
|
||||||
SHA512 (PEAR-1.10.10.tgz) = a05296dd5831c3290ab514cf128f48ecf3d60a0de5c46e22653ac552aea64eabdc536ec51487d062f7402cb653862e104b70e341be6b10d4ab5097357ab95628
|
SHA512 (PEAR-1.10.10.tgz) = a05296dd5831c3290ab514cf128f48ecf3d60a0de5c46e22653ac552aea64eabdc536ec51487d062f7402cb653862e104b70e341be6b10d4ab5097357ab95628
|
||||||
SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833
|
SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833
|
||||||
|
Loading…
Reference in New Issue
Block a user