Version bump

5 files changed, 207 insertions, 21 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 38b5514ad8eb..0d6d4058a8da 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.129 2004/03/09 23:17:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.130 2004/03/29 00:05:16 stuart Exp $
+
+*mod_php-4.3.5 (29 Mar 2004)
+
+  29 Mar 2004; Stuart Herbert <stuart@gentoo.org> mod_php-4.3.5.ebuild:
+  Version bump
 
   09 Mar 2004; <agriffis@gentoo.org> mod_php-4.3.4-r4.ebuild:
   stable on alpha and ia64
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 41d62a3b3ffa..28361b5758f4 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,39 +1,41 @@
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 88dbd3f2adfe7f1c09fbee26bb20e5c7 mod_php-4.3.2-r1.ebuild 2759
-MD5 28148a26446e58d9d8fb427fe2f2c936 mod_php-4.3.2-r2.ebuild 3696
-MD5 f72efb54e1262a9401817b6034bfd00c mod_php-4.3.2-r3.ebuild 4939
-MD5 c786ba6c1893384cab60c3c8c44321b8 mod_php-4.3.2-r4.ebuild 4978
-MD5 475406c417d82d6dc0ea6e13afdf7910 mod_php-4.3.2-r5.ebuild 5109
 MD5 233ba34538a697386c6bb4d278cb9c0f mod_php-4.3.2.ebuild 3392
-MD5 412048e603d43d7fad459f2dc44ffe7d mod_php-4.3.3-r1.ebuild 4929
 MD5 193bde86baf386fbd519ee563ceca3f9 mod_php-4.3.3-r2.ebuild 4970
-MD5 e8f6da390213b16ffdcdc4d374855719 mod_php-4.3.3-r3.ebuild 4977
-MD5 1d82562876ca9bdbcafaa426655c310a mod_php-4.3.3.ebuild 4898
-MD5 d601c3fbb04d9ee67d7590d457a86885 mod_php-4.3.3_rc3.ebuild 5133
+MD5 475406c417d82d6dc0ea6e13afdf7910 mod_php-4.3.2-r5.ebuild 5109
 MD5 89b5aedbcfd87dc711a40caf7d42bdbb mod_php-4.3.4-r1.ebuild 5050
+MD5 d601c3fbb04d9ee67d7590d457a86885 mod_php-4.3.3_rc3.ebuild 5133
 MD5 9b2b6c5f70a67d3817491427754b2a4e mod_php-4.3.4.ebuild 4972
-MD5 e3d110731417d75e9f23df5fa7dff192 ChangeLog 25963
-MD5 5907cb67785251cb124a26dfabe43f2f mod_php-4.3.4-r2.ebuild 5214
+MD5 28148a26446e58d9d8fb427fe2f2c936 mod_php-4.3.2-r2.ebuild 3696
 MD5 969102dd924e951bfa31e5a11215b8ea mod_php-4.3.4-r3.ebuild 5392
+MD5 412048e603d43d7fad459f2dc44ffe7d mod_php-4.3.3-r1.ebuild 4929
+MD5 c786ba6c1893384cab60c3c8c44321b8 mod_php-4.3.2-r4.ebuild 4978
+MD5 1d82562876ca9bdbcafaa426655c310a mod_php-4.3.3.ebuild 4898
+MD5 e8f6da390213b16ffdcdc4d374855719 mod_php-4.3.3-r3.ebuild 4977
+MD5 88dbd3f2adfe7f1c09fbee26bb20e5c7 mod_php-4.3.2-r1.ebuild 2759
+MD5 5907cb67785251cb124a26dfabe43f2f mod_php-4.3.4-r2.ebuild 5214
+MD5 ef1c0baf80506b6acbee73ec379adebe ChangeLog 26079
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 f72efb54e1262a9401817b6034bfd00c mod_php-4.3.2-r3.ebuild 4939
 MD5 8f98d3d3c91b0024416c8a52afc2641d mod_php-4.3.4-r4.ebuild 5389
+MD5 1830642d4029e3f2eec92cb9a7b7d846 mod_php-4.3.5.ebuild 5422
+MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 c0f86a4fc233945f1db33bd39abe22ab files/70_mod_php.conf 1065
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2 137
+MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3 137
+MD5 85d30f5e2707a53bd35b201a29371f05 files/digest-mod_php-4.3.4 208
+MD5 bc61d89af9d65e3a482d9b2ffea4fcaf files/digest-mod_php-4.3.3_rc3 140
+MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r1 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r2 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r3 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r4 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-mod_php-4.3.2-r5 137
-MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r1 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r2 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r3 137
-MD5 bc61d89af9d65e3a482d9b2ffea4fcaf files/digest-mod_php-4.3.3_rc3 140
-MD5 85d30f5e2707a53bd35b201a29371f05 files/digest-mod_php-4.3.4 208
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r1 137
-MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r2 137
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r3 137
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 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
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.5 b/dev-php/mod_php/files/digest-mod_php-4.3.5
new file mode 100644
index 000000000000..38cea9fa989c
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.5
@@ -0,0 +1,2 @@
+MD5 29e61c125ac6278897c6c219f5d100d1 php-4.3.5.tar.bz2 3947414
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/mod_php/mod_php-4.3.5.ebuild b/dev-php/mod_php/mod_php-4.3.5.ebuild
new file mode 100644
index 000000000000..f58a0d5b155b
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.5.ebuild
@@ -0,0 +1,177 @@
+# 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.5.ebuild,v 1.1 2004/03/29 00:05:16 stuart Exp $
+
+IUSE="${IUSE} apache2"
+
+DESCRIPTION="Apache module for PHP"
+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
+
+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}/${P}-amd64hack.diff
+	fi
+
+	# bug fix for security problem - bug #39952
+	epatch ${FILESDIR}/mod_php-4.3.4-r3.diff
+}
+
+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/Manifest b/dev-php/php/Manifest
index 77b43467e592..875773b4a3cc 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -4,18 +4,18 @@ MD5 71a3e4aa0b406c4cb3282bb61b633376 php-4.3.2-r3.ebuild 1129
 MD5 791de6564dbf283f21abce7146c3012e php-4.3.4-r4.ebuild 1379
 MD5 402def0cf0a5834644497f8d6cf82f6c php-4.3.3-r2.ebuild 1199
 MD5 fbe255ea8c0fba329faf947ec54b3d17 php-4.3.2.ebuild 2407
+MD5 893f66078eb2f71dea369863548f3207 php-4.3.5.ebuild 1298
 MD5 2fe52c31a29123ad2f6d31dc864b4d7d php-4.3.4-r1.ebuild 1284
 MD5 91f4a7fde0f3e06d7e7cfa4bb3f914c2 php-4.3.2-r2.ebuild 1171
 MD5 09136ad03063a7b74db16d9be9c651dc php-4.3.4.ebuild 1205
 MD5 11a9e9b747effeeab1fd5a7e8d4ea7c7 php-4.3.4-r3.ebuild 1259
 MD5 139eb871907b545773766aa53589df9e php-4.3.3-r1.ebuild 1198
 MD5 f4e4ff3a27d459b6d1fe3b0477639e7b php-5.0_beta1.ebuild 1165
-MD5 fd2966a6a7ef6e96db8c2f7e5c63b172 ChangeLog 12024
+MD5 8b02ad1e306115594e5c59c28072ffff ChangeLog 12165
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 4e31b0c66c87e0c0fb4e0f01105f1873 php-4.3.3-r3.ebuild 1208
 MD5 02828b6fa75a43b15d78d0966e1d8400 php-4.3.2-r1.ebuild 979
 MD5 2a544714659ee2a1c457d445d16e24b3 php-4.3.3.ebuild 1199
-MD5 e1447d936f5190e420de730016aaf69f php-4.3.5.ebuild 1384
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r1 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r2 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r3 137