cvs: pear-core / package-PEAR.xml package2.xml /scripts pearcmd.php

cellog Sun Jan 7 18:35:41 2007 UTC Modified files: /pear-core package-PEAR.xml package2.xml /pear-core/scripts pearcmd.php Log: * fix Bug #9757: pear does not validate -d input (pear -d php_dir=whatever command) http://cvs.php.net/viewvc.cgi/pear-core/package-PEAR.xml?r1=1.413&r2=1.414&diff_format=u Index: pear-core/package-PEAR.xml diff -u pear-core/package-PEAR.xml:1.413 pear-core/package-PEAR.xml:1.414 --- pear-core/package-PEAR.xml:1.413 Sun Jan 7 16:14:15 2007 +++ pear-core/package-PEAR.xml Sun Jan 7 18:35:40 2007 @@ -83,9 +83,11 @@ <license>PHP License</license> <state>beta</state> <notes> + * update Archive_Tar recommended version to 1.3.2 * fix Bug #9660: dependency sorting on installation does not always work * fix Bug #9688: [PATCH] Fix build of PECL extensions * fix Bug #9712: pear uninstall --register-only remove file : it should not + * fix Bug #9757: pear does not validate -d input (pear -d php_dir=whatever command) </notes> <provides type="class" name="OS_Guess"/> <provides type="class" name="System"/> http://cvs.php.net/viewvc.cgi/pear-core/package2.xml?r1=1.307&r2=1.308&diff_format=u Index: pear-core/package2.xml diff -u pear-core/package2.xml:1.307 pear-core/package2.xml:1.308 --- pear-core/package2.xml:1.307 Sun Jan 7 16:11:25 2007 +++ pear-core/package2.xml Sun Jan 7 18:35:40 2007 @@ -88,8 +88,11 @@ </stability> <license uri="http://www.php.net/license">PHP License</license> <notes> + * update Archive_Tar recommended version to 1.3.2 * fix Bug #9660: dependency sorting on installation does not always work * fix Bug #9688: [PATCH] Fix build of PECL extensions + * fix Bug #9712: pear uninstall --register-only remove file : it should not + * fix Bug #9757: pear does not validate -d input (pear -d php_dir=whatever command) </notes> <contents> <dir name="/"> @@ -426,7 +429,7 @@ <name>Archive_Tar</name> <channel>pear.php.net</channel> <min>1.1</min> - <recommended>1.3.1</recommended> + <recommended>1.3.2</recommended> <exclude>1.3.0</exclude> </package> <package> http://cvs.php.net/viewvc.cgi/pear-core/scripts/pearcmd.php?r1=1.35&r2=1.36&diff_format=u Index: pear-core/scripts/pearcmd.php diff -u pear-core/scripts/pearcmd.php:1.35 pear-core/scripts/pearcmd.php:1.36 --- pear-core/scripts/pearcmd.php:1.35 Fri Sep 22 02:48:44 2006 +++ pear-core/scripts/pearcmd.php Sun Jan 7 18:35:40 2007 @@ -18,7 +18,7 @@ // | | // +----------------------------------------------------------------------+ // -// $Id: pearcmd.php,v 1.35 2006/09/22 02:48:44 cellog Exp $ +// $Id: pearcmd.php,v 1.36 2007/01/07 18:35:40 cellog Exp $ ob_end_clean(); if (!defined('PEAR_RUNTYPE')) { @@ -188,10 +188,28 @@ $param = !empty($opt[1]) ? $opt[1] : true; switch ($opt[0]) { case 'd': + if ($param === true) { + die('Invalid usage of "-d" option, expected -d config_value=value, ' . + 'received "-d"' . "\n"); + } + $possible = explode('=', $param); + if (count($possible) != 2) { + die('Invalid usage of "-d" option, expected -d config_value=value, received "' . + $param . '"' . "\n"); + } list($key, $value) = explode('=', $param); $config->set($key, $value, 'user'); break; case 'D': + if ($param === true) { + die('Invalid usage of "-d" option, expected -d config_value=value, ' . + 'received "-d"' . "\n"); + } + $possible = explode('=', $param); + if (count($possible) != 2) { + die('Invalid usage of "-d" option, expected -d config_value=value, received "' . + $param . '"' . "\n"); + } list($key, $value) = explode('=', $param); $config->set($key, $value, 'system'); break;