diff options
author | Christian Parpart <trapni@gentoo.org> | 2005-04-13 01:20:04 +0000 |
---|---|---|
committer | Christian Parpart <trapni@gentoo.org> | 2005-04-13 01:20:04 +0000 |
commit | 21ecfb84791dac229799e57fba95df0557d0b43f (patch) | |
tree | 2c636adbfb4ef3247e5d3ea4faf577e126d7e83c /dev-php | |
parent | Added ~sparc keyword. (diff) | |
download | historical-21ecfb84791dac229799e57fba95df0557d0b43f.tar.gz historical-21ecfb84791dac229799e57fba95df0557d0b43f.tar.bz2 historical-21ecfb84791dac229799e57fba95df0557d0b43f.zip |
adding missing AddDirectoryIndex directive to config
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-php')
-rw-r--r-- | dev-php/mod_php/ChangeLog | 8 | ||||
-rw-r--r-- | dev-php/mod_php/Manifest | 5 | ||||
-rw-r--r-- | dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf | 43 | ||||
-rw-r--r-- | dev-php/mod_php/files/digest-mod_php-4.3.11-r2 | 3 | ||||
-rw-r--r-- | dev-php/mod_php/mod_php-4.3.11-r2.ebuild | 208 |
5 files changed, 265 insertions, 2 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index f23980be5801..9d5e7fea574b 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,12 @@ # 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.218 2005/04/12 23:34:27 trapni Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.219 2005/04/13 01:20:04 trapni Exp $ + +*mod_php-4.3.11-r2 (13 Apr 2005) + + 13 Apr 2005; Christian Parpart <trapni@gentoo.org> + +files/4.3.11-r2/70_mod_php.conf, +mod_php-4.3.11-r2.ebuild: + adding missing AddDirectoryIndex directive to config 12 Apr 2005; Christian Parpart <trapni@gentoo.org> mod_php-4.3.10-r1.ebuild, mod_php-4.3.11-r1.ebuild: diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index 94e17f557d51..9631e150085a 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,8 +1,9 @@ MD5 dc2b446cde6865cfbccaef4a94db4aa2 mod_php-4.3.10.ebuild 6134 MD5 794be7f3942662541c6c0d25fb64161c mod_php-4.3.9.ebuild 6074 +MD5 70c46b3aaf750d6af4a7e3f4502373b7 mod_php-4.3.11-r2.ebuild 6289 MD5 a431ba8439f0fced002aaf0f74a70e3f mod_php-4.3.8.ebuild 5963 MD5 5f347443c2b80bb26a91346b99501aca mod_php-5.0.3-r1.ebuild 4296 -MD5 16444b033c90f63cbe582972f303a7d6 ChangeLog 38113 +MD5 e05b94ab35e187365eada35eaa1afd71 ChangeLog 38319 MD5 8dcccea239186458cae823a2b62b80d0 mod_php-5.0.1.ebuild 4244 MD5 3da695dab52a3e7eeea983bf1c493fa1 mod_php-5.0.2.ebuild 4257 MD5 93afa9417917af1a31305b472ea8b70c mod_php-5.0.2-r1.ebuild 4177 @@ -34,6 +35,7 @@ MD5 11f305b98b753ee023da8503a360762a files/digest-mod_php-5.0.0-r1 63 MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-mod_php-5.0.3-r1 63 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022 MD5 829febfdce39bcb2d399b5cc8808a16d files/digest-mod_php-4.3.11-r1 206 +MD5 829febfdce39bcb2d399b5cc8808a16d files/digest-mod_php-4.3.11-r2 206 MD5 cd07c33356df77acd61cd300f2869d19 files/php-5.0.0-httpauthfix.patch 518 MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484 MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976 @@ -41,4 +43,5 @@ MD5 cd604ffae30af42fdc9248147efd0c4b files/php5-prefork.patch 850 MD5 14d868f33e29b3c9a70b118e9da58dd0 files/digest-mod_php-5.0.1 63 MD5 0b0247c6314c5f7d6685268262edfd24 files/digest-mod_php-4.3.10 206 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017 +MD5 4603a5ffdc23622c3acda6b171c49d4d files/4.3.11-r2/70_mod_php.conf 1100 MD5 80c45eef4f54629e893249f869cff5c6 files/5.0.2-r1/70_mod_php5.conf 484 diff --git a/dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf b/dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf new file mode 100644 index 000000000000..04ed17cd5329 --- /dev/null +++ b/dev-php/mod_php/files/4.3.11-r2/70_mod_php.conf @@ -0,0 +1,43 @@ +# vim: ft=apache sw=4 ts=4 +<IfDefine PHP4> + + # Load the module first + <IfModule !sapi_apache2.c> + LoadModule php4_module modules/libphp4.so + </IfModule> + + # Set it to handle the files + <IfModule mod_mime.c> + 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 + </IfModule> + + # post-adding DirectoryIndex'es + AddDirectoryIndex .php .php3 .php4 .phps .phtml + + # Fix some bugs + <Files *.php> + # keep this the same size as post_max_size in php.ini + # LimitRequestBody 8388608 + </Files> + <Files *.php3> + # keep this the same size as post_max_size in php.ini + # LimitRequestBody 8388608 + </Files> + <Files *.php4> + # keep this the same size as post_max_size in php.ini + # LimitRequestBody 8388608 + </Files> + <Files *.phps> + # keep this the same size as post_max_size in php.ini + # LimitRequestBody 8388608 + </Files> + <Files *.phtml> + # keep this the same size as post_max_size in php.ini + # LimitRequestBody 8388608 + </Files> + +</IfDefine> diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.11-r2 b/dev-php/mod_php/files/digest-mod_php-4.3.11-r2 new file mode 100644 index 000000000000..411071f59f5f --- /dev/null +++ b/dev-php/mod_php/files/digest-mod_php-4.3.11-r2 @@ -0,0 +1,3 @@ +MD5 fbc67d240812136a9842bc1f2a217b7a php-4.3.11.tar.bz2 4012575 +MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 +MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285 diff --git a/dev-php/mod_php/mod_php-4.3.11-r2.ebuild b/dev-php/mod_php/mod_php-4.3.11-r2.ebuild new file mode 100644 index 000000000000..db2b4b0c4695 --- /dev/null +++ b/dev-php/mod_php/mod_php-4.3.11-r2.ebuild @@ -0,0 +1,208 @@ +# 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-4.3.11-r2.ebuild,v 1.1 2005/04/13 01:20:04 trapni Exp $ + +IUSE="${IUSE} apache2" + +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64" + +detectapache() { + local domsg= + [ -n "$1" ] && domsg=1 + HAVE_APACHE1= + HAVE_APACHE2= + has_version '=net-www/apache-1*' && HAVE_APACHE1=1 + has_version '=net-www/apache-2*' && HAVE_APACHE2=1 + + [ -n "${HAVE_APACHE1}" ] && APACHEVER=1 + [ -n "${HAVE_APACHE2}" ] && APACHEVER=2 + [ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both' + + case "${APACHEVER}" in + 1) [ -n "${domsg}" ] && einfo 'Apache1 only detected' ;; + 2) [ -n "${domsg}" ] && einfo 'Apache2 only detected';; + both) + if use apache2; then + [ -n "${domsg}" ] && einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)" + APACHEVER=2 + else + [ -n "${domsg}" ] && einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)' + APACHEVER=1 + fi ;; + *) if [ -n "${domsg}" ]; then + MSG="Unknown Apache version!"; eerror $MSG ; die $MSG + else + APACHEVER=0 + fi; ;; + esac +} + +detectapache + +SLOT="${APACHEVER}" +[ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2='' + +PHPSAPI="apache${APACHEVER}" +SRC_URI_BASE="http://downloads.php.net/ilia/" # for RC only + +# BIG FAT WARNING! +# the php eclass requires the PHPSAPI setting! +# In this case the PHPSAPI setting is dependant on the detectapache function +# above this point as well! +inherit php-sapi eutils apache-module flag-o-matic + +DESCRIPTION="Apache module for PHP" + +DEPEND_EXTRA=">=net-www/apache-1.3.33-r2 + apache2? ( >=net-www/apache-2.0.52-r3 )" +DEPEND="${DEPEND} ${DEPEND_EXTRA}" +RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" +IUSE="${IUSE} debug" +# for this revision only +PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10" +PROVIDE="${PROVIDE} virtual/httpd-php-${PV}" + +# generalize some apache{,2} vars (defined by apache-module.eclass) +if [ -n ${USE_APACHE2} ]; then + APACHE_MODULESDIR=${APACHE2_MODULESDIR} + APACHE_CONFDIR=${APACHE2_CONFDIR} +else + APACHE_MODULESDIR=${APACHE_MODULESDIR} + APACHE_CONFDIR=${APACHE_CONFDIR} +fi + +# Add a 'return 0' as we DON'T want the return code checked +pkg_setup() { + use debug && einfo "Installing in SLOT=${SLOT}" + return 0 +} + +src_unpack() { + multiinstwarn + detectapache domsg + php-sapi_src_unpack + if [ "${ARCH}" == "amd64" ] ; then + epatch ${FILESDIR}/mod_php-4.3.4-amd64hack.diff + fi + + # bug fix for security problem - bug #39952 + # second revision as the apache2 stuff was resolved upstream + epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff + + # stop php from activing the apache config, as we will do that ourselves + for i in configure sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4; do + sed -i.orig -e 's,-i -a -n php4,-i -n php4,g' $i + done +} + +setup_environ() { + append-flags `apr-config --cppflags --cflags` +} + +src_compile() { + setup_environ + + # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety + if [ -n "${USE_APACHE2}" ]; then + APACHE2_MPM="`/usr/sbin/apache2 -l | egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" + einfo "Apache2 MPM: ${APACHE2_MPM}" + case "${APACHE2_MPM}" in + *prefork*) ;; + *) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; + esac; + fi + + #use apache2 \ + myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + + php-sapi_src_compile +} + +src_install() { + PHP_INSTALLTARGETS="install" + php-sapi_src_install + + einfo "Adding extra symlink to php.ini for Apache${USE_APACHE2}" + dodir ${APACHE_CONFDIR} + dodir ${PHPINIDIRECTORY} + dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE_CONFDIR}/${PHPINIFILENAME} + + einfo "Cleaning up a little" + rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so + + einfo "Adding symlink to Apache${USE_APACHE2} modules for PHP" + dosym ${APACHE_MODULESDIR} ${PHPINIDIRECTORY}/lib + exeinto ${APACHE_MODULESDIR} + + einfo "Installing mod_php shared object now" + doexe .libs/libphp4.so + + if [ -n "${USE_APACHE2}" ] ; then + einfo "Installing a Apache2 config for PHP (70_mod_php.conf)" + insinto ${APACHE2_MODULES_CONFDIR} + doins "${FILESDIR}/4.3.11-r2/70_mod_php.conf" + else + einfo "Installing a Apache config for PHP (mod_php.conf)" + insinto ${APACHE1_MODULES_CONFDIR} + doins ${FILESDIR}/mod_php.conf + dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE1_MODULES_CONFDIR}/${PHPINIFILENAME} + fi +} + +apache2msg() { + einfo "Edit /etc/conf.d/apache2 and add \"-D PHP4\" to APACHE2_OPTS" + ewarn "This is a CHANGE from previous behavior, which was \"-D PHP\"" + ewarn "This is for the upcoming PHP5 support. The ebuild will attempt" + ewarn "to make this update between PHP and PHP4 automatically" +} + +multiinstwarn() { + ewarn "Due to some previous bloopers with PHP and slotting, you may have" + ewarn "multiple instances of mod_php installed. Please look at the autoclean" + ewarn "output at the end of the emerge and unmerge all but relevant" + ewarn "instances." +} + +apache2fix() { + if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then + einfo "Attemping to update /etc/conf.d/apache2 automatically for the PHP/PHP4 change." + local oldfile="/etc/conf.d/apache2.old.`date +%Y%m%d%H%M%S`" + cp /etc/conf.d/apache2 ${oldfile} + sed -re 's,-D PHP\>,-D PHP4,g' ${oldfile} <${oldfile} >/etc/conf.d/apache2 + fi +} + + +pkg_preinst() { + multiinstwarn + [ "${APACHEVER}" -eq '2' ] && apache2fix + php-sapi_pkg_preinst +} + +pkg_postinst() { + php-sapi_pkg_postinst + multiinstwarn + einfo "To have Apache run php programs, please do the following:" + if [ -n "${USE_APACHE2}" ]; then + apache2msg + else + einfo "1. Execute the command:" + einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\"" + einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\" to APACHE_OPTS" + einfo "That will include the php mime types in your configuration" + einfo "automagically and setup Apache to load php when it starts." + fi +} + +pkg_config() { + multiinstwarn + if [ -n "${USE_APACHE2}" ]; then + apache2msg + else + ${ROOT}/usr/sbin/apacheaddmod \ + ${ROOT}/etc/apache/apache.conf \ + modules/libphp4.so mod_php4.c php4_module \ + before=perl define=PHP4 addconf=addon-modules/mod_php.conf + :; + fi +} |