diff options
author | Stuart Herbert <stuart@gentoo.org> | 2005-03-13 22:19:13 +0000 |
---|---|---|
committer | Stuart Herbert <stuart@gentoo.org> | 2005-03-13 22:19:13 +0000 |
commit | f99003b2d724866f3fdf2a9f661aab81d0ae85be (patch) | |
tree | 1ccaf430cf9bc95e6f10169a63210a2e6ce91b75 /dev-php | |
parent | jbig compatibility support for perlmagick ebuild with parent ebuild of imagem... (diff) | |
download | gentoo-2-f99003b2d724866f3fdf2a9f661aab81d0ae85be.tar.gz gentoo-2-f99003b2d724866f3fdf2a9f661aab81d0ae85be.tar.bz2 gentoo-2-f99003b2d724866f3fdf2a9f661aab81d0ae85be.zip |
Apache refresh packages support
Diffstat (limited to 'dev-php')
-rw-r--r-- | dev-php/mod_php/ChangeLog | 9 | ||||
-rw-r--r-- | dev-php/mod_php/Manifest | 29 | ||||
-rw-r--r-- | dev-php/mod_php/files/digest-mod_php-5.0.3-r2 | 1 | ||||
-rw-r--r-- | dev-php/mod_php/files/php5-prefork.patch | 26 | ||||
-rw-r--r-- | dev-php/mod_php/mod_php-5.0.3-r2.ebuild | 85 |
5 files changed, 136 insertions, 14 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index d2793ab94cf2..69b40491d78c 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.208 2005/03/06 19:12:12 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.209 2005/03/13 22:19:13 stuart Exp $ + +*mod_php-5.0.3-r2 (13 Mar 2005) + + 13 Mar 2005; Stuart Herbert <stuart@gentoo.org> +files/php5-prefork.patch, + +mod_php-5.0.3-r2.ebuild: + Updated to work w/ the unstable apache, & to allow mixed php4/php5 + installations 06 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> mod_php-5.0.3-r1.ebuild: diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index fd489d661286..002f3fa4bf75 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,37 +1,40 @@ -MD5 f78fd1d1a6ce8955d60f7bcd08df940d ChangeLog 36350 +MD5 4f99ce95c91034657425f57e8c79ae5d ChangeLog 36574 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 -MD5 ab16ea4659012c51daf410c110d92895 mod_php-4.3.9_rc1.ebuild 6025 MD5 3b4db25bfe82d2967bc9c607cccdb12c mod_php-5.0.0-r1.ebuild 4179 +MD5 ab16ea4659012c51daf410c110d92895 mod_php-4.3.9_rc1.ebuild 6025 MD5 8dcccea239186458cae823a2b62b80d0 mod_php-5.0.1.ebuild 4244 -MD5 f7e4a6694e3b06296830077b47d766da mod_php-5.0.0.ebuild 3995 -MD5 f3da06c0bb470ad2782dfe207ce75e4e mod_php-4.3.8.ebuild 5916 MD5 6c800aaecfc09d8cacf986e86b53fefe mod_php-4.3.9.ebuild 6027 MD5 3da695dab52a3e7eeea983bf1c493fa1 mod_php-5.0.2.ebuild 4257 MD5 41fa8ee6ab61073f8d9a74a0a2306eba mod_php-4.3.10.ebuild 6088 MD5 5357393f40a578f7be2663a74f23640f mod_php-5.0.3.ebuild 4378 MD5 5bbc188da240ebacd7a14d77aaa439bf mod_php-4.3.10-r1.ebuild 6311 +MD5 f7e4a6694e3b06296830077b47d766da mod_php-5.0.0.ebuild 3995 +MD5 f3da06c0bb470ad2782dfe207ce75e4e mod_php-4.3.8.ebuild 5916 MD5 93afa9417917af1a31305b472ea8b70c mod_php-5.0.2-r1.ebuild 4177 MD5 5f347443c2b80bb26a91346b99501aca mod_php-5.0.3-r1.ebuild 4296 +MD5 944cf3d37983fd880297431ade3fc8f8 mod_php-5.0.3-r2.ebuild 2035 +MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022 -MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63 -MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425 -MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208 MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0-r1 63 MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518 -MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484 -MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63 -MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976 -MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282 -MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 -MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 +MD5 286ce4ea00fde75122c14fd35c3d4672 files/digest-mod_php-4.3.9_rc1 208 +MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63 MD5 aeed7aba3334e2f1437aa1ef48d850e8 files/digest-mod_php-4.3.9 205 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2 63 MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10 206 +MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3 63 +MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425 +MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358 +MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0 63 +MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976 +MD5 390a659097a43447e44ab5bdd59378b5 files/digest-mod_php-4.3.8 282 MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10-r1 206 MD5 4792b645fe6b66cd3f1b1ec88d4d20e8 files/digest-mod_php-5.0.2-r1 63 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r1 63 MD5 f7a7898637874593f519c336db79fa45 files/mod_php-5.0.3-missing-arches.patch 524 +MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r2 63 +MD5 cd604ffae30af42fdc9248147efd0c4b files/php5-prefork.patch 850 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017 MD5 80c45eef4f54629e893249f869cff5c6 files/5.0.2-r1/70_mod_php5.conf 484 diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.3-r2 b/dev-php/mod_php/files/digest-mod_php-5.0.3-r2 new file mode 100644 index 000000000000..eb20872d0cc2 --- /dev/null +++ b/dev-php/mod_php/files/digest-mod_php-5.0.3-r2 @@ -0,0 +1 @@ +MD5 fd26455febdddee0977ce226b9108d9c php-5.0.3.tar.bz2 4607759 diff --git a/dev-php/mod_php/files/php5-prefork.patch b/dev-php/mod_php/files/php5-prefork.patch new file mode 100644 index 000000000000..71194dd64c89 --- /dev/null +++ b/dev-php/mod_php/files/php5-prefork.patch @@ -0,0 +1,26 @@ +diff -u --recursive php-5.0.3-orig/sapi/apache2filter/config.m4 php-5.0.3/sapi/apache2filter/config.m4 +--- php-5.0.3-orig/sapi/apache2filter/config.m4 2005-03-13 20:30:44.767051120 +0000 ++++ php-5.0.3/sapi/apache2filter/config.m4 2005-03-13 20:32:01.999310032 +0000 +@@ -115,9 +115,6 @@ + ;; + esac + +- if test "$APXS_MPM" != "prefork"; then +- PHP_BUILD_THREAD_SAFE +- fi + AC_MSG_RESULT(yes) + + PHP_SUBST(APXS) +diff -u --recursive php-5.0.3-orig/sapi/apache2handler/config.m4 php-5.0.3/sapi/apache2handler/config.m4 +--- php-5.0.3-orig/sapi/apache2handler/config.m4 2005-03-13 20:30:44.771050512 +0000 ++++ php-5.0.3/sapi/apache2handler/config.m4 2005-03-13 20:31:50.106118072 +0000 +@@ -114,9 +114,6 @@ + ;; + esac + +- if test "$APXS_MPM" != "prefork"; then +- PHP_BUILD_THREAD_SAFE +- fi + AC_MSG_RESULT(yes) + + PHP_SUBST(APXS) diff --git a/dev-php/mod_php/mod_php-5.0.3-r2.ebuild b/dev-php/mod_php/mod_php-5.0.3-r2.ebuild new file mode 100644 index 000000000000..255f01d0f2d7 --- /dev/null +++ b/dev-php/mod_php/mod_php-5.0.3-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-5.0.3-r2.ebuild,v 1.1 2005/03/13 22:19:13 stuart Exp $ + +IUSE="${IUSE} apache2" + +# this duplicates the code from depend.apache.eclass, but it's the +# only way to do this here + +if useq apache2 ; then + APACHE_VERSION=2 +else + APACHE_VERSION=1 +fi + +KEYWORDS="~x86 ~amd64" +PROVIDE="virtual/httpd-php-${PV}" + +SLOT="${APACHE_VERSION}" + +PHPSAPI="apache${APACHE_VERSION}" +MY_P="php-${PV}" + +# BIG FAT WARNING! +# the php eclass requires the PHPSAPI setting! +inherit eutils php5-sapi-r1 apache-module + +need_apache + +DESCRIPTION="Apache module for PHP 5" + +pkg_setup() { + + # the list of safe MPM's may need revising + if ! useq threads ; then + APACHE2_SAFE_MPMS="prefork" + else + APACHE2_SAFE_MPMS="event metuxmpm peruser worker threadpool" + fi + + apache-module_pkg_setup + php5-sapi_pkg_setup +} + +src_unpack() { + php5-sapi_src_unpack + + # if we're not using threads, we need to force them to be switched + # off by patching php's configure script + cd ${S} + if ! useq threads ; then + epatch ${FILESDIR}/php5-prefork.patch || die "Unable to patch for prefork support" + einfo "Rebuilding configure script" + WANT_AUTOCONF=2.5 \ + autoconf -W no-cross || die "Unable to regenerate configure script" + fi +} + +src_compile() { + if [ "${APACHE_VERSION}" = "2" ]; then + if useq threads ; then + my_conf="${my_conf} --enable-experimental-zts" + ewarn "Enabling ZTS for Apache2 MPM" + fi + fi + + my_conf="${my_conf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + + php5-sapi_src_compile +} + +src_install() { + PHP_INSTALLTARGETS="install" + php5-sapi_src_install + + if [ -n "${USE_APACHE2}" ] ; then + einfo "Installing a Apache2 config for PHP (70_mod_php5.conf)" + insinto ${APACHE_MODULES_CONFDIR} + doins "${FILESDIR}/5.0.2-r1/70_mod_php5.conf" + else + einfo "Installing a Apache config for PHP (mod_php5.conf)" + insinto ${APACHE_MODULES_CONFDIR} + doins ${FILESDIR}/mod_php5.conf + fi +} |