[paketler-commits] r71211 - in 2009/devel/programming/language/php/php: . files
paketler-commits at pardus.org.tr
paketler-commits at pardus.org.tr
29 Haz 2009 Pzt 11:18:39 EEST
Author: pinar
Date: Mon Jun 29 11:18:39 2009
New Revision: 71211
Modified:
2009/devel/programming/language/php/php/files/go-pear
2009/devel/programming/language/php/php/pspec.xml
Log:
Update go-pear to 1.119.
Modified: 2009/devel/programming/language/php/php/files/go-pear
=================================================================
--- 2009/devel/programming/language/php/php/files/go-pear (original)
+++ 2009/devel/programming/language/php/php/files/go-pear Mon Jun 29 11:18:39 2009
@@ -1,4 +1,3 @@
-#!/usr/bin/php -q
<?php //; echo; echo "YOU NEED TO RUN THIS SCRIPT WITH PHP!"; echo; echo "Point your webbrowser to it or run: php -q go-pear.php"; echo; exit # -*- PHP -*-
#
# The PEAR installation wizard, both webbased or command line.
@@ -23,10 +22,10 @@
/**
* go-pear is the online PEAR installer: just download it and run it
* (through a browser or command line), it will set up a minimal PEAR
- * installation that will be ready for immediatel use.
+ * installation that will be ready for immediate use.
*
* @license http://www.php.net/license/2_02.txt PHP License 2.02
- * @version CVS: $Id: go-pear,v 1.114 2008/02/01 23:03:35 tias Exp $
+ * @version CVS: $Id: go-pear,v 1.119 2009/04/27 20:53:03 cweiske Exp $
* @link http://pear.php.net/package/pearweb_gopear
* @author Tomas V.V.Cox <cox at idecnet.com>
* @author Stig Bakken <ssb at php.net>
@@ -54,7 +53,7 @@
error_reporting( E_ALL & ~E_NOTICE);
define('WINDOWS', (substr(PHP_OS, 0, 3) == 'WIN'));
-define('GO_PEAR_VER', '1.1.1');
+define('GO_PEAR_VER', '1.1.2');
define('WIN32GUI', !WEBINSTALLER && WINDOWS && $sapi_name=='cli' && which('cscript'));
@@ -106,9 +105,9 @@
$gopear_bundle_dir = dirname(__FILE__).'/go-pear-bundle';
$bootstrap_files = array(
- 'PEAR.php' => 'http://cvs.php.net/viewcvs.cgi/pear-core/PEAR.php?view=co&pathrev=PEAR_1_4',
- 'Archive/Tar.php' => 'http://cvs.php.net/viewcvs.cgi/pear/Archive_Tar/Archive/Tar.php?view=co&pathrev=RELEASE_1_3_2',
- 'Console/Getopt.php' => 'http://cvs.php.net/viewcvs.cgi/pear-core/Console/Getopt.php?view=co&pathrev=PEAR_1_4',
+ 'PEAR.php' => 'http://cvs.php.net/viewvc.cgi/pear-core/PEAR.php?view=co&pathrev=PEAR_1_4',
+ 'Archive/Tar.php' => 'http://cvs.php.net/viewvc.cgi/pear/Archive_Tar/Archive/Tar.php?view=co&pathrev=RELEASE_1_3_2',
+ 'Console/Getopt.php' => 'http://cvs.php.net/viewvc.cgi/pear-core/Console/Getopt.php?view=co&pathrev=PEAR_1_4',
);
$bootstrap_pkgs = array( // uses URL like http://pear.php.net/get/%s
@@ -763,6 +762,7 @@
}
$config->set('download_dir', $temp_dir . '/download');
$config->set('temp_dir', $temp_dir);
+$config->set('http_proxy', $http_proxy);
$config->store();
$registry = new PEAR_Registry($php_dir);
@@ -1259,10 +1259,11 @@
/* try it really, is_writable is buggy with openbasedir */
$fh = @fopen(realpath($default) . "/test","wb");
if ($fh) {
- $ptmp = $default;
+ // desparately try to set temp dir any possible way, see bug #13167
+ $ptmp = $_temp = $temp_dir = $default;
+ putenv('TMPDIR='.$default);
return true;
} else {
- $ptmp = "failed";
return false;
}
}
@@ -1310,7 +1311,7 @@
// If for some reason the user has no rights to access to
// the standard tempdir, we assume that he has the right
// to access his prefix and choose $prefix/tmp as tempdir
- if (!$_temp) {
+ if (!$_temp || !is_writable($_temp)) {
print "System's Tempdir failed, trying to use \$prefix/tmp ...";
$res = mkdir_p($prefix.'/tmp');
if (!$res) {
@@ -1799,7 +1800,18 @@
<?php
} elseif ($page == 'config') {
if (!empty($GLOBALS['http_proxy'])) {
- list($proxy_host, $proxy_port) = explode(':', $GLOBALS['http_proxy']);
+ $tmp_proxy = parse_url($GLOBALS['http_proxy']);
+
+ $proxy_host = $tmp_proxy['scheme'] . '://';
+ if ($tmp_proxy['user'] != '') {
+ $proxy_host .= $tmp_proxy['user'];
+ if ($tmp_proxy['pass'] != '') {
+ $proxy_host .= ':' . $tmp_proxy['pass'];
+ }
+ $proxy_host .= '@';
+ }
+ $proxy_host .= $tmp_proxy['host'];
+ $proxy_port = $tmp_proxy['port'];
} else {
$proxy_host = $proxy_port = '';
}
Modified: 2009/devel/programming/language/php/php/pspec.xml
=================================================================
--- 2009/devel/programming/language/php/php/pspec.xml (original)
+++ 2009/devel/programming/language/php/php/pspec.xml Mon Jun 29 11:18:39 2009
@@ -99,6 +99,13 @@
</Package>
<History>
+ <Update release="70">
+ <Date>2009-06-29</Date>
+ <Version>5.2.10</Version>
+ <Comment>Update go-pear to 1.119.</Comment>
+ <Name>Pınar Yanardağ</Name>
+ <Email>pinar at pardus.org.tr</Email>
+ </Update>
<Update release="69" type="security">
<Date>2009-06-22</Date>
<Version>5.2.10</Version>
Paketler-commits mesaj listesiyle ilgili
daha fazla bilgi