From 7e18465031d9810503278529f5a9a98aae99d332 Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Sun, 11 Jan 2009 21:16:32 +0000 Subject: revision bump to fix bug 162478 (dropping usage of AddType apache config directive) and bug 249703 (libxml2-2.7 breakage) and an upstream fix for bug 217392; removing old and unused files Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64 --- dev-lang/php/ChangeLog | 16 +- dev-lang/php/Manifest | 21 +- dev-lang/php/files/70_mod_php.conf-apache2 | 17 - dev-lang/php/files/70_mod_php5.conf-apache2-r1 | 17 + .../php/files/70_mod_php5_concurr.conf-apache2-r1 | 17 + dev-lang/php/files/70_mod_php_concurr.conf-apache2 | 14 - dev-lang/php/php-5.2.8-r2.ebuild | 546 +++++++++++++++++++++ dev-lang/php/php-5.2.8.ebuild | 544 -------------------- 8 files changed, 610 insertions(+), 582 deletions(-) delete mode 100644 dev-lang/php/files/70_mod_php.conf-apache2 create mode 100644 dev-lang/php/files/70_mod_php5.conf-apache2-r1 create mode 100644 dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 delete mode 100644 dev-lang/php/files/70_mod_php_concurr.conf-apache2 create mode 100644 dev-lang/php/php-5.2.8-r2.ebuild delete mode 100644 dev-lang/php/php-5.2.8.ebuild (limited to 'dev-lang/php') diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 0756da54b50d..ae073b215aa7 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,18 @@ # 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.308 2008/12/24 18:12:29 armin76 Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.309 2009/01/11 21:16:32 hoffie Exp $ + +*php-5.2.8-r2 (11 Jan 2009) + + 11 Jan 2009; Christian Hoffmann + -files/70_mod_php.conf-apache2, + +files/70_mod_php5_concurr.conf-apache2-r1, + +files/70_mod_php5.conf-apache2-r1, + -files/70_mod_php_concurr.conf-apache2, -php-5.2.8.ebuild, + +php-5.2.8-r2.ebuild: + revision bump to fix bug 162478 (dropping usage of AddType apache config + directive) and bug 249703 (libxml2-2.7 breakage) and an upstream fix for + bug 217392; removing old and unused files 24 Dec 2008; Raúl Porcel php-5.2.8-r1.ebuild: alpha/ia64 stable wrt #249875 diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 7d3aa70c6e2d..0ae293a78840 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,20 +1,31 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 20php4-envd 145 RMD160 fb57b2d202ab1031303e7525a8ef5b353dc04ef8 SHA1 34ef066d2de22f147fc86bbe884692af7631f726 SHA256 17cd1a952434988b4c2125e4d1eef1df7114809f404605d35f255674419dd5d5 AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 -AUX 70_mod_php.conf-apache2 454 RMD160 7e99b278a010c958d698454a2aa43e1a351c69e8 SHA1 895e986f880a1dee9b0a45fdcd99ccce44999a6b SHA256 dd7116f3439e06ef2d6126403360c2722355f8481552fdce0cb601af331f81ee AUX 70_mod_php5.conf-apache2 490 RMD160 745bdb5db622577f473703d5ee8dc7f3c66f8f0c SHA1 7daf9c9ec2e6d108f850981853f9f4f599be0b71 SHA256 5667d06cb7a18c30d11decd28d55b87e36287c76c4d3a450b1cb37271e7fdcd1 +AUX 70_mod_php5.conf-apache2-r1 374 RMD160 ca06cdc9d1a3dc4129a60c938ee3a1b542497fbb SHA1 4733066b6324c5870e716485484c44c7c26a9ff1 SHA256 815c1ca23c9afe8479568ceaac4057eb91ea5444fbd863866b29adb4eea2c82b AUX 70_mod_php5_concurr.conf-apache2 414 RMD160 1783b6c830119f021c3fb6cb35a631f43c4fa70c SHA1 09f9076f35bc84994fc8c687b4befc0400475f1a SHA256 ccc3bc073eafc83f98049679a411801e80f84620bd51c37c36de2b9ee9492aa2 -AUX 70_mod_php_concurr.conf-apache2 329 RMD160 364e071b494b84b78881c566b7c1b46261f62c19 SHA1 9d775784993b46a8be1a7e31f02a3482542385df SHA256 092178aa0cf3272b6411abc85b3820665322598932d249c284a8fa4108d5835a +AUX 70_mod_php5_concurr.conf-apache2-r1 376 RMD160 4f7de5c0784b6191450b5c1a7de7ad941620e199 SHA1 c42a23bd7a1d3e8c7e0ac906f50f180116349f76 SHA256 c05f499d9c8927391c586b94716a9f59d63767165552ea527ec7ff63c36eaa40 AUX php4-ldvs 22 RMD160 e70c565b3930d9d9e3253062b7c633346cb99a63 SHA1 8c66355dfb80e2ecc6ee6faae30bf7dbb1727651 SHA256 4aee18478b09cda7e925ccde157db6099ea0122b5c4efb0868e3761b65688dde AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 DIST php-5.2.6.tar.bz2 9571312 RMD160 27f730d4b1ceb1c42ff03618dbfa0dc87a00990b SHA1 2a2b1afa657a7739a23784c869d57c3e0a7ad6b4 SHA256 1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81 DIST php-5.2.8.tar.bz2 9827180 RMD160 d38fe5d918c335089a027600a93d950f417a7e98 SHA1 d285636144e0a4aa61195793634807e763c63dc3 SHA256 a70600e13410213a637f1c9825e9c0d45c64de8cefb1929f8f5aa761b20b2b67 DIST php-patchset-5.2.6-r8.tar.bz2 28070 RMD160 74a33ffb6f3437883510161fc7bd57fbfbff4310 SHA1 f57441d6b2e25256811f15a31d088b0c3e0505fc SHA256 58f6d4708c13eb2ff5800a96d7f8b9144bb824093cc444cee0399597e1138f7f -DIST php-patchset-5.2.8-r0.tar.bz2 10184 RMD160 1a8ecff34d26a31f6809bb000df1c5fc0324fcd0 SHA1 25ecf9612a09b5558bd31ca3374b009932d9088b SHA256 2e7d0d2450d7ec33d43c16e5cc10d4b1438bb46e4abc53d93ab4cdcaa143f023 DIST php-patchset-5.2.8-r1.tar.bz2 13770 RMD160 edaf214c3211a17aed0a2d0fe6bd395af7c74f26 SHA1 0603fe626cdf570251d15a1daace7ea34d0e3eb9 SHA256 9516f759e10e9553923c8aaa30252bda45182679e5bf2be86759b3359b68375d +DIST php-patchset-5.2.8-r2.tar.bz2 15437 RMD160 d01fadd80cd1db8216eb157ee691a3d30ab8edb7 SHA1 12dff06a95722306fae334e84ab9251265c35540 SHA256 f372a3e4bb19b568030eab5d1c4bffa21f5b217564e3c658952382d60c657f50 DIST suhosin-patch-5.2.6-0.9.6.2-r1.patch.gz 22987 RMD160 9c7bc7441e16686382a2b91f68c6e56a84683304 SHA1 0869e555e722615881d6bf1f642d656c53b41bd0 SHA256 40fdd5b92c4e1595250ffc58f317887acd1ef6681e6b6fdca098110c4bfa5bbc DIST suhosin-patch-5.2.7-0.9.6.3.patch.gz 23125 RMD160 9c8a0972e75e1ad887b940f57aec4d877e9364bd SHA1 b1f12dd856778e734837819114d278adaa3cfe05 SHA256 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46 +DIST suhosin-patch-5.2.8-0.9.6.3.patch.gz 23125 RMD160 9c8a0972e75e1ad887b940f57aec4d877e9364bd SHA1 b1f12dd856778e734837819114d278adaa3cfe05 SHA256 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46 EBUILD php-5.2.6-r7.ebuild 15504 RMD160 8741d834f622dc672eb996a248f6bd32a799f011 SHA1 8ac6d6d8934191a5ed6367e25f5bec9e65a25606 SHA256 ccb8574fc22ce8fa7a8c09cb82f7f6b551434c66d1d57d8677a7d9232f7a338f EBUILD php-5.2.8-r1.ebuild 16800 RMD160 369aa39aec69c2b27656fd32b632666ff6c48eab SHA1 5fcd7e64e0133a0f799813ee1ec71d5350ed178f SHA256 e78c50ccdf06468f8a42e13d885338c7027bd90b423e97ef36bbef53234bc4fc -EBUILD php-5.2.8.ebuild 16674 RMD160 3e419250242c7e8af7f1248a22becb18269dd615 SHA1 3d389081b9999aad616f556e98a4457b23ee83c9 SHA256 acb5c05a67db1a512a8e7666f25da6ce20ee74412458f05e8b68a1da14d5b0c2 -MISC ChangeLog 54819 RMD160 78183d59b052198f1038587e54132d114c7abba2 SHA1 a42829c57fb3cb9eca29d4ec43ca86d6007d4067 SHA256 b69ff01e6a5d086d5f6d825c0c288bcc6673c908deac7b0afa624337247b9f9c +EBUILD php-5.2.8-r2.ebuild 16717 RMD160 6bcc28023974ca0425d708948cc674af10975044 SHA1 f7d1c1f1b58c76afc3c4242dacf767493886671f SHA256 d90c9476a038a45bb88aa3fd58874bc3806885b47ce9a58b767e3c664306db13 +MISC ChangeLog 55299 RMD160 a19e8924b904a4db9c8e8189871d654a6cc465f2 SHA1 e5f6511873808f0e2cf091cecd6d045ea695360f SHA256 902dcbea252fe635fbdfeb1322a011e51df6763c0b15a4088cb4f54d068a631f MISC metadata.xml 1474 RMD160 968749dc68a355631d935d56178d35ec4993031e SHA1 927a686ce5ac5be695557cb48e5a506f77e4bda4 SHA256 7829b91b5e61e6c2a03540057b1a4e24b8568f20c9725617197b9a06a708ea2d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAklqYboACgkQSamB34AN3N4h6QCfXl3nqvRv7FnBY58/1Ai0s8vL +FnsAoK1D9NNOy+Caly2JlY5FUj4medPz +=ZE/C +-----END PGP SIGNATURE----- diff --git a/dev-lang/php/files/70_mod_php.conf-apache2 b/dev-lang/php/files/70_mod_php.conf-apache2 deleted file mode 100644 index 90cabfb02dcd..000000000000 --- a/dev-lang/php/files/70_mod_php.conf-apache2 +++ /dev/null @@ -1,17 +0,0 @@ - - # Load the module first - - LoadModule php4_module modules/libphp4.so - - - # Set it to handle the files - - AddType application/x-httpd-php .php - AddType application/x-httpd-php .phtml - AddType application/x-httpd-php .php3 - AddType application/x-httpd-php .php4 - AddType application/x-httpd-php-source .phps - - - DirectoryIndex index.php index.phtml - diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5.conf-apache2-r1 new file mode 100644 index 000000000000..50911ad39d9c --- /dev/null +++ b/dev-lang/php/files/70_mod_php5.conf-apache2-r1 @@ -0,0 +1,17 @@ + + # Load the module first + + LoadModule php5_module modules/libphp5.so + + + # Set it to handle the files + + SetHandler application/x-httpd-php + + + + SetHandler application/x-httpd-php-source + + + DirectoryIndex index.php index.phtml + diff --git a/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 new file mode 100644 index 000000000000..cd1c3801edbc --- /dev/null +++ b/dev-lang/php/files/70_mod_php5_concurr.conf-apache2-r1 @@ -0,0 +1,17 @@ + + # Load the module first + + LoadModule php5_module modules/libphp5.so + + + # Set it to handle the files + + SetHandler application/x-httpd-php5 + + + + SetHandler application/x-httpd-php5-source + + + DirectoryIndex index.php index.phtml + diff --git a/dev-lang/php/files/70_mod_php_concurr.conf-apache2 b/dev-lang/php/files/70_mod_php_concurr.conf-apache2 deleted file mode 100644 index fa73e7685ec1..000000000000 --- a/dev-lang/php/files/70_mod_php_concurr.conf-apache2 +++ /dev/null @@ -1,14 +0,0 @@ - - # Load the module first - - LoadModule php4_module modules/libphp4.so - - - # Set it to handle the files - - AddType application/x-httpd-php4 .php3 - AddType application/x-httpd-php4 .php4 - - - DirectoryIndex index.php index.phtml - diff --git a/dev-lang/php/php-5.2.8-r2.ebuild b/dev-lang/php/php-5.2.8-r2.ebuild new file mode 100644 index 000000000000..7abc29b0c170 --- /dev/null +++ b/dev-lang/php/php-5.2.8-r2.ebuild @@ -0,0 +1,546 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.8-r2.ebuild,v 1.1 2009/01/11 21:16:32 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="${PR/r/}" +SUHOSIN_PATCH="suhosin-patch-5.2.8-0.9.6.3.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 + imap? ( >=virtual/imap-c-client-2006k ) + pcre? ( >=dev-libs/libpcre-7.8 ) + xml? ( >=dev-libs/libxml2-2.7.2-r2 ) + xmlrpc? ( >=dev-libs/libxml2-2.7.2-r2 virtual/libiconv )" + +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 + + if use pcre ; then + built_with_use dev-libs/libpcre unicode || \ + die "Please rebuild dev-libs/libpcre with USE=unicode" + 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 + + # pretend to not have flex, bug 221357 + sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4 + + # 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 + + # 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 + + # new tests since 5.2.7 which have never been working for me + rm ext/spl/tests/arrayObject___construct_basic4.phpt \ + ext/spl/tests/arrayObject___construct_basic5.phpt \ + ext/spl/tests/arrayObject_exchangeArray_basic3.phpt \ + ext/spl/tests/arrayObject_setFlags_basic1.phpt \ + tests/lang/bug45392.phpt + + # those might as well be related to suhosin + rm ext/session/tests/session_decode_variation3.phpt \ + ext/session/tests/session_encode_variation8.phpt + + # missing skipif + use reflection || \ + rm ext/standard/tests/directory/DirectoryClass_basic_001.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 + rm ext/standard/tests/file/rename_variation13.phpt + + # test passes, but run-tests.php claims failure + rm ext/standard/tests/file/tempnam_variation4.phpt + + # these tests behave differently with suhosin enabled, adapting them... + use suhosin && sed -e 's:File(\.\./):File(..):g' -i \ + tests/security/open_basedir*{.inc,.phpt} +} + +src_compile() { + # bug 217392 (autconf-2.62 behavior changes) + export CFLAGS="${CFLAGS} -D_GNU_SOURCE" + export CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE" + 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 + + if use pcre || phpconfutils_usecheck pcre ; then + myconf="${my_conf} --with-pcre-dir=/usr" + phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr" + 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 + if use pcre || phpconfutils_usecheck pcre ; then + myconf="${my_conf} --with-pcre-dir=/usr" + phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr" + fi + + # 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-r1" "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-r1" "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.8.ebuild b/dev-lang/php/php-5.2.8.ebuild deleted file mode 100644 index 5276a5c13317..000000000000 --- a/dev-lang/php/php-5.2.8.ebuild +++ /dev/null @@ -1,544 +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.8.ebuild,v 1.1 2008/12/08 23:30:02 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="${PR/r/}" -SUHOSIN_PATCH="suhosin-patch-5.2.7-0.9.6.3.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 - -SRC_URI="http://home.hoffie.info/php-patchset-${PV}-r${PHP_PATCHSET_REV}.tar.bz2 - ${SRC_URI}" - -# 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 - imap? ( >=virtual/imap-c-client-2006k ) - pcre? ( >=dev-libs/libpcre-7.8 )" -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 - - # pretend to not have flex, bug 221357 - sed -re 's:( +)PHP_SUBST\(LEX\):\1LEX="exit 0;"\n\0:' -i acinclude.m4 - - # 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 - - # bug 217392 (autconf-2.62 behavior changes) - sed s:_GNU_SOURCE:__GLIBC__: -i ext/posix/posix.c - - # 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 - - # 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 - - # new tests since 5.2.7 which have never been working for me - rm ext/spl/tests/arrayObject___construct_basic4.phpt \ - ext/spl/tests/arrayObject___construct_basic5.phpt \ - ext/spl/tests/arrayObject_exchangeArray_basic3.phpt \ - ext/spl/tests/arrayObject_setFlags_basic1.phpt \ - tests/lang/bug45392.phpt - - # those might as well be related to suhosin - rm ext/session/tests/session_decode_variation3.phpt \ - ext/session/tests/session_encode_variation8.phpt - - # missing skipif - use reflection || \ - rm ext/standard/tests/directory/DirectoryClass_basic_001.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 - rm ext/standard/tests/file/rename_variation13.phpt - - # test passes, but run-tests.php claims failure - rm ext/standard/tests/file/tempnam_variation4.phpt - - # these tests behave differently with suhosin enabled, adapting them... - use suhosin && sed -e 's:File(\.\./):File(..):g' -i \ - tests/security/open_basedir*{.inc,.phpt} -} - -src_compile() { - # bug 217392 (autconf-2.62 behavior changes) - export CFLAGS="${CFLAGS} -D_GNU_SOURCE" - export CXXFLAGS="${CXXFLAGS} -D_GNU_SOURCE" - 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 - - if use pcre || phpconfutils_usecheck pcre ; then - myconf="${my_conf} --with-pcre-dir=/usr" - phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr" - 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 - if use pcre || phpconfutils_usecheck pcre ; then - myconf="${my_conf} --with-pcre-dir=/usr" - phpconfutils_extension_with "pcre-regex" "pcre" 0 "/usr" - fi - - # 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 -} -- cgit v1.2.3-65-gdbad