diff options
author | Christian Hoffmann <hoffie@gentoo.org> | 2007-09-19 20:06:05 +0000 |
---|---|---|
committer | Christian Hoffmann <hoffie@gentoo.org> | 2007-09-19 20:06:05 +0000 |
commit | 522edaac90a60612de0b881bf332b0d655536b67 (patch) | |
tree | 9ca514e3b8a863b544d7889e6f3bb144709e2354 /dev-lang | |
parent | New upstream version (diff) | |
download | historical-522edaac90a60612de0b881bf332b0d655536b67.tar.gz historical-522edaac90a60612de0b881bf332b0d655536b67.tar.bz2 historical-522edaac90a60612de0b881bf332b0d655536b67.zip |
adding php-5.2.4_p20070914-r2 as per bug 191034
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/php/ChangeLog | 13 | ||||
-rw-r--r-- | dev-lang/php/Manifest | 17 | ||||
-rw-r--r-- | dev-lang/php/files/digest-php-5.2.4_p20070914-r2 | 9 | ||||
-rw-r--r-- | dev-lang/php/php-5.2.4_p20070914-r2.ebuild | 494 |
4 files changed, 528 insertions, 5 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 5e0491ebbcd5..12c925989bf0 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for dev-lang/php # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.195 2007/09/14 15:33:29 hoffie Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.196 2007/09/19 20:06:04 hoffie Exp $ + +*php-5.2.4_p20070914-r2 (19 Sep 2007) + + 19 Sep 2007; Christian Hoffmann <hoffie@gentoo.org> + +php-5.2.4_p20070914-r2.ebuild: + adding php-5.2.4_p20070914-r2 as per bug 191034 + * fix CVE-2007-4887 (dl() segfault with very long filenames) + * fix CVE-2007-4783, CVE-2007-4840 (segfault in iconv functions with very + long charset parameters); + * use almost-official suhosin again (based on the patch for 5.2.4) + * fix crashes in xmlrpc *php-5.2.4_p20070914 (14 Sep 2007) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 93f1d867a06c..25485da5276c 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -43,11 +43,13 @@ DIST php-patchset-5.1.6-r8.tar.bz2 30004 RMD160 5f93cda0783ba541cdc392d8f82344d3 DIST php-patchset-5.2.2-r2.tar.bz2 11486 RMD160 46ed4fc1e30f35dbd8e8d0db4ed47109a19de6c7 SHA1 6ea6c7d0e6ebe1f6c6ddea6fcc18f8e40c90957b SHA256 553c654ef7df90dc5cf64eb339884ed1730c4270bb2005fccb7da23da2c3aa74 DIST php-patchset-5.2.4-r0.tar.bz2 10305 RMD160 84ff2dffe6e6099d9dc8ad98fc5b99e10ac3218c SHA1 b3fb86c7c7bd4fdba8019048254ce428ac7b05fa SHA256 4ee25d74e81e44ad2fc6a0c4cf41942ef92073d61efb4b640aa63a58edb6c5fa DIST php-patchset-5.2.4_p20070914-r0.tar.bz2 8480 RMD160 7681bbca3420d02baf5297f5fd08712b3f3adb5d SHA1 b760907fa0807c011476f2d890df75ece5074169 SHA256 110751227f00302d72e5923750b45991c51c16331e5cb161f49359ab496f4b86 +DIST php-patchset-5.2.4_p20070914-r2.tar.bz2 12457 RMD160 2fa6b3c480bede06287418af3f0cb4c69cb9d628 SHA1 dc7a78dceebdf65d973f5f175eae7cb1a64c8ab5 SHA256 68974c9beda11ccf4e10c63609003e7664c29b45801cbf7e55e410c1dd453403 DIST php-patchset-5.2.4_pre200708051230-r2.tar.bz2 10339 RMD160 2e0837b813ff16d83a8bb88cc3e8ff7789abd8f8 SHA1 da8176a9e50c854a255ef9bb98685ca3b73f0897 SHA256 036cfa2a4dba009d2317c36527b9cd4763c2b3a7dffb7b6b3dcbb09fec0b5dde DIST suhosin-patch-4.4.7-0.9.6-gentoo.patch.gz 21555 RMD160 a4184998c0cbbc4b493c0c6874fca6ee923c7a83 SHA1 526125d15fd1aa37c1ffa78735554cc1683b3ba1 SHA256 93d4b422d6e3e4f8fff6cdeb6de619f70d527db44784d5bdcc6d83c0337ec784 DIST suhosin-patch-5.1.6-0.9.6-gentoo.patch.gz 23153 RMD160 8ae3b22638f927041f769e8052fba3841f891bbf SHA1 dcdb33fa9000196c0f516fdd70b762bcccf781d9 SHA256 07c89856820e2dbbefdb5141412fa1a52dd6f9f38fa987573fdccf5fa6a68361 DIST suhosin-patch-5.2.2-0.9.6.2-gentoo.patch.gz 22854 RMD160 808c187e650861fecb647474bd328d4940f0f1a6 SHA1 297acbb53e9a6f579729f431250d3e1ea6d86bb8 SHA256 867b6e45541e060d97d0567d81688a044734f0af6789ec2a1c70d2dea2f9fabb DIST suhosin-patch-5.2.4-0.9.6.2-gentoo.patch.gz 22292 RMD160 185bdd92dee54d83674b3de7262d57a6ac3ef14b SHA1 555d41ee0de422a72d1516e05cf66ba4a3d4904b SHA256 3a0cecf36a74d6cb8e0042363fcbadc4afd0046eb3baff6d4dec415f6464a96a +DIST suhosin-patch-5.2.4_p20070914-0.9.6.2-gentoo-r1.patch.gz 22407 RMD160 0cd0d6e9f14acb968cced10164f27389d0fa8bf9 SHA1 33b2e4ec92c6331a80ea812b0113906540db20fc SHA256 96ac1facb558b4dd4afe098cc776efc93602adc2683ba3157db39b7772183d1f DIST suhosin-patch-5.2.4_p20070914-0.9.6.2-gentoo.patch.gz 22381 RMD160 e2594b48a9fd407b4418e09c61fed09232ab53d5 SHA1 a981f38954f6b429048445488a12e5a061f5e152 SHA256 cc022a3d2e37f7e1211d90bb320922bd4d3a8c65c5888a5bea0040723e78259b DIST suhosin-patch-5.2.4_pre200708051230-0.9.6.2-gentoo.patch.gz 22349 RMD160 d9121893407346fb0ba64fdc4ba5585ed4a118ea SHA1 a7dacb871daa2a1c7353f6c28371e97885d72585 SHA256 0074b4fa4869f1ba7b8e85cfd69076cd674a9599c6e04c9a92f7fe07b9a6a292 EBUILD php-4.4.7.ebuild 14226 RMD160 f83f9efdd91adcdfc1c6cb69dad0ecff6a9859cf SHA1 335867c292abaf673f64d2817191ff5c7fb1a699 SHA256 57a2e3d789af261bbd2b7977ae14b7bf8ba645a5aefdfb997cd476697b541257 @@ -70,6 +72,10 @@ EBUILD php-5.2.4.ebuild 14206 RMD160 4fdc6dc42a9e5aca2c92ee11954ec18c11c647f0 SH MD5 744f2e015c57f8c16bd53c9c53586111 php-5.2.4.ebuild 14206 RMD160 4fdc6dc42a9e5aca2c92ee11954ec18c11c647f0 php-5.2.4.ebuild 14206 SHA256 0a1b483848f018bd680339579c82d2d042c29a86003cb1bab23d2761c660db9a php-5.2.4.ebuild 14206 +EBUILD php-5.2.4_p20070914-r2.ebuild 15060 RMD160 ad9bb78174ff0627db8b25f9ee197d91886a62b6 SHA1 669c005781adf86e082a0248388130070e04a750 SHA256 a73346f664b928c90164eaaba657c1043c08fb9670c3939daaa1812631d4f49c +MD5 b37367a7bfcff0078310220bb364dce9 php-5.2.4_p20070914-r2.ebuild 15060 +RMD160 ad9bb78174ff0627db8b25f9ee197d91886a62b6 php-5.2.4_p20070914-r2.ebuild 15060 +SHA256 a73346f664b928c90164eaaba657c1043c08fb9670c3939daaa1812631d4f49c php-5.2.4_p20070914-r2.ebuild 15060 EBUILD php-5.2.4_p20070914.ebuild 15056 RMD160 ae18ebb99100093bd8b97c908a14d3eda5da5b1c SHA1 a4bdf00a805a986730d1943efbb2f3b2c688210e SHA256 30ca2b412420c9768b44424cb69efdd811986b1c08da7f5e0a1878bed5924505 MD5 4664115de9cb1b22a92113aa497c676b php-5.2.4_p20070914.ebuild 15056 RMD160 ae18ebb99100093bd8b97c908a14d3eda5da5b1c php-5.2.4_p20070914.ebuild 15056 @@ -78,10 +84,10 @@ EBUILD php-5.2.4_pre200708051230-r2.ebuild 14984 RMD160 2917bce24b7fa4fcf3030dfa MD5 5c20ea3a6266ad5bf1390747001a8f9e php-5.2.4_pre200708051230-r2.ebuild 14984 RMD160 2917bce24b7fa4fcf3030dfa9eae3858b0c76560 php-5.2.4_pre200708051230-r2.ebuild 14984 SHA256 311806499c903291760652261c8bb7c8b129e5169e7e1d78076f81c39eed1ba5 php-5.2.4_pre200708051230-r2.ebuild 14984 -MISC ChangeLog 37098 RMD160 e57aa73f3443743cb71f09a6764daedce38fa0dd SHA1 6872fcd3a7b504640fbcef1b9ab1613b8e125cd8 SHA256 778556d245ac27d0264bc25fe5555418857ebed5d9eb383f29d381168a1ec170 -MD5 75007cc09c4aeccc4a45bbd3dc103f8b ChangeLog 37098 -RMD160 e57aa73f3443743cb71f09a6764daedce38fa0dd ChangeLog 37098 -SHA256 778556d245ac27d0264bc25fe5555418857ebed5d9eb383f29d381168a1ec170 ChangeLog 37098 +MISC ChangeLog 37550 RMD160 fd7edea061b0e95ca1e9c54477869813980fb58a SHA1 7f0a89e6b9fa567976adfd0029a56e1906da4953 SHA256 756d8919e201b5f69fe267249f32f80f62f605ac3be9193c5ae537315586778a +MD5 aae7463488474f601d9ea91421289415 ChangeLog 37550 +RMD160 fd7edea061b0e95ca1e9c54477869813980fb58a ChangeLog 37550 +SHA256 756d8919e201b5f69fe267249f32f80f62f605ac3be9193c5ae537315586778a ChangeLog 37550 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157 @@ -104,6 +110,9 @@ SHA256 2f8d01af6babd496061af1dd09758c9ed0ff1523baa2918d5e5a3d7e6a6ae6f4 files/di MD5 7efce3e4ec29b098abcbfed596b0a557 files/digest-php-5.2.4_p20070914 894 RMD160 29e0552ac8f217719e5311d28409aca58008db1d files/digest-php-5.2.4_p20070914 894 SHA256 bb4130be7ac4646483e418fb30c4cce5e9bac992de60be55b99f52e8e79360c5 files/digest-php-5.2.4_p20070914 894 +MD5 d7d4210369183ae5a5407f2d670d97d8 files/digest-php-5.2.4_p20070914-r2 906 +RMD160 81a2b1ee6832264264b3f161d9dfe600870e2ff3 files/digest-php-5.2.4_p20070914-r2 906 +SHA256 08659c640ae6cdf3eeac10f0164ad5f2899c0d1c237dfe6a25d6feb9ad673fb8 files/digest-php-5.2.4_p20070914-r2 906 MD5 fc219c02a4423bf09985599971d95707 files/digest-php-5.2.4_pre200708051230-r2 951 RMD160 d831f6d996b5b350baad69b8779011c67482fd63 files/digest-php-5.2.4_pre200708051230-r2 951 SHA256 7fa2d1d4f3710f164282ff8b259aa55853a7fcec080d77b485a781ca21af8757 files/digest-php-5.2.4_pre200708051230-r2 951 diff --git a/dev-lang/php/files/digest-php-5.2.4_p20070914-r2 b/dev-lang/php/files/digest-php-5.2.4_p20070914-r2 new file mode 100644 index 000000000000..389ed5030906 --- /dev/null +++ b/dev-lang/php/files/digest-php-5.2.4_p20070914-r2 @@ -0,0 +1,9 @@ +MD5 ec68c579100b88d4b8bf0976fb271025 php-5.2.4_p20070914.tar.bz2 7275434 +RMD160 87c012d03cd89951260b1f97cd3c16c935615867 php-5.2.4_p20070914.tar.bz2 7275434 +SHA256 00b561f85e31db500a959b028572031ae61d6971b4487be2fd301bae2f936009 php-5.2.4_p20070914.tar.bz2 7275434 +MD5 cbd683a18a4d97acdbc022d8deab72b1 php-patchset-5.2.4_p20070914-r2.tar.bz2 12457 +RMD160 2fa6b3c480bede06287418af3f0cb4c69cb9d628 php-patchset-5.2.4_p20070914-r2.tar.bz2 12457 +SHA256 68974c9beda11ccf4e10c63609003e7664c29b45801cbf7e55e410c1dd453403 php-patchset-5.2.4_p20070914-r2.tar.bz2 12457 +MD5 16e1730b91944579764e5dc02736f903 suhosin-patch-5.2.4_p20070914-0.9.6.2-gentoo-r1.patch.gz 22407 +RMD160 0cd0d6e9f14acb968cced10164f27389d0fa8bf9 suhosin-patch-5.2.4_p20070914-0.9.6.2-gentoo-r1.patch.gz 22407 +SHA256 96ac1facb558b4dd4afe098cc776efc93602adc2683ba3157db39b7772183d1f suhosin-patch-5.2.4_p20070914-0.9.6.2-gentoo-r1.patch.gz 22407 diff --git a/dev-lang/php/php-5.2.4_p20070914-r2.ebuild b/dev-lang/php/php-5.2.4_p20070914-r2.ebuild new file mode 100644 index 000000000000..4e0967e27719 --- /dev/null +++ b/dev-lang/php/php-5.2.4_p20070914-r2.ebuild @@ -0,0 +1,494 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.4_p20070914-r2.ebuild,v 1.1 2007/09/19 20:06:05 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="2" +SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6.2-gentoo-r1.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 + +# eclass doesn't know about our snapshot tarball so we have to set SRC_URI +# ourselves +SRC_URI="http://gentoo.longitekk.com/${P}.tar.bz2 http://gentoo.longitekk.com/php-patchset-${MY_PHP_PV}-r${PHP_PATCHSET_REV}.tar.bz2" + +[[ -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 + if [[ "${APACHE_VERSION}" != "0" ]] ; then + if ! use threads ; then + APACHE2_SAFE_MPMS="itk peruser prefork" + else + APACHE2_SAFE_MPMS="event leader metuxmpm perchild threadpool worker" + fi + + ewarn + ewarn "If this package fails with a fatal error about Apache2 not having" + ewarn "been compiled with a compatible MPM, this is normally because you" + ewarn "need to toggle the 'threads' USE flag." + ewarn + ewarn "If 'threads' is off, try switching it on." + ewarn "If 'threads' is on, try switching it off." + ewarn + + apache-module_pkg_setup + fi + fi + + # Concurrent PHP Apache2 modules support + if use apache2 ; then + if [[ "${APACHE_VERSION}" != "0" ]] ; 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 + 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 + if [[ "${APACHE_VERSION}" != "0" ]] ; then + PHPSAPIS="${PHPSAPIS} apache${APACHE_VERSION}" + fi + fi +} + +src_unpack() { + if [[ "${PHP_PACKAGE}" == 1 ]] ; then + unpack ${A} + fi + + cd "${S}" + + # Concurrent PHP Apache2 modules support + if use apache2 ; then + if [[ "${APACHE_VERSION}" != "0" ]] ; 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 + 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 + + local release_version="$(get_version_component_range 3)" + sed -re "s|^PHP_RELEASE_VERSION=.*|PHP_RELEASE_VERSION=${release_version}|g" -i "${S}/configure.in" \ + || die "Unable to change PHP release version to ${release_version}" + PHP_EXTRA_BRANDING="_p${MY_PHP_PV#*_p}" + + # 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 + 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 +} + +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 + if [[ "${APACHE_VERSION}" != "0" ]] ; then + # Concurrent PHP Apache2 modules support + if use concurrentmodphp ; then + append-ldflags "-Wl,--version-script=${FILESDIR}/php5-ldvs" + fi + 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 + if [[ "${APACHE_VERSION}" != "0" ]] ; then + # Threaded Apache2 support + if use threads ; then + my_conf="${my_conf} --enable-maintainer-zts" + ewarn "Enabling ZTS for Apache2 MPM" + fi + 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() { + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + if ! emake -j1 test ; then + hasq test ${FEATURES} && die "Make test failed. See above for details." + hasq test ${FEATURES} || eerror "Make test failed. See above for details." + fi +} |