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

- added patches

Browse Source 
fix bsc#1187372 -- https://github.com/pear/pear-core/pull/115
  + php7-pear-undefined-variables.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:php/php7-pear?expand=0&rev=30
This commit is contained in:
Petr Gajdos
2021-06-16 09:28:07 +00:00
committed by Git OBS Bridge
parent 41705a9b62
commit e4392bb280
3 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
php7-pear-undefined-variables.patch Normal file
View File

@@ -0,0 +1,20 @@
--- PEAR/Proxy.php.orig 2021-06-16 11:11:23.526420199 +0200
+++ PEAR/Proxy.php 2021-06-16 11:12:49.978911163 +0200
@@ -104,7 +104,7 @@ class PEAR_Proxy
stream_set_blocking ($fp, true);
$crypto_res = stream_socket_enable_crypto($fp, true, $crypto_method);
if (!$crypto_res) {
- return PEAR::raiseError("Could not establish SSL connection through proxy $proxy_host:$proxy_port: $crypto_res");
+ return PEAR::raiseError("Could not establish SSL connection through proxy: $crypto_res");
}
return true;
@@ -164,7 +164,7 @@ class PEAR_Proxy
);
if (!$fp) {
- return PEAR::raiseError("Connection to `$proxy_host:$proxy_port' failed: $errstr", -9276);
+ return PEAR::raiseError("Connection to the proxy failed: $errstr", -9276);
}
/* HTTPS is to be used and we have a proxy, use CONNECT verb */

7
php7-pear.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jun 16 09:27:45 UTC 2021 - pgajdos@suse.com
- added patches
fix bsc#1187372 -- https://github.com/pear/pear-core/pull/115
+ php7-pear-undefined-variables.patch
-------------------------------------------------------------------
Wed Jan 13 13:18:36 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>

20
php7-pear.spec
View File

@@ -32,17 +32,24 @@ 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
# bsc#1187372 -- https://github.com/pear/pear-core/pull/115
Patch0: php7-pear-undefined-variables.patch
BuildRequires: php7-cli
Requires: php7-cli
Recommends: php7-openssl
Provides: Archive_Tar
Provides: Console_Getopt
Provides: PEAR
Provides: Structures_Graph
Provides: XML_Util
Provides: php-pear = %{version}
Provides: php-pear(Archive_Tar) = %pear_module_version Archive_Tar
Provides: php-pear(Console_Getopt) = %pear_module_version Console_Getopt
Provides: php-pear(PEAR) = %pear_module_version PEAR
Provides: php-pear(Structures_Graph) = %pear_module_version Structures_Graph
Provides: php-pear(XML_Util) = %pear_module_version XML_Util
Provides: php-pear(Archive_Tar) = %pear_module_version
Provides: php-pear(Console_Getopt) = %pear_module_version
Provides: php-pear(PEAR) = %pear_module_version
Provides: php-pear(Structures_Graph) = %pear_module_version
Provides: php-pear(XML_Util) = %pear_module_version
Obsoletes: php-pear < %{version}
%if 0%{?suse_version} <= 1500
%if 0%{?suse_version} <= 1500
Provides: php7-pear-Archive_Tar
Obsoletes: php7-pear-Archive_Tar
%endif
@@ -99,6 +106,7 @@ php -d date.timezone=UTC -d memory_limit=64M -d short_open_tag=0 -d safe_mode=0
--man %{_mandir} \
--metadata %{metadir} \
--www %{peardir}/htdocs
patch -p0 -d %{buildroot}/%{peardir} < %{PATCH0}
%pre
if [ -d %{peardir}/.registry -a ! -d %{metadir}/.registry ]; then