diff options
| author |   Ole Markus With <olemarkus@gentoo.org> | 2011-03-14 22:19:24 +0000 |
|---|---|---|
| committer | Ole Markus With <olemarkus@gentoo.org> | 2011-03-14 22:19:24 +0000 |
| commit | bce6708ec15c4b6a6737f069b14854e10741c0e7 (patch) | |
| tree | 8ad8b1e9229baef05ed2b10c155ac3596755294d /dev-php/PEAR-PEAR/files | |
| parent | Version bump to 3.5.8 bug 358953 (diff) | |
| download | gentoo-2-bce6708ec15c4b6a6737f069b14854e10741c0e7.tar.gz gentoo-2-bce6708ec15c4b6a6737f069b14854e10741c0e7.tar.bz2 gentoo-2-bce6708ec15c4b6a6737f069b14854e10741c0e7.zip | |
Fixes security bug #356893. This time it should work properly
(Portage version: 2.1.9.41/cvs/Linux x86_64)
Diffstat (limited to 'dev-php/PEAR-PEAR/files')
| -rw-r--r-- | dev-php/PEAR-PEAR/files/symlink-attack-fix.patch | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/dev-php/PEAR-PEAR/files/symlink-attack-fix.patch b/dev-php/PEAR-PEAR/files/symlink-attack-fix.patch index 8101b2e592af..bd126e301ec0 100644 --- a/dev-php/PEAR-PEAR/files/symlink-attack-fix.patch +++ b/dev-php/PEAR-PEAR/files/symlink-attack-fix.patch @@ -2,8 +2,35 @@ Fixes issue with symlink attacks found in PEAR-PEAR-1.9.2 Upstream bug: http://pear.php.net/bugs/bug.php?id=18056 Gentoo bug: 356893 ---- pear/pear-core/tags/PEAR-1.9.3/PEAR/REST.php 2011/03/08 22:46:27 309041 -+++ pear/pear-core/tags/PEAR-1.9.3/PEAR/REST.php 2011/03/08 23:16:30 309042 +--- PEAR-1.9.2/PEAR/REST.php.old 2011-03-14 18:21:59.000000000 +0100 ++++ PEAR-1.9.2/PEAR/REST.php 2011-03-14 23:01:40.000000000 +0100 +@@ -102,7 +102,7 @@ + // reset the age of the cache if the server says it was unmodified + $result = $this->saveCache($url, $ret, null, true, $cacheId); + if (PEAR::isError($result)) { +- return PEAR::raiseErro($result->getMessage()); ++ return PEAR::raiseError($result->getMessage()); + } + } + +@@ -122,7 +122,7 @@ + if ($forcestring) { + $result = $this->saveCache($url, $content, $lastmodified, false, $cacheId); + if (PEAR::isError($result)) { +- return PEAR::raiseErro($result->getMessage()); ++ return PEAR::raiseError($result->getMessage()); + } + + return $content; +@@ -162,7 +162,7 @@ + + $result = $this->saveCache($url, $content, $lastmodified, false, $cacheId); + if (PEAR::isError($result)) { +- return PEAR::raiseErro($result->getMessage()); ++ return PEAR::raiseError($result->getMessage()); + } + + return $content; @@ -228,59 +228,75 @@ $cacheidfile = $d . 'rest.cacheid'; $cachefile = $d . 'rest.cachefile'; @@ -117,10 +144,3 @@ Gentoo bug: 356893 fclose($cachefile_fp); return true; } -@@ -464,4 +480,4 @@ - - return $data; - } --} -+} -\ No newline at end of file |