diff options
| author |   Christian Hoffmann <hoffie@gentoo.org> | 2008-05-01 16:19:40 +0000 |
|---|---|---|
| committer | Christian Hoffmann <hoffie@gentoo.org> | 2008-05-01 16:19:40 +0000 |
| commit | 0e68bc9fce3951a9a9826dd03a6367777880d7ce (patch) | |
| tree | 0c12d7447c07842cc11210f9e457eeec69e4342e /dev-lang | |
| parent | assuring that php was built with USE='spl hash', thanks to Nick P in bug 219405 (diff) | |
| download | gentoo-2-0e68bc9fce3951a9a9826dd03a6367777880d7ce.tar.gz gentoo-2-0e68bc9fce3951a9a9826dd03a6367777880d7ce.tar.bz2 gentoo-2-0e68bc9fce3951a9a9826dd03a6367777880d7ce.zip | |
src_test improvements (avoid false positives with USE=-suhosin)
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.6.ebuild | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 4e715b34c7c8..327811f66402 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/php # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.266 2008/05/01 14:58:11 hoffie Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.267 2008/05/01 16:19:40 hoffie Exp $ + + 01 May 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6.ebuild: + only try to fix the open_basedir test cases when suhosin is enabled, + otherwise it breaks for non-suhosin *php-5.2.6 (01 May 2008) diff --git a/dev-lang/php/php-5.2.6.ebuild b/dev-lang/php/php-5.2.6.ebuild index 7a98b3ef9018..4c231480c3cc 100644 --- a/dev-lang/php/php-5.2.6.ebuild +++ b/dev-lang/php/php-5.2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6.ebuild,v 1.1 2008/05/01 14:58:11 hoffie Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6.ebuild,v 1.2 2008/05/01 16:19:40 hoffie Exp $ CGI_SAPI_USE="discard-path force-cgi-redirect" APACHE2_SAPI_USE="concurrentmodphp threads" @@ -181,9 +181,8 @@ src_unpack() { sed -e 's:/blah:./bla:' -i \ ext/session/tests/session_save_path_variation{2,3}.phpt - # these only fail because of one "sub-test" which might be - # Gentoo-specific (sandbox? it's about path normalization, ../ -> ..) - sed -e 's:File(\.\./):File(..):g' -i \ + # these tests behave differently with suhosin enabled, adapting them... + use suhosin && sed -e 's:File(\.\./):File(..):g' -i \ ext/standard/tests/file/open_basedir*{.inc,.phpt} } |