Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrades of embedded pear packages allowed.

Browse source 
The important security upgrade of pear XML_RPC package embedded.
This commit is contained in:
tomas 2005-08-15 13:00:40 +00:00
parent 921ce2b1e4
commit 21af09e976
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php
View file

@ -23,7 +23,7 @@
Author : $Author: tomas $ Author : $Author: tomas $
Version : $Revision: 1.26 $ Version : $Revision: 1.27 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/xrLocStor.php,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -133,14 +133,15 @@ $methods = array(
$defs = array(); $defs = array();
foreach($methods as $method=>$description){ foreach($methods as $method=>$description){
$defs["locstor.$method"] = array( $defs["locstor.$method"] = array(
# "function" => array(&$locStor, "xr_$method"), "function" => array(&$locStor, "xr_$method"),
"function" => "\$GLOBALS['locStor']->xr_$method", # "function" => "\$GLOBALS['locStor']->xr_$method",
"signature" => array( "signature" => array(
array($GLOBALS['XML_RPC_Struct'], $GLOBALS['XML_RPC_Struct']) array($GLOBALS['XML_RPC_Struct'], $GLOBALS['XML_RPC_Struct'])
), ),
"docstring" => $description "docstring" => $description
); );
} }
$s=new XML_RPC_Server( $defs ); $s=new XML_RPC_Server( $defs );
?> ?>

25
livesupport/tools/pear/bin/install.sh
View file

@ -22,7 +22,7 @@
# #
# #
# Author : $Author: tomas $ # Author : $Author: tomas $
# Version : $Revision: 1.9 $ # Version : $Revision: 1.10 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/bin/install.sh,v $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/bin/install.sh,v $
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -62,7 +62,8 @@ XML_Serializer
VERSION_Archive_Tar=Archive_Tar-1.3.1 VERSION_Archive_Tar=Archive_Tar-1.3.1
VERSION_Console_Getopt=Console_Getopt-1.2 VERSION_Console_Getopt=Console_Getopt-1.2
VERSION_XML_RPC=XML_RPC-1.3.0RC1 #VERSION_XML_RPC=XML_RPC-1.3.0RC1
VERSION_XML_RPC=XML_RPC-1.4.0
VERSION_PEAR=PEAR-1.3.5 VERSION_PEAR=PEAR-1.3.5
VERSION_Calendar=Calendar-0.5.2 VERSION_Calendar=Calendar-0.5.2
VERSION_DB=DB-1.7.6 VERSION_DB=DB-1.7.6
@ -149,10 +150,10 @@ $pearcmd config-set test_dir $peardir/tests || exit 1
check_pear_module() { check_pear_module() {
test_result=`$pearcmd info $1` test_result=`$pearcmd info $1`
if [ $? = 0 ]; then if [ $? = 0 ]; then
echo "OK" #echo "OK"
return 0; return 0;
else else
echo "NOT found ..."; #echo "NOT installed";
return 1; return 1;
fi fi
} }
@ -166,15 +167,15 @@ cd $srcdir
for pkg in $packages_required for pkg in $packages_required
do echo -n " " do echo -n " "
echo -n "$pkg " echo -n "$pkg: "
eval "pkgv=\$VERSION_$pkg" eval "pkgv=\$VERSION_$pkg"
echo -n "($pkgv) " check_pear_module $pkg && (
check_pear_module $pkg || \ $pearcmd upgrade $pkgv.tgz >/dev/null && echo -n "upgrading to $pkgv"
{ #|| echo -n "code: $?"
echo -n "installing: $pkgv " ) || (
$pearcmd install $pkgv.tgz $pearcmd install $pkgv.tgz >/dev/null && echo -n "installing $pkgv" || exit 1
check_pear_module $pkg || exit 1; )
} check_pear_module $pkg && echo " OK" || exit 1
done done
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------