diff options
| author | Greg Beaver <cellog@php.net> | 2005-08-17 21:30:46 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2005-08-17 21:30:46 +0000 |
| commit | 1dd48ca03941b8fd50221f7b02424e8db384fb21 (patch) | |
| tree | 5d39a348b9eb1e6ea8e95f1e369c028abd2c043b /pear | |
| parent | f286018dd03899cfc400003906bec51bbfc03c7f (diff) | |
| download | php-git-1dd48ca03941b8fd50221f7b02424e8db384fb21.tar.gz | |
re-enable XML_RPC 1.4.0
Diffstat (limited to 'pear')
| -rw-r--r-- | pear/PEAR/Remote.php | 4 | ||||
| -rwxr-xr-x | pear/go-pear-list.php | 4 | ||||
| -rw-r--r-- | pear/package-PEAR.xml | 24 |
3 files changed, 21 insertions, 11 deletions
diff --git a/pear/PEAR/Remote.php b/pear/PEAR/Remote.php index 1da25f0815..8becb4e70f 100644 --- a/pear/PEAR/Remote.php +++ b/pear/PEAR/Remote.php @@ -115,9 +115,9 @@ class PEAR_Remote extends PEAR $this->saveCache($_args, $result); }; return $result; - } else { - return $this->raiseError("For this remote PEAR operation you need to load the xmlrpc extension"); } + if (!@include_once("XML/RPC.php")) { + return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package"); array_shift($args); $server_host = $this->config->get('master_server'); $username = $this->config->get('username'); diff --git a/pear/go-pear-list.php b/pear/go-pear-list.php index 49635f1097..3befd0f1fd 100755 --- a/pear/go-pear-list.php +++ b/pear/go-pear-list.php @@ -7,10 +7,10 @@ */ $packages = array( // required packages for the installer -"PEAR" => "1.3.5", +"PEAR" => "1.3.6", "XML_RPC" => "1.4.0", "Console_Getopt" => "1.2", -"Archive_Tar" => "1.3.1", +"Archive_Tar" => "1.3.2", // required packages for the web frontend "PEAR_Frontend_Web" => "0.4", diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml index 5d4e292b50..ce5e1515d0 100644 --- a/pear/package-PEAR.xml +++ b/pear/package-PEAR.xml @@ -19,7 +19,7 @@ <maintainer> <user>ssb</user> <role>lead</role> - <name>Stig Sæther Bakken</name> + <name>Stig Bakken</name> <email>stig@php.net</email> </maintainer> <maintainer> @@ -48,14 +48,12 @@ </maintainer> </maintainers> <release> - <version>1.3.5</version> - <date>2005-02-18</date> + <version>1.3.6</version> + <date>2005-08-16</date> <state>stable</state> <license>PHP License</license> <notes> - * fix Bug #3505: pecl can't install PDO - * enhance pear run-tests dramatically - * fix Bug #3506: pear install should export the pear version into the environment + * Bump XML_RPC dependency to 1.4.0 </notes> <provides type="class" name="OS_Guess" /> <provides type="class" name="System" /> @@ -124,13 +122,25 @@ <dep type="php" rel="ge" version="4.2"/> <dep type="pkg" rel="ge" version="1.1">Archive_Tar</dep> <dep type="pkg" rel="ge" version="1.2">Console_Getopt</dep> - <dep type="ext" rel="has">xmlrpc</dep> + <dep type="pkg" rel="ge" version="1.4.0">XML_RPC</dep> <dep type="ext" rel="has">xml</dep> <dep type="ext" rel="has">pcre</dep> + <dep type="ext" rel="has" optional="yes">xmlrpc</dep> </deps> </release> <changelog> <release> + <version>1.3.5</version> + <date>2005-02-18</date> + <state>stable</state> + <license>PHP License</license> + <notes> + * fix Bug #3505: pecl can't install PDO + * enhance pear run-tests dramatically + * fix Bug #3506: pear install should export the pear version into the environment + </notes> + </release> + <release> <version>1.3.1</version> <date>2004-04-06</date> <state>stable</state> |