diff --git a/.gitignore b/.gitignore index e657aac..eeec0dd 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ clog /XML_Util-1.4.0.tgz /XML_Util-1.4.1.tgz /XML_Util-1.4.2.tgz +/PEAR-1.10.3.tgz diff --git a/pear-proxy.patch b/pear-proxy.patch deleted file mode 100644 index d5d7685..0000000 --- a/pear-proxy.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 798621dda8328228a6cccfc09a7b7cce77ba3424 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 30 Mar 2016 11:45:21 +0200 -Subject: [PATCH] fix https connection via proxy - ---- - PEAR/REST.php | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/PEAR/REST.php b/PEAR/REST.php -index 1e472b7..00129ba 100644 ---- a/PEAR/REST.php -+++ b/PEAR/REST.php -@@ -360,11 +360,7 @@ function downloadHttp($url, $lastmodified = null, $accept = false, $channel = fa - if ($this->config->get('http_proxy')&& - $proxy = parse_url($this->config->get('http_proxy')) - ) { -- $proxy_host = isset($proxy['host']) ? $proxy['host'] : null; -- if ($schema === 'https') { -- $proxy_host = 'ssl://' . $proxy_host; -- } -- -+ $proxy_host = isset($proxy['host']) ? $proxy['host'] : null; - $proxy_port = isset($proxy['port']) ? $proxy['port'] : 8080; - $proxy_user = isset($proxy['user']) ? urldecode($proxy['user']) : null; - $proxy_pass = isset($proxy['pass']) ? urldecode($proxy['pass']) : null; diff --git a/php-pear.spec b/php-pear.spec index a1e5ff9..6d1b509 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -26,8 +26,8 @@ Summary: PHP Extension and Application Repository framework Name: php-pear -Version: 1.10.1 -Release: 11%{?dist} +Version: 1.10.3 +Release: 1%{?dist} Epoch: 1 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -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 -# https://github.com/pear/pear-core/pull/51 -Patch0: pear-proxy.patch - BuildArch: noarch BuildRequires: php(language) > 5.4 BuildRequires: php-cli @@ -120,8 +117,8 @@ do done cp %{SOURCE1} . -# apply patches on used PEAR during install -# Patches applied on installation tree +# apply patches on PEAR needed during install +# other patches applied on installation tree sed -e 's:@BINDIR@:%{_bindir}:' \ -e 's:@LIBDIR@:%{_localstatedir}/lib:' \ @@ -186,7 +183,7 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd $RPM_BUILD_ROOT%{peardir} -patch --no-backup --fuzz 0 -p1 < %{PATCH0} +: no patch \\o/ popd # Why this file here ? @@ -293,6 +290,9 @@ fi %changelog +* Tue Feb 28 2017 Remi Collet 1:1.10.3-1 +- update PEAR to 1.10.3 + * Thu Feb 23 2017 Remi Collet 1:1.10.1-12 - update XML_Util to 1.4.2 - drop patch merged upstream diff --git a/sources b/sources index f81c041..d07b342 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (Archive_Tar-1.4.2.tgz) = dad5872c82fb9fd961dc06d173610f60d0e05b4c05428e3410beb5a6cdf05de27704edf805e7db80c4031409af5d7d59e7abe43cef7aa11fd9d086b1c6e8e761 SHA512 (Console_Getopt-1.4.1.tgz) = cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd -SHA512 (PEAR-1.10.1.tgz) = df5f09a92d211a09dae147af474399171aed46e0536c091468b73b43ba4acdbdbf7b5cbdd17ef48b7d36d7b9dd23187dc6c75733731c267768d49c89698b0ef2 +SHA512 (PEAR-1.10.3.tgz) = 1ad531a6e0ac30719b05e58f0758393bc6cdb0e89b4f99f843e7318a40ef18e74767e8ed63346b0ece9d6e8e71c8ebe15b08eaeb6f0c4f3169814bb4bb524332 SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833 SHA512 (Structures_Graph-1.1.1.tgz) = cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284 SHA512 (XML_Util-1.4.2.tgz) = e0a328f92cdcd09277238e14d68b73cba319ab9b4e9c50ab102b43f73c889599f5933415dc228bd1feb56a48c1527e0e9a86999ee2209b2d84131691aee74cbe