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 | 21fda84e3661812625b0e63d993b3a184600f4a0 (patch) | |
| tree | dcd791b7507518f94039e58a3b2fa11ed752978e /dev-lang | |
| parent | assuring that php was built with USE='spl hash', thanks to Nick P in bug 219405 (diff) | |
| download | historical-21fda84e3661812625b0e63d993b3a184600f4a0.tar.gz historical-21fda84e3661812625b0e63d993b3a184600f4a0.tar.bz2 historical-21fda84e3661812625b0e63d993b3a184600f4a0.zip | |
src_test improvements (avoid false positives with USE=-suhosin)
Package-Manager: portage-2.1.5_rc6
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/php/Manifest | 10 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.6.ebuild | 7 |
3 files changed, 13 insertions, 10 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/Manifest b/dev-lang/php/Manifest index fd3e3c0f1cb6..97497c532de3 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -26,14 +26,14 @@ DIST suhosin-patch-5.2.5_p20080206-0.9.6.2-gentoo.patch.gz 22985 RMD160 330d248a EBUILD php-4.4.8.ebuild 13382 RMD160 17daef3621eff68c2f5e73f456e33eb8e57272bd SHA1 861b9ebfbcedd3b0d58337f493ec6f8403133ea6 SHA256 24bc333ebccaed00a396fe9f919d51bd1c9bac5387d5c897a8ee61d5befa626c EBUILD php-4.4.8_pre20070816.ebuild 13774 RMD160 740f9c4cd3d887fd23e0a7c4e892b90e610af3f9 SHA1 0314e4271fa31a3c3dfb9c2ec7593d1758d9a6e8 SHA256 91dac9fff37d2067a14be54ff85e2141e24426154bd37d4b7d19483e3577414e EBUILD php-5.2.5-r1.ebuild 13997 RMD160 e9d8fb469d0e80011f756173029e058279a17bd3 SHA1 225b5ef6e2bb57fe102e6e2e42903913bb3cd898 SHA256 7b05895d96560cdc24b90310169a7da1034d53d8640dd3ba77a07546ae7ea7ab -EBUILD php-5.2.6.ebuild 15335 RMD160 ca7d8cbda71fdff94dfbde611044e84a47f0a99f SHA1 3692f7dce4c03a85a2fb294a9fa88745e62fd202 SHA256 b4647dc1bf6c4f39bc857dedd7089335e96f9e7f85b6d1dfe3ed630aff98a10c +EBUILD php-5.2.6.ebuild 15292 RMD160 f6157ccdaffbf24252e4d07e26ffa55cb46f3ff9 SHA1 dd479cc008ae5aee86a29e4eeb2297daadb60f3a SHA256 47285d81ade0c4323c862924251b1fdc4b34e29f461759a471494d96c9be422e EBUILD php-5.2.6_rc4.ebuild 14591 RMD160 10095304f21234059dff4b237f25c7d4eb1e4ad5 SHA1 1050e2ba6e1140f92e054ed8db201e499923cc13 SHA256 5bb2b6ecf9cb535c42983110cf3d5ea2ed99377cf53dca4330b1d8c6c8057d88 -MISC ChangeLog 47399 RMD160 cb8e2f25125df5814dba0100ad7877bcf1c0ad87 SHA1 95a6f2c105c9fd35e370628d7607965764981cb5 SHA256 379170f4e4835d5648894b2f0c40bd7985e479ee298b0d5f01dfde09cdd8566d +MISC ChangeLog 47581 RMD160 698aa1330c3bf8b3e41390b841a91cf1f411f7d9 SHA1 ba117ae98ad2499fba663e40a3a21be47665a0aa SHA256 7cc618a7ac8e4297ecda9bb40bad048be27b05ef61c24aaa6263a3b671a52e8d MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkgZ2ooACgkQV6E0EIywUuX0mwCg45Yqwx1G2OQrZ9RcVWDNysWB -HgcAoIZJ35XpSZhcqJnWlE+QJPagCKuy -=cFuP +iEYEARECAAYFAkgZ7aIACgkQV6E0EIywUuXy0ACg2oa6RH8O1rVU3IUjZqVLauqV +tI0AoJdW3buvmQmldANtmehfQwG6jKmT +=IL3a -----END PGP SIGNATURE----- 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} } |