diff options
| -rw-r--r-- | dev-php/mod_php/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-php/mod_php/Manifest | 24 | ||||
| -rw-r--r-- | dev-php/mod_php/files/digest-mod_php-4.3.6 | 1 | ||||
| -rw-r--r-- | dev-php/mod_php/files/digest-mod_php-4.3.6-r1 | 3 | ||||
| -rw-r--r-- | dev-php/mod_php/files/digest-mod_php-4.3.6_rc2 | 1 | ||||
| -rw-r--r-- | dev-php/mod_php/mod_php-4.3.6-r1.ebuild | 184 | ||||
| -rw-r--r-- | dev-php/php-cgi/Manifest | 12 |
7 files changed, 215 insertions, 17 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index 7f181d9555b8..dadb423b342c 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.140 2004/04/17 01:42:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.141 2004/04/21 00:32:09 robbat2 Exp $ + +*mod_php-4.3.6-r1 (20 Apr 2004) + + 20 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.6-r1.ebuild: + pcre fix bug #47498 *mod_php-4.3.6 (16 Apr 2004) diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index 5023e61baf42..d2574f9deaa9 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -1,16 +1,18 @@ +MD5 e9cc6d5e90e3eb00a772fcd7a3aeb763 mod_php-4.3.6.ebuild 5743 +MD5 e9cc6d5e90e3eb00a772fcd7a3aeb763 mod_php-4.3.6-r1.ebuild 5743 +MD5 48f8711aed7e1367152caea1db32de14 mod_php-4.3.5.ebuild 5743 +MD5 b0bd8570f2a54eb772085e47cadfaeae ChangeLog 27799 +MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 +MD5 00d0c8758562728658113d0bf0ecbbaf mod_php-4.3.6_rc2.ebuild 5789 +MD5 1e6fd83e7691b1437ec8c5806ca221be mod_php-4.3.4-r4.ebuild 5387 +MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 +MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 MD5 c0f86a4fc233945f1db33bd39abe22ab files/70_mod_php.conf 1065 MD5 d08dceef07d7ae4bd6e6dbaad0b86d72 files/digest-mod_php-4.3.5 137 +MD5 f44cab9a4913387fb930f0e9bce52780 files/digest-mod_php-4.3.6 205 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425 -MD5 139556966ff78ac6d9832ae3ca2092ad files/digest-mod_php-4.3.6_rc2 140 -MD5 eb3c11c2e0f099e4eea74fd3b348104e files/digest-mod_php-4.3.6 137 -MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 +MD5 8e71c532a5a8bbb19be4c057cf1d776b files/digest-mod_php-4.3.6_rc2 208 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422 -MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717 -MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r4 137 -MD5 9c7e18ba78063dc50ea861a6c1caa794 ChangeLog 27666 -MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 -MD5 0c74a1dba68c0efccf8c1b2742fc7b59 mod_php-4.3.5.ebuild 5744 -MD5 4bbcf8992e233b1c0293173cde33be6c mod_php-4.3.6_rc2.ebuild 5790 -MD5 8a0550a13803d381fccf97c626cb6de1 mod_php-4.3.6.ebuild 5744 -MD5 6d8c41f424b97b40ed9be1b1ace46627 mod_php-4.3.4-r4.ebuild 5388 +MD5 f44cab9a4913387fb930f0e9bce52780 files/digest-mod_php-4.3.6-r1 205 +MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.6 b/dev-php/mod_php/files/digest-mod_php-4.3.6 index 00c8e4e23280..7a5e03fd37db 100644 --- a/dev-php/mod_php/files/digest-mod_php-4.3.6 +++ b/dev-php/mod_php/files/digest-mod_php-4.3.6 @@ -1,2 +1,3 @@ MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796 MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 +MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.6-r1 b/dev-php/mod_php/files/digest-mod_php-4.3.6-r1 new file mode 100644 index 000000000000..7a5e03fd37db --- /dev/null +++ b/dev-php/mod_php/files/digest-mod_php-4.3.6-r1 @@ -0,0 +1,3 @@ +MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796 +MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 +MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2 b/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2 index 7ff2d034c70b..095a6f8a4583 100644 --- a/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2 +++ b/dev-php/mod_php/files/digest-mod_php-4.3.6_rc2 @@ -1,2 +1,3 @@ MD5 0bf89373a60f65cd37c1e3e652e278f5 php-4.3.6RC2.tar.bz2 3958337 MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 +MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004 diff --git a/dev-php/mod_php/mod_php-4.3.6-r1.ebuild b/dev-php/mod_php/mod_php-4.3.6-r1.ebuild new file mode 100644 index 000000000000..cec89e51f87d --- /dev/null +++ b/dev-php/mod_php/mod_php-4.3.6-r1.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.6-r1.ebuild,v 1.1 2004/04/21 00:32:09 robbat2 Exp $ + +IUSE="${IUSE} apache2" + +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64" + +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}" + +# 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 + +DESCRIPTION="Apache module for PHP" + +DEPEND_EXTRA=">=net-www/apache-1.3.26-r2 + apache2? ( >=net-www/apache-2.0.43-r1 )" +DEPEND="${DEPEND} ${DEPEND_EXTRA}" +RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" + +# 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 +} + +src_compile() { + # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety + if [ -n "${USE_APACHE2}" ]; then + APACHE2_MPM="`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 /etc/apache${USE_APACHE2}/conf/ + dodir ${PHPINIDIRECTORY} + dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache${USE_APACHE2}/conf/${PHPINIFILENAME} + + einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" + dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHPINIDIRECTORY}/lib + exeinto /usr/lib/apache${USE_APACHE2}-extramodules + 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 /etc/apache2/conf/modules.d + doins ${FILESDIR}/70_mod_php.conf + else + einfo "Installing a Apache config for PHP (mod_php.conf)" + insinto /etc/apache/conf/addon-modules + doins ${FILESDIR}/mod_php.conf + dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${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/conf/apache.conf \ + extramodules/libphp4.so mod_php4.c php4_module \ + before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf + :; + fi +} diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest index 3e4be2d9ca61..dc85977d857e 100644 --- a/dev-php/php-cgi/Manifest +++ b/dev-php/php-cgi/Manifest @@ -1,9 +1,11 @@ -MD5 914d1136948a338003c89058a540cd60 ChangeLog 1475 +MD5 ff5fe09c4241319cc6ad18ae8618e6e8 php-cgi-4.3.5.ebuild 694 +MD5 da7b5c2930bb3a8453d86ad0c744e909 php-cgi-4.3.6_rc2.ebuild 742 +MD5 c076d9613b2ef84e85e8e1d071a8d296 php-cgi-4.3.4-r2.ebuild 720 +MD5 da7b5c2930bb3a8453d86ad0c744e909 php-cgi-4.3.6.ebuild 742 +MD5 2a72dd0a97dc730b6560cc17dad6f8c7 ChangeLog 1474 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 -MD5 ac4086ba8df7d92f0dffacaa5a6f1358 php-cgi-4.3.4-r2.ebuild 721 -MD5 131e68f67a020ea2ee07d1cf752e5626 php-cgi-4.3.5.ebuild 695 -MD5 96ba2c0d623622105e4967c0eda2d9f2 php-cgi-4.3.6_rc2.ebuild 743 +MD5 8e71c532a5a8bbb19be4c057cf1d776b files/digest-php-cgi-4.3.6_rc2 208 MD5 d08dceef07d7ae4bd6e6dbaad0b86d72 files/digest-php-cgi-4.3.5 137 +MD5 f44cab9a4913387fb930f0e9bce52780 files/digest-php-cgi-4.3.6 205 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-cgi-4.3.4-r2 137 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422 -MD5 139556966ff78ac6d9832ae3ca2092ad files/digest-php-cgi-4.3.6_rc2 140 |