summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2004-05-28 21:38:16 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2004-05-28 21:38:16 +0000
commit8953d38a03f19a6fecd9fa4c524303e8392dde39 (patch)
treeaba93074fe83c72936602a3e7724b3af031ee9d2 /dev-php/mod_php
parentfix bugs 50991, 49420. (diff)
downloadgentoo-2-8953d38a03f19a6fecd9fa4c524303e8392dde39.tar.gz
gentoo-2-8953d38a03f19a6fecd9fa4c524303e8392dde39.tar.bz2
gentoo-2-8953d38a03f19a6fecd9fa4c524303e8392dde39.zip
fixed bugs 50991, 49420 in php-sapi eclass, so bump ebuilds.
Diffstat (limited to 'dev-php/mod_php')
-rw-r--r--dev-php/mod_php/ChangeLog7
-rw-r--r--dev-php/mod_php/Manifest26
-rw-r--r--dev-php/mod_php/files/digest-mod_php-4.3.6-r24
-rw-r--r--dev-php/mod_php/mod_php-4.3.6-r2.ebuild185
4 files changed, 209 insertions, 13 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 5b327671cbab..7ef422cdf468 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.145 2004/05/18 22:15:01 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.146 2004/05/28 21:37:59 robbat2 Exp $
+
+*mod_php-4.3.6-r2 (28 May 2004)
+
+ 28 May 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.6-r2.ebuild:
+ fixed bugs 50991, 49420 in php-sapi eclass, so bump ebuilds.
18 May 2004; Stuart Herbert <stuart@gentoo.org> :
Added digest for hardened-php patch
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 971515d0d939..8abb770e7f67 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,18 +1,20 @@
-MD5 4bbcf8992e233b1c0293173cde33be6c mod_php-4.3.6_rc2.ebuild 5790
-MD5 8a0550a13803d381fccf97c626cb6de1 mod_php-4.3.6.ebuild 5744
-MD5 3753abd4d51b350dd930bcc85e1e6f69 mod_php-4.3.6-r1.ebuild 5748
-MD5 f6ea72fe6be1af360bec9df6063b9c88 ChangeLog 28173
+MD5 884cfd077bcb1dff411e1bc891dd382a mod_php-4.3.6-r2.ebuild 5747
+MD5 e9cc6d5e90e3eb00a772fcd7a3aeb763 mod_php-4.3.6.ebuild 5743
+MD5 884cfd077bcb1dff411e1bc891dd382a mod_php-4.3.6-r1.ebuild 5747
+MD5 48f8711aed7e1367152caea1db32de14 mod_php-4.3.5.ebuild 5743
+MD5 9b79b9519a52233ce381f1de73da7566 ChangeLog 28172
MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 6d8c41f424b97b40ed9be1b1ace46627 mod_php-4.3.4-r4.ebuild 5388
-MD5 0c74a1dba68c0efccf8c1b2742fc7b59 mod_php-4.3.5.ebuild 5744
+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 8e71c532a5a8bbb19be4c057cf1d776b files/digest-mod_php-4.3.6_rc2 208
+MD5 d08dceef07d7ae4bd6e6dbaad0b86d72 files/digest-mod_php-4.3.5 137
MD5 f44cab9a4913387fb930f0e9bce52780 files/digest-mod_php-4.3.6 205
-MD5 54f3914e880dc3d462708f071fdcc4a8 files/digest-mod_php-4.3.6-r1 281
+MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
+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 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r4 137
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
-MD5 d08dceef07d7ae4bd6e6dbaad0b86d72 files/digest-mod_php-4.3.5 137
-MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
+MD5 54f3914e880dc3d462708f071fdcc4a8 files/digest-mod_php-4.3.6-r1 281
+MD5 cbc7f56fb4475854cf51dbdf27505c67 files/digest-mod_php-4.3.6-r2 273
+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-r2 b/dev-php/mod_php/files/digest-mod_php-4.3.6-r2
new file mode 100644
index 000000000000..a1e83b6db773
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.6-r2
@@ -0,0 +1,4 @@
+MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
diff --git a/dev-php/mod_php/mod_php-4.3.6-r2.ebuild b/dev-php/mod_php/mod_php-4.3.6-r2.ebuild
new file mode 100644
index 000000000000..0ab3df8dcfbb
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.6-r2.ebuild
@@ -0,0 +1,185 @@
+# 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-r2.ebuild,v 1.1 2004/05/28 21:37:59 robbat2 Exp $
+
+IUSE="${IUSE} apache2"
+
+KEYWORDS="x86 ~ppc sparc ~alpha ~hppa ~ia64 ~amd64 s390"
+
+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}"
+IUSE="${IUSE} debug"
+
+# 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
+}