diff options
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/php/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-lang/php/Manifest | 17 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.6-r1.ebuild | 504 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.6-r6.ebuild (renamed from dev-lang/php/php-5.2.6-r5.ebuild) | 4 | ||||
| -rw-r--r-- | dev-lang/php/php-5.2.6_rc4.ebuild | 484 |
5 files changed, 16 insertions, 1002 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 578e45d446ab..269539ddae8e 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,13 @@ # 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.282 2008/07/24 20:44:23 hoffie Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.283 2008/08/07 10:25:21 hoffie Exp $ + +*php-5.2.6-r6 (07 Aug 2008) + + 07 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6_rc4.ebuild, + -php-5.2.6-r1.ebuild, -php-5.2.6-r5.ebuild, +php-5.2.6-r6.ebuild: + lots of new security/crash fixes, bug 234102 (CVE-2008-2665, CVE-2008-2666 + and other issues); dropping old 24 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r2.ebuild, php-5.2.6-r5.ebuild: diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index f7e9b7d3ceae..9671ebd0842c 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -12,14 +12,11 @@ AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c925 DIST php-4.4.8.tar.bz2 4546525 RMD160 dedf4a1a853b19bd3fb91a6028a256facb2d3224 SHA1 fca6259fd3e8e3a7a37343e9a81651f5b6d4835c SHA256 30d8e281cf1b785301f0ce2ba6a803bda72fb229942d415ae601ef176b46d5c1 DIST php-5.2.5.tar.bz2 7773024 RMD160 2d5755f2ae8884e80f0a5c70e8fdfdb6deed46bc SHA1 6b46fd095891183b328163b70cdb5acd30a24b7a SHA256 5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3 DIST php-5.2.6.tar.bz2 9571312 RMD160 27f730d4b1ceb1c42ff03618dbfa0dc87a00990b SHA1 2a2b1afa657a7739a23784c869d57c3e0a7ad6b4 SHA256 1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81 -DIST php-5.2.6RC4.tar.bz2 9523333 RMD160 c07c629a0b761696fd74d21d641df049a3886046 SHA1 374871ab73cc3c164eb57a719ddfe52e88650d83 SHA256 8a8e406fcaa8431ce65ed1406bb7d3c2c0967995b7359e723a483190b0aa4e35 DIST php-patchset-4.4.8-r0.tar.bz2 18948 RMD160 c2f3cd05b161e144a65e9bde12f66eb44869b0f2 SHA1 174c325916bb2d0e6b03c1aab055ba6e8bb78314 SHA256 7fafaefd29b73f76ff8a2a90b827d213043be30b4e3ca4afd18b843cdcf16ab3 DIST php-patchset-5.2.5-r1.tar.bz2 15350 RMD160 777f77e351ed024952f2adf323261db28f98c428 SHA1 d794d02e57ae400cf32638e1168f3dd6d213911b SHA256 50860764cf068465af09acc5ed32ad89f2e8ee0e03b02b2dd70fa19bd1176f10 DIST php-patchset-5.2.6-r0.tar.bz2 10713 RMD160 408d25f1c28c582c5053c4eaf21c02e63e420d52 SHA1 b6b3b3c5d69288352a27075dddc2e00c87360d04 SHA256 161c9febd0f14fe8fa64f58016c2cf52ae39105f40c0735098218c122debed56 -DIST php-patchset-5.2.6-r1.tar.bz2 10979 RMD160 c731963f64ffeabca23d6ab01836373317af085a SHA1 f092ecb20e3f7831b8cbe26f166d70097faf485a SHA256 e19e9a3ba69085fd9dc59805a726a1be893969ed01684445fd915ceba2476689 DIST php-patchset-5.2.6-r2.tar.bz2 15621 RMD160 baee575d1e4c67eede70ceeb3a8119df2062c0cc SHA1 f3b57129e1e0ca56a61cceed2f7bbe796334cf43 SHA256 f49be3db0c4eb09918c1797eb304a91a0ef56fdd1db0c6d47504b785f718e995 -DIST php-patchset-5.2.6-r5.tar.bz2 16481 RMD160 e4f8545ac6004de4a76188c5280e251e3716d06f SHA1 ad938cf834071e2d41006da4a2844925e8d0c562 SHA256 ac9e98d839aa2898a1a175b4e77665f5dbcc9c0a56ba7b468266622fa1f6a7ab -DIST php-patchset-5.2.6_rc4-r0.tar.bz2 6889 RMD160 b154a8aa1f08970d3116b38b18830712cd007acb SHA1 4c75dd30cbc80106611f9fc2417be90870796ad3 SHA256 5f36ef96713f0bc8921515d8fb0d5929bb20abbaa3fe4a1e025a67ee5fb56055 +DIST php-patchset-5.2.6-r6.tar.bz2 32869 RMD160 5c1030b51a9b1c1d771ce63a3462a04dd45b662d SHA1 b6ca09bed4f4197fbc5f7d2dbc8e4453cd984953 SHA256 1239e9ff9ffeb9d6030d29eaa0f391f68872e5e1b4a81ddc5f191c2837e9931f DIST suhosin-patch-4.4.8-0.9.6.patch.gz 22246 RMD160 01b59d520b987de1995bce7ab74f5d92ece2a89f SHA1 0354436d109ae3872949fb436d45e9534355cb1c SHA256 eff5b6ed79dd76c59bd63ac591f778266c2d518cfab2cede716637cf8fc99630 DIST suhosin-patch-5.2.5-0.9.6.2.patch.gz 23157 RMD160 25863ad76bea4a8e5bf50bd916835b5d9324452c SHA1 1102e2e1de922b5199462100a7bbbb7cef5c3f58 SHA256 fd77ccdeb90c83af7492876dda17518de95dd74a5b6feecc5a1bd2c8e322ab53 DIST suhosin-patch-5.2.5_p20080206-0.9.6.2-gentoo.patch.gz 22985 RMD160 330d248a64790552945b5f94be749391acec5b26 SHA1 e087ad94cdddf03e8fa8fb49357963e75aae97bc SHA256 e3ac5634dc481b829b42d6f1521e10b1ce8a3cdbeca50822cab8937db8d4566f @@ -27,17 +24,15 @@ DIST suhosin-patch-5.2.6-0.9.6.2-r1.patch.gz 22987 RMD160 9c7bc7441e16686382a2b9 DIST suhosin-patch-5.2.6-0.9.6.2.patch.gz 22986 RMD160 f5e5e6d88b91506a49988e3b7f371c8a62b657ab SHA1 b19fcb8baa5e30b4533c662950883c29e185c1f5 SHA256 dfdae803778e6ed6854ea3ad2948bbfedbfffc5a32dbc75a657b99092a9cc5e4 EBUILD php-4.4.8.ebuild 13382 RMD160 17daef3621eff68c2f5e73f456e33eb8e57272bd SHA1 861b9ebfbcedd3b0d58337f493ec6f8403133ea6 SHA256 24bc333ebccaed00a396fe9f919d51bd1c9bac5387d5c897a8ee61d5befa626c EBUILD php-5.2.5-r1.ebuild 13997 RMD160 e9d8fb469d0e80011f756173029e058279a17bd3 SHA1 225b5ef6e2bb57fe102e6e2e42903913bb3cd898 SHA256 7b05895d96560cdc24b90310169a7da1034d53d8640dd3ba77a07546ae7ea7ab -EBUILD php-5.2.6-r1.ebuild 15278 RMD160 f53b3bc7850482612b93e3c3ea84281ea973ba9c SHA1 e2f39c7c3184da46d37e36bcde4753073a81f4c3 SHA256 cd878246c44ada41e04ebdfc85a70c1a6de1ac5df0df164f006a73aba966acd4 EBUILD php-5.2.6-r2.ebuild 15423 RMD160 640e51f190cdfe93ea36f7098b0c25a3e62d3d84 SHA1 d1a773b35c40c6d41a8cf0cd070cfe3febc96f48 SHA256 5c982bf757f54f4342567bca415dbdc571ac125fb99a11414cd4b63a0a30397b -EBUILD php-5.2.6-r5.ebuild 15515 RMD160 d05b0a4e845fe47a883c3d73da7a0c1f0d1351fe SHA1 46ab96f2964ad8c07bc8ab881f8f9390d983e813 SHA256 388394db6cd970fd75d087748a108c7d35a096666f70b90d178482d7efbe4294 +EBUILD php-5.2.6-r6.ebuild 15515 RMD160 6516457ea43ffa8202867e02458c123f8ef95825 SHA1 20b8c777693fabc90cbd0bbbbf0bafad3637be8b SHA256 b46c01341d0221bed083cb9ea480f071b452967e60eaa948676662809724ada2 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 50688 RMD160 3b6386d8b955f4ccde12959222501bec24f20a35 SHA1 557f4fecd8433873348f006276b9e95dc643cb9c SHA256 59a3de1d4f6c6623854347e873ed9d321563344b02b5cb0c64e738cc305f7092 +MISC ChangeLog 50974 RMD160 7d2261a059fe693dab3c00a1a49819aa8bed7c04 SHA1 c662fcae63cb62f9902a00ee7734f3272e9e6899 SHA256 b865a2ca6467b444c361ef6afe9355151cebfaf51db7bdd9beb8587156e626f5 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkiI6a0ACgkQV6E0EIywUuV9uACcDBzlyPyc+v/1fu965fkQFj5X -A0QAoNFragWisBXIiPFdhC4Y0M1fwzZc -=Lw0x +iEYEARECAAYFAkiazZoACgkQV6E0EIywUuUW7QCfQSRT/ZYBSxPXso8RezziLgWR +MaAAnArpBTjlknQiZ2P2+crFsXIz2v56 +=bRT9 -----END PGP SIGNATURE----- diff --git a/dev-lang/php/php-5.2.6-r1.ebuild b/dev-lang/php/php-5.2.6-r1.ebuild deleted file mode 100644 index 2bc35aaff314..000000000000 --- a/dev-lang/php/php-5.2.6-r1.ebuild +++ /dev/null @@ -1,504 +0,0 @@ -# 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-r1.ebuild,v 1.1 2008/05/05 21:01:17 hoffie Exp $ - -CGI_SAPI_USE="discard-path force-cgi-redirect" -APACHE2_SAPI_USE="concurrentmodphp threads" -IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -# NOTE: Portage doesn't support setting PROVIDE based on the USE flags -# that have been enabled, so we have to PROVIDE everything for now -# and hope for the best -PROVIDE="virtual/php virtual/httpd-php" - -# php package settings -SLOT="5" -MY_PHP_PV="${PV}" -MY_PHP_P="php-${MY_PHP_PV}" -PHP_PACKAGE="1" - -# php patch settings, general -PHP_PATCHSET_REV="1" -SUHOSIN_PATCH="suhosin-patch-5.2.6-0.9.6.2.patch.gz" -MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch" -# php patch settings, ebuild specific -FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch" -CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch" -# kolab patch - http://kolab.org/cgi-bin/viewcvs-kolab.cgi/server/patches/php/ -# bugs about this go to wrobel@gentoo.org -KOLAB_PATCH="${MY_PHP_PV}/opt/kolab-imap-annotations.patch" - -inherit versionator php5_2-sapi apache-module - -# Suhosin patch support -[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )" - -DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs." - -DEPEND="app-admin/php-toolkit" -RDEPEND="${DEPEND}" -if [[ -n "${KOLAB_PATCH}" ]] ; then - IUSE="${IUSE} kolab" - DEPEND="${DEPEND} - kolab? ( >=net-libs/c-client-2004g-r1 )" -fi - -want_apache - -pkg_setup() { - PHPCONFUTILS_AUTO_USE="" - - # Make sure the user has specified at least one SAPI - einfo "Determining SAPI(s) to build" - phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache2 - - # Threaded Apache2 support - if use apache2 ; then - has_apache_threads - fi - - # Concurrent PHP Apache2 modules support - if use apache2 ; then - if use concurrentmodphp ; then - ewarn - ewarn "'concurrentmodphp' makes it possible to load multiple, differently" - ewarn "versioned mod_php's into the same Apache instance. This is done with" - ewarn "a few linker tricks and workarounds, and is not guaranteed to always" - ewarn "work correctly, so use it at your own risk. Especially, do not use" - ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones" - ewarn "you may find in the Portage tree or the PHP Overlay!" - ewarn "This is an experimental feature, so please rebuild PHP" - ewarn "without the 'concurrentmodphp' USE flag if you experience" - ewarn "any problems, and then reproduce any bugs before filing" - ewarn "them in Gentoo's Bugzilla or bugs.php.net." - ewarn "If you have conclusive evidence that a bug directly" - ewarn "derives from 'concurrentmodphp', please file a bug in" - ewarn "Gentoo's Bugzilla only." - ewarn - ebeep 5 - fi - fi - - # fastbuild support - if use fastbuild ; then - ewarn - ewarn "'fastbuild' attempts to build all SAPIs in a single pass." - ewarn "This is an experimental feature, so please rebuild PHP" - ewarn "without the 'fastbuild' USE flag if you experience" - ewarn "any problems, and then reproduce any bugs before filing" - ewarn "them in Gentoo's Bugzilla or bugs.php.net." - ewarn "If you have conclusive evidence that a bug directly" - ewarn "derives from 'fastbuild', please file a bug in" - ewarn "Gentoo's Bugzilla only." - ewarn - fi - - php5_2-sapi_pkg_setup -} - -php_determine_sapis() { - # holds the list of sapis that we want to build - PHPSAPIS= - - if use cli || phpconfutils_usecheck cli ; then - PHPSAPIS="${PHPSAPIS} cli" - fi - - if use cgi ; then - PHPSAPIS="${PHPSAPIS} cgi" - fi - - # note - apache SAPI comes after the simpler cli/cgi sapis - if use apache2 ; then - PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}" - fi -} - -src_unpack() { - if [[ "${PHP_PACKAGE}" == 1 ]] ; then - unpack ${A} - fi - - cd "${S}" - - # Concurrent PHP Apache2 modules support - if use apache2 ; then - if use concurrentmodphp ; then - if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then - epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" - else - ewarn "There is no concurrent mod_php patch available for this PHP release yet!" - fi - fi - fi - - # fastbuild support - if use fastbuild ; then - if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then - epatch "${WORKDIR}/${FASTBUILD_PATCH}" - else - ewarn "There is no fastbuild patch available for this PHP release yet!" - fi - fi - - # kolab support - if [[ -n "${KOLAB_PATCH}" ]] ; then - use kolab && epatch "${WORKDIR}/${KOLAB_PATCH}" - fi - - # Now let the eclass do the rest and regenerate the configure - php5_2-sapi_src_unpack - - # Fix Makefile.global:test to consider the CGI SAPI if present - if use cgi ; then - sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global - sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global - fi - - # try to fix some test cases which fail because of sandbox otherwise - sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \ - ext/standard/tests/file/006_error.phpt \ - ext/standard/tests/file/touch.phpt - - # Workaround for autoconf-2.62 behaviour change, bug 217392 - sed -re 's:(#ifdef HAVE_CONFIG_H.*):#define _GNU_SOURCE\n\1:' -i ext/posix/posix.c - - # REMOVING BROKEN TESTS: - # removing this test as it has been broken for ages and is not easily - # fixable (depends on a lot of factors) - rm ext/standard/tests/general_functions/phpinfo.phpt - - # never worked properly, no easy fix - rm ext/iconv/tests/bug16069.phpt ext/iconv/tests/iconv_stream_filter.phpt - - # needs write access to /tmp and others - rm ext/session/tests/session_save_path_variation5.phpt - - # sandbox-related (sandbox checks for permissions before even looking - # at the fs, but the tests expect "No such file or directory" - sed -e 's:/blah:./bla:' -i \ - ext/session/tests/session_save_path_variation{2,3}.phpt - - # 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} -} - -src_compile() { - if use fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then - src_compile_fastbuild - else - src_compile_normal - fi -} - -src_compile_fastbuild() { - php_determine_sapis - - build_cli=0 - build_cgi=0 - build_apache2=0 - my_conf="" - - for x in ${PHPSAPIS} ; do - case ${x} in - cli) - build_cli=1 - ;; - cgi) - build_cgi=1 - ;; - apache2) - build_apache2=1 - ;; - esac - done - - if [[ ${build_cli} = 1 ]] ; then - my_conf="${my_conf} --enable-cli" - else - my_conf="${my_conf} --disable-cli" - fi - - if [[ ${build_cgi} = 1 ]] ; then - my_conf="${my_conf} --enable-cgi --enable-fastcgi" - phpconfutils_extension_enable "discard-path" "discard-path" 0 - phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0 - else - my_conf="${my_conf} --disable-cgi" - fi - - if [[ ${build_apache2} = 1 ]] ; then - my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2" - - # Threaded Apache2 support - if use threads ; then - my_conf="${my_conf} --enable-maintainer-zts" - ewarn "Enabling ZTS for Apache2 MPM" - fi - - # Concurrent PHP Apache2 modules support - if use concurrentmodphp ; then - append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs" - fi - fi - - # Now we know what we are building, build it - php5_2-sapi_src_compile - - # To keep the separate php.ini files for each SAPI, we change the - # build-defs.h and recompile - - if [[ ${build_cli} = 1 ]] ; then - einfo - einfo "Building CLI SAPI" - einfo - - sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php5"|g;' -i main/build-defs.h - sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php5/ext-active"|g;' -i main/build-defs.h - for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do - [[ -f ${x} ]] && rm -f ${x} - done - make sapi/cli/php || die "Unable to make CLI SAPI" - cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI" - fi - - if [[ ${build_cgi} = 1 ]] ; then - einfo - einfo "Building CGI SAPI" - einfo - - sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php5"|g;' -i main/build-defs.h - sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php5/ext-active"|g;' -i main/build-defs.h - for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do - [[ -f ${x} ]] && rm -f ${x} - done - make sapi/cgi/php-cgi || die "Unable to make CGI SAPI" - cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI" - fi - - if [[ ${build_apache2} = 1 ]] ; then - einfo - einfo "Building apache${APACHE_VERSION} SAPI" - einfo - - sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php5\"|g;" -i main/build-defs.h - sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${APACHE_VERSION}-php5/ext-active\"|g;" -i main/build-defs.h - for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do - [[ -f ${x} ]] && rm -f ${x} - done - make || die "Unable to make apache${APACHE_VERSION} SAPI" - fi -} - -src_compile_normal() { - php_determine_sapis - - CLEAN_REQUIRED=0 - my_conf="" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - if use apache2 ; then - # Concurrent PHP Apache2 modules support - if use concurrentmodphp ; then - append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs" - fi - fi - - for x in ${PHPSAPIS} ; do - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - if use apache2 ; then - # Threaded Apache2 support - if use threads ; then - my_conf="${my_conf} --enable-maintainer-zts" - ewarn "Enabling ZTS for Apache2 MPM" - fi - fi - - if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then - make clean - fi - - PHPSAPI="${x}" - - case ${x} in - cli) - my_conf="${my_conf} --enable-cli --disable-cgi" - php5_2-sapi_src_compile - cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI" - ;; - cgi) - my_conf="${my_conf} --disable-cli --enable-cgi --enable-fastcgi" - phpconfutils_extension_enable "discard-path" "discard-path" 0 - phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0 - php5_2-sapi_src_compile - cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI" - ;; - apache2) - my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2" - php5_2-sapi_src_compile - ;; - esac - - CLEAN_REQUIRED=1 - my_conf="" - done -} - -src_install() { - php_determine_sapis - - destdir=/usr/$(get_libdir)/php5 - - # Let the eclass do the common work - php5_2-sapi_src_install - - einfo - einfo "Installing SAPI(s) ${PHPSAPIS}" - einfo - - for x in ${PHPSAPIS} ; do - - PHPSAPI="${x}" - - case ${x} in - cli) - einfo "Installing CLI SAPI" - into ${destdir} - newbin php-cli php || die "Unable to install ${x} sapi" - php5_2-sapi_install_ini - ;; - cgi) - einfo "Installing CGI SAPI" - into ${destdir} - dobin php-cgi || die "Unable to install ${x} sapi" - php5_2-sapi_install_ini - ;; - apache2) - einfo "Installing Apache${APACHE_VERSION} SAPI" - make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI" - if use concurrentmodphp ; then - einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)" - insinto ${APACHE_MODULES_CONFDIR} - newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2" "70_mod_php5_concurr.conf" - - # Put the ld version script in the right place so it's always accessible - insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/" - doins "${FILESDIR}/php5-ldvs" - - # Redefine the extension dir to have the modphp suffix - PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned" - else - einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)" - insinto ${APACHE_MODULES_CONFDIR} - newins "${FILESDIR}/70_mod_php5.conf-apache2" "70_mod_php5.conf" - fi - php5_2-sapi_install_ini - ;; - esac - done - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php5" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5" -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - if use concurrentmodphp ; then - APACHE2_MOD_CONF="70_mod_php5_concurr" - else - APACHE2_MOD_CONF="70_mod_php5" - fi - apache-module_pkg_postinst - fi - - # Update Apache2 to use mod_php - if use apache2 ; then - "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1 - exitStatus=$? - if [[ ${exitStatus} == 2 ]] ; then - php-select apache2 php5 - elif [[ ${exitStatus} == 4 ]] ; then - ewarn - ewarn "Apache2 is configured to load a different version of PHP." - ewarn "To make Apache2 use PHP v5, use php-select:" - ewarn - ewarn " php-select apache2 php5" - ewarn - fi - fi - - # Create the symlinks for php-cli - if use cli || phpconfutils_usecheck cli ; then - "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1 - exitStatus=$? - if [[ ${exitStatus} == 5 ]] ; then - php-select php php5 - elif [[ ${exitStatus} == 4 ]] ; then - ewarn - ewarn "/usr/bin/php links to a different version of PHP." - ewarn "To make /usr/bin/php point to PHP v5, use php-select:" - ewarn - ewarn " php-select php php5" - ewarn - fi - fi - - # Create the symlinks for php-cgi - if use cgi ; then - "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1 - exitStatus=$? - if [[ ${exitStatus} == 5 ]] ; then - php-select php-cgi php5 - elif [[ ${exitStatus} == 4 ]] ; then - ewarn - ewarn "/usr/bin/php-cgi links to a different version of PHP." - ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:" - ewarn - ewarn " php-select php-cgi php5" - ewarn - fi - fi - - # Create the symlinks for php-devel - "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1 - exitStatus=$? - if [[ $exitStatus == 5 ]] ; then - php-select php-devel php5 - elif [[ $exitStatus == 4 ]] ; then - ewarn - ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a" - ewarn "different version of PHP. To make them point to PHP v5, use" - ewarn "php-select:" - ewarn - ewarn " php-select php-devel php5" - ewarn - fi - - php5_2-sapi_pkg_postinst -} - -src_test() { - vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" - if [[ ! -x "${S}"/php-cli ]]; then - ewarn "Running the php test suite requires USE=cli" - return - fi - - export TEST_PHP_EXECUTABLE="${S}"/php-cli - if [[ -x "${S}"/php-cgi ]]; then - export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi - fi - REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n - - if [[ $? != 0 ]] ; then - eerror "Not all tests were successful!" - fi -} diff --git a/dev-lang/php/php-5.2.6-r5.ebuild b/dev-lang/php/php-5.2.6-r6.ebuild index d74ca922ec9a..b3b460950f53 100644 --- a/dev-lang/php/php-5.2.6-r5.ebuild +++ b/dev-lang/php/php-5.2.6-r6.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-r5.ebuild,v 1.5 2008/07/24 20:44:23 hoffie Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6-r6.ebuild,v 1.1 2008/08/07 10:25:21 hoffie Exp $ CGI_SAPI_USE="discard-path force-cgi-redirect" APACHE2_SAPI_USE="concurrentmodphp threads" @@ -20,7 +20,7 @@ MY_PHP_P="php-${MY_PHP_PV}" PHP_PACKAGE="1" # php patch settings, general -PHP_PATCHSET_REV="5" +PHP_PATCHSET_REV="6" SUHOSIN_PATCH="suhosin-patch-5.2.6-0.9.6.2-r1.patch.gz" MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch" # php patch settings, ebuild specific diff --git a/dev-lang/php/php-5.2.6_rc4.ebuild b/dev-lang/php/php-5.2.6_rc4.ebuild deleted file mode 100644 index 92fb6f8c02d1..000000000000 --- a/dev-lang/php/php-5.2.6_rc4.ebuild +++ /dev/null @@ -1,484 +0,0 @@ -# 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_rc4.ebuild,v 1.7 2008/04/16 18:55:16 dertobi123 Exp $ - -CGI_SAPI_USE="discard-path force-cgi-redirect" -APACHE2_SAPI_USE="concurrentmodphp threads" -IUSE="cli cgi ${CGI_SAPI_USE} ${APACHE2_SAPI_USE} fastbuild" - -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" - -# NOTE: Portage doesn't support setting PROVIDE based on the USE flags -# that have been enabled, so we have to PROVIDE everything for now -# and hope for the best -PROVIDE="virtual/php virtual/httpd-php" - -# php package settings -SLOT="5" -MY_PHP_PV="${PV}" -MY_PHP_P="php-${MY_PHP_PV}" -PHP_PACKAGE="1" - -# php patch settings, general -PHP_PATCHSET_REV="0" -SUHOSIN_PATCH="suhosin-patch-5.2.5_p20080206-0.9.6.2-gentoo.patch.gz" -MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch" -# php patch settings, ebuild specific -FASTBUILD_PATCH="${MY_PHP_PV}/opt/fastbuild.patch" -CONCURRENTMODPHP_PATCH="${MY_PHP_PV}/opt/concurrent_apache_modules.patch" - -inherit versionator php5_2-sapi apache-module - -SRC_URI="http://downloads.php.net/ilia/${MY_PHP_P/_rc/RC}.tar.bz2 - http://gentoo.longitekk.com/php-patchset-${PV}-r${PHP_PATCHSET_REV}.tar.bz2" -S="${WORKDIR}/${MY_PHP_P/_rc/RC}" - -# Suhosin patch support -[[ -n "${SUHOSIN_PATCH}" ]] && SRC_URI="${SRC_URI} suhosin? ( http://gentoo.longitekk.com/${SUHOSIN_PATCH} )" - -DESCRIPTION="The PHP language runtime engine: CLI, CGI and Apache2 SAPIs." - -DEPEND="app-admin/php-toolkit" -RDEPEND="${DEPEND}" - -want_apache - -pkg_setup() { - PHPCONFUTILS_AUTO_USE="" - - # Make sure the user has specified at least one SAPI - einfo "Determining SAPI(s) to build" - phpconfutils_require_any " Enabled SAPI:" " Disabled SAPI:" cli cgi apache2 - - # Threaded Apache2 support - if use apache2 ; then - has_apache_threads - fi - - # Concurrent PHP Apache2 modules support - if use apache2 ; then - if use concurrentmodphp ; then - ewarn - ewarn "'concurrentmodphp' makes it possible to load multiple, differently" - ewarn "versioned mod_php's into the same Apache instance. This is done with" - ewarn "a few linker tricks and workarounds, and is not guaranteed to always" - ewarn "work correctly, so use it at your own risk. Especially, do not use" - ewarn "this in conjunction with PHP modules (PECL, ...) other than the ones" - ewarn "you may find in the Portage tree or the PHP Overlay!" - ewarn "This is an experimental feature, so please rebuild PHP" - ewarn "without the 'concurrentmodphp' USE flag if you experience" - ewarn "any problems, and then reproduce any bugs before filing" - ewarn "them in Gentoo's Bugzilla or bugs.php.net." - ewarn "If you have conclusive evidence that a bug directly" - ewarn "derives from 'concurrentmodphp', please file a bug in" - ewarn "Gentoo's Bugzilla only." - ewarn - ebeep 5 - fi - fi - - # fastbuild support - if use fastbuild ; then - ewarn - ewarn "'fastbuild' attempts to build all SAPIs in a single pass." - ewarn "This is an experimental feature, so please rebuild PHP" - ewarn "without the 'fastbuild' USE flag if you experience" - ewarn "any problems, and then reproduce any bugs before filing" - ewarn "them in Gentoo's Bugzilla or bugs.php.net." - ewarn "If you have conclusive evidence that a bug directly" - ewarn "derives from 'fastbuild', please file a bug in" - ewarn "Gentoo's Bugzilla only." - ewarn - fi - - php5_2-sapi_pkg_setup -} - -php_determine_sapis() { - # holds the list of sapis that we want to build - PHPSAPIS= - - if use cli || phpconfutils_usecheck cli ; then - PHPSAPIS="${PHPSAPIS} cli" - fi - - if use cgi ; then - PHPSAPIS="${PHPSAPIS} cgi" - fi - - # note - apache SAPI comes after the simpler cli/cgi sapis - if use apache2 ; then - PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}" - fi -} - -src_unpack() { - if [[ "${PHP_PACKAGE}" == 1 ]] ; then - unpack ${A} - fi - - cd "${S}" - - # Concurrent PHP Apache2 modules support - if use apache2 ; then - if use concurrentmodphp ; then - if [[ -n "${CONCURRENTMODPHP_PATCH}" ]] && [[ -f "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" ]] ; then - epatch "${WORKDIR}/${CONCURRENTMODPHP_PATCH}" - else - ewarn "There is no concurrent mod_php patch available for this PHP release yet!" - fi - fi - fi - - # fastbuild support - if use fastbuild ; then - if [[ -n "${FASTBUILD_PATCH}" ]] && [[ -f "${WORKDIR}/${FASTBUILD_PATCH}" ]] ; then - epatch "${WORKDIR}/${FASTBUILD_PATCH}" - else - ewarn "There is no fastbuild patch available for this PHP release yet!" - fi - fi - - PHP_EXTRA_BRANDING="RC${PV#*_rc}" - # Now let the eclass do the rest and regenerate the configure - php5_2-sapi_src_unpack - - # Fix Makefile.global:test to consider the CGI SAPI if present - if use cgi ; then - sed -e "s|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\"|test \! -z \"\$(top_builddir)/php-cli\" \&\& test -x \"\$(top_builddir)/php-cli\" \&\& test \! -z \"\$(top_builddir)/php-cgi\" \&\& test -x \"\$(top_builddir)/php-cgi\"|g" -i Makefile.global - sed -e "s|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\"|TEST_PHP_EXECUTABLE=\"\$(top_builddir)/php-cli\" TEST_PHP_CGI_EXECUTABLE=\"\$(top_builddir)/php-cgi\"|g" -i Makefile.global - fi - - # try to fix some test cases which fail because of sandbox otherwise - sed -e 's:/no/such/:.\0:' -i ext/standard/tests/file/005_error.phpt \ - ext/standard/tests/file/006_error.phpt \ - ext/standard/tests/file/touch.phpt - - # Workaround for autoconf-2.62 behaviour change, bug 217392 - sed -re 's:(#ifdef HAVE_CONFIG_H.*):#define _GNU_SOURCE\n\1:' -i ext/posix/posix.c - - # REMOVING BROKEN TESTS: - # removing this test as it has been broken for ages and is not easily - # fixable (depends on a lot of factors) - rm ext/standard/tests/general_functions/phpinfo.phpt - - # never worked properly, no easy fix - rm ext/iconv/tests/bug16069.phpt ext/iconv/tests/iconv_stream_filter.phpt -} - -src_compile() { - if use fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then - src_compile_fastbuild - else - src_compile_normal - fi -} - -src_compile_fastbuild() { - php_determine_sapis - - build_cli=0 - build_cgi=0 - build_apache2=0 - my_conf="" - - for x in ${PHPSAPIS} ; do - case ${x} in - cli) - build_cli=1 - ;; - cgi) - build_cgi=1 - ;; - apache2) - build_apache2=1 - ;; - esac - done - - if [[ ${build_cli} = 1 ]] ; then - my_conf="${my_conf} --enable-cli" - else - my_conf="${my_conf} --disable-cli" - fi - - if [[ ${build_cgi} = 1 ]] ; then - my_conf="${my_conf} --enable-cgi --enable-fastcgi" - phpconfutils_extension_enable "discard-path" "discard-path" 0 - phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0 - else - my_conf="${my_conf} --disable-cgi" - fi - - if [[ ${build_apache2} = 1 ]] ; then - my_conf="${my_conf} --with-apxs2=/usr/sbin/apxs2" - - # Threaded Apache2 support - if use threads ; then - my_conf="${my_conf} --enable-maintainer-zts" - ewarn "Enabling ZTS for Apache2 MPM" - fi - - # Concurrent PHP Apache2 modules support - if use concurrentmodphp ; then - append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs" - fi - fi - - # Now we know what we are building, build it - php5_2-sapi_src_compile - - # To keep the separate php.ini files for each SAPI, we change the - # build-defs.h and recompile - - if [[ ${build_cli} = 1 ]] ; then - einfo - einfo "Building CLI SAPI" - einfo - - sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cli-php5"|g;' -i main/build-defs.h - sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cli-php5/ext-active"|g;' -i main/build-defs.h - for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do - [[ -f ${x} ]] && rm -f ${x} - done - make sapi/cli/php || die "Unable to make CLI SAPI" - cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI" - fi - - if [[ ${build_cgi} = 1 ]] ; then - einfo - einfo "Building CGI SAPI" - einfo - - sed -e 's|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH "/etc/php/cgi-php5"|g;' -i main/build-defs.h - sed -e 's|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR "/etc/php/cgi-php5/ext-active"|g;' -i main/build-defs.h - for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do - [[ -f ${x} ]] && rm -f ${x} - done - make sapi/cgi/php-cgi || die "Unable to make CGI SAPI" - cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI" - fi - - if [[ ${build_apache2} = 1 ]] ; then - einfo - einfo "Building apache${APACHE_VERSION} SAPI" - einfo - - sed -e "s|^#define PHP_CONFIG_FILE_PATH.*|#define PHP_CONFIG_FILE_PATH \"/etc/php/apache${APACHE_VERSION}-php5\"|g;" -i main/build-defs.h - sed -e "s|^#define PHP_CONFIG_FILE_SCAN_DIR.*|#define PHP_CONFIG_FILE_SCAN_DIR \"/etc/php/apache${APACHE_VERSION}-php5/ext-active\"|g;" -i main/build-defs.h - for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do - [[ -f ${x} ]] && rm -f ${x} - done - make || die "Unable to make apache${APACHE_VERSION} SAPI" - fi -} - -src_compile_normal() { - php_determine_sapis - - CLEAN_REQUIRED=0 - my_conf="" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - if use apache2 ; then - # Concurrent PHP Apache2 modules support - if use concurrentmodphp ; then - append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs" - fi - fi - - for x in ${PHPSAPIS} ; do - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - if use apache2 ; then - # Threaded Apache2 support - if use threads ; then - my_conf="${my_conf} --enable-maintainer-zts" - ewarn "Enabling ZTS for Apache2 MPM" - fi - fi - - if [[ "${CLEAN_REQUIRED}" = 1 ]] ; then - make clean - fi - - PHPSAPI="${x}" - - case ${x} in - cli) - my_conf="${my_conf} --enable-cli --disable-cgi" - php5_2-sapi_src_compile - cp sapi/cli/php php-cli || die "Unable to copy CLI SAPI" - ;; - cgi) - my_conf="${my_conf} --disable-cli --enable-cgi --enable-fastcgi" - phpconfutils_extension_enable "discard-path" "discard-path" 0 - phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0 - php5_2-sapi_src_compile - cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI" - ;; - apache2) - my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2" - php5_2-sapi_src_compile - ;; - esac - - CLEAN_REQUIRED=1 - my_conf="" - done -} - -src_install() { - php_determine_sapis - - destdir=/usr/$(get_libdir)/php5 - - # Let the eclass do the common work - php5_2-sapi_src_install - - einfo - einfo "Installing SAPI(s) ${PHPSAPIS}" - einfo - - for x in ${PHPSAPIS} ; do - - PHPSAPI="${x}" - - case ${x} in - cli) - einfo "Installing CLI SAPI" - into ${destdir} - newbin php-cli php || die "Unable to install ${x} sapi" - php5_2-sapi_install_ini - ;; - cgi) - einfo "Installing CGI SAPI" - into ${destdir} - dobin php-cgi || die "Unable to install ${x} sapi" - php5_2-sapi_install_ini - ;; - apache2) - einfo "Installing Apache${APACHE_VERSION} SAPI" - make INSTALL_ROOT="${D}" install-sapi || die "Unable to install ${x} SAPI" - if use concurrentmodphp ; then - einfo "Installing Apache${APACHE_VERSION} config file for PHP5-concurrent (70_mod_php5_concurr.conf)" - insinto ${APACHE_MODULES_CONFDIR} - newins "${FILESDIR}/70_mod_php5_concurr.conf-apache2" "70_mod_php5_concurr.conf" - - # Put the ld version script in the right place so it's always accessible - insinto "/var/lib/php-pkg/${CATEGORY}/${PN}-${PVR}/" - doins "${FILESDIR}/php5-ldvs" - - # Redefine the extension dir to have the modphp suffix - PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`-versioned" - else - einfo "Installing Apache${APACHE_VERSION} config file for PHP5 (70_mod_php5.conf)" - insinto ${APACHE_MODULES_CONFDIR} - newins "${FILESDIR}/70_mod_php5.conf-apache2" "70_mod_php5.conf" - fi - php5_2-sapi_install_ini - ;; - esac - done - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php5" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${D}/etc/env.d/20php5" -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - if use concurrentmodphp ; then - APACHE2_MOD_CONF="70_mod_php5_concurr" - else - APACHE2_MOD_CONF="70_mod_php5" - fi - apache-module_pkg_postinst - fi - - # Update Apache2 to use mod_php - if use apache2 ; then - "${ROOT}/usr/sbin/php-select" -t apache2 php5 > /dev/null 2>&1 - exitStatus=$? - if [[ ${exitStatus} == 2 ]] ; then - php-select apache2 php5 - elif [[ ${exitStatus} == 4 ]] ; then - ewarn - ewarn "Apache2 is configured to load a different version of PHP." - ewarn "To make Apache2 use PHP v5, use php-select:" - ewarn - ewarn " php-select apache2 php5" - ewarn - fi - fi - - # Create the symlinks for php-cli - if use cli || phpconfutils_usecheck cli ; then - "${ROOT}/usr/sbin/php-select" -t php php5 > /dev/null 2>&1 - exitStatus=$? - if [[ ${exitStatus} == 5 ]] ; then - php-select php php5 - elif [[ ${exitStatus} == 4 ]] ; then - ewarn - ewarn "/usr/bin/php links to a different version of PHP." - ewarn "To make /usr/bin/php point to PHP v5, use php-select:" - ewarn - ewarn " php-select php php5" - ewarn - fi - fi - - # Create the symlinks for php-cgi - if use cgi ; then - "${ROOT}/usr/sbin/php-select" -t php-cgi php5 > /dev/null 2>&1 - exitStatus=$? - if [[ ${exitStatus} == 5 ]] ; then - php-select php-cgi php5 - elif [[ ${exitStatus} == 4 ]] ; then - ewarn - ewarn "/usr/bin/php-cgi links to a different version of PHP." - ewarn "To make /usr/bin/php-cgi point to PHP v5, use php-select:" - ewarn - ewarn " php-select php-cgi php5" - ewarn - fi - fi - - # Create the symlinks for php-devel - "${ROOT}/usr/sbin/php-select" -t php-devel php5 > /dev/null 2>&1 - exitStatus=$? - if [[ $exitStatus == 5 ]] ; then - php-select php-devel php5 - elif [[ $exitStatus == 4 ]] ; then - ewarn - ewarn "/usr/bin/php-config and/or /usr/bin/phpize are linked to a" - ewarn "different version of PHP. To make them point to PHP v5, use" - ewarn "php-select:" - ewarn - ewarn " php-select php-devel php5" - ewarn - fi - - php5_2-sapi_pkg_postinst -} - -src_test() { - vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" - if [[ ! -x "${S}"/php-cli ]]; then - ewarn "Running the php test suite requires USE=cli" - return - fi - - export TEST_PHP_EXECUTABLE="${S}"/php-cli - if [[ -x "${S}"/php-cgi ]]; then - export TEST_PHP_CGI_EXECUTABLE="${S}"/php-cgi - fi - REPORT_EXIT_STATUS=1 "${S}"/php-cli -n "${S}"/run-tests.php -n - - if [[ $? != 0 ]] ; then - eerror "Not all tests were successful!" - fi -} |