new version.

8 files changed, 269 insertions, 23 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index dee5fd9c9e7f..7f181d9555b8 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.139 2004/04/14 11:43:19 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.140 2004/04/17 01:42:51 robbat2 Exp $
+
+*mod_php-4.3.6 (16 Apr 2004)
+
+  16 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.6.ebuild:
+  new version.
 
   14 Apr 2004; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.6_rc2.ebuild:
   Marked stable on hppa.
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index a478f9a8858b..357c9fc47eb1 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,14 +1,16 @@
-MD5 6c844b58f7f58ae28a87f2bffb9a69c6 ChangeLog 27544
+MD5 2bc3fb97479ded83350eb6b5075dd7aa mod_php-4.3.6.ebuild 5744
+MD5 48f8711aed7e1367152caea1db32de14 mod_php-4.3.5.ebuild 5743
+MD5 964c3acc287c3eaed9fc1a7de0158d5e ChangeLog 27543
 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 6d8c41f424b97b40ed9be1b1ace46627 mod_php-4.3.4-r4.ebuild 5388
+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 139556966ff78ac6d9832ae3ca2092ad files/digest-mod_php-4.3.6_rc2 140
+MD5 eb3c11c2e0f099e4eea74fd3b348104e files/digest-mod_php-4.3.6 137
 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
+MD5 139556966ff78ac6d9832ae3ca2092ad files/digest-mod_php-4.3.6_rc2 140
+MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r4 137
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717
-MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
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
new file mode 100644
index 000000000000..00c8e4e23280
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.6
@@ -0,0 +1,2 @@
+MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/mod_php/mod_php-4.3.6.ebuild b/dev-php/mod_php/mod_php-4.3.6.ebuild
new file mode 100644
index 000000000000..2d354ed85c56
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.6.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.ebuild,v 1.1 2004/04/17 01:42:51 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/ChangeLog b/dev-php/php/ChangeLog
index 38f562022135..0b50eba6e41c 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.82 2004/04/05 20:55:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.83 2004/04/17 01:42:21 robbat2 Exp $
+
+*php-4.3.6 (16 Apr 2004)
+
+  16 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> php-4.3.6.ebuild:
+  new version.
 
 *php-4.3.6_rc2 (05 Apr 2004)
 
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 4c70dad176d9..97970b6a452e 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,16 +1,18 @@
-MD5 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5 63
-MD5 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5-r1 63
+MD5 db72709573c572cf5f41f9c0d192be83 php-5.0_beta1-r1.ebuild 1284
+MD5 b79d62ef2f1f57436feebcba1f8f115c php-4.3.5.ebuild 1301
+MD5 cb062070f8ab4292eee83cfd2c56e9e8 php-4.3.5-r1.ebuild 1054
+MD5 ca1f3482b0ecc4d25fae4c7c1bbecf00 php-4.3.4-r4.ebuild 1378
+MD5 2c4f329f8ef101fc4b4c2853d870b04f php-5.0_beta1.ebuild 1164
+MD5 cb062070f8ab4292eee83cfd2c56e9e8 php-4.3.6.ebuild 1054
+MD5 b304c2c7b0a88e3205e548b025a9e0a9 ChangeLog 12917
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 ebd2def4b6a8ede383108a231c213db7 php-4.3.6_rc2.ebuild 1101
+MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
 MD5 1083399b52247e8dc3a2276a114983f6 files/digest-php-4.3.6_rc2 66
-MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
+MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r4 137
+MD5 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5-r1 63
 MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1-r1 65
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
-MD5 5547bf31e6a425747226d5984cff04e9 files/digest-php-4.3.4-r4 137
-MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
-MD5 89a4fc3c6c52bc0907e0e27491caaa64 ChangeLog 12918
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 6578b9b4911d29a349354934641ca9b9 php-4.3.5-r1.ebuild 1055
-MD5 30ef8eb0fa16fc2891a99661c2cde7f4 php-4.3.5.ebuild 1302
-MD5 7ee8becdbb65e8954bb5bf61672ff497 php-4.3.6_rc2.ebuild 1102
-MD5 bcd91247964caa0747b672f519b2b9a5 php-5.0_beta1-r1.ebuild 1285
-MD5 f4e4ff3a27d459b6d1fe3b0477639e7b php-5.0_beta1.ebuild 1165
-MD5 791de6564dbf283f21abce7146c3012e php-4.3.4-r4.ebuild 1379
+MD5 f01872db97526bff1bd647bfb1a55b57 files/digest-php-4.3.5 63
+MD5 2e3bf1062ab21ee8c1c3eb5930f04712 files/digest-php-4.3.6 63
+MD5 2a7311fb659555c4711a4ed8b70e9594 files/digest-php-5.0_beta1 65
diff --git a/dev-php/php/files/digest-php-4.3.6 b/dev-php/php/files/digest-php-4.3.6
new file mode 100644
index 000000000000..8a4e623734fc
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.6
@@ -0,0 +1 @@
+MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
diff --git a/dev-php/php/php-4.3.6.ebuild b/dev-php/php/php-4.3.6.ebuild
new file mode 100644
index 000000000000..e890b9c04025
--- /dev/null
+++ b/dev-php/php/php-4.3.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.6.ebuild,v 1.1 2004/04/17 01:42:21 robbat2 Exp $
+
+PHPSAPI="cli"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+
+src_unpack() {
+	php-sapi_src_unpack
+	if [ "${ARCH}" == "amd64" ] ; then
+		epatch ${FILESDIR}/php-4.3.4-amd64hack.diff
+	fi
+}
+
+src_compile() {
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	einfo "Installing manpage"
+	doman sapi/cli/php.1
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CLI only build."
+	einfo "You cannot use it on a webserver."
+
+	if [ "`md5sum ${ROOT}/root/.pearrc`" = "f0243f51b2457bc545158cf066e4e7a2  ${ROOT}/root/.pearrc" ]; then
+		einfo "Cleaning up an old PEAR install glitch"
+		mv ${ROOT}/root/.pearrc ${ROOT}/root/.pearrc.`date +%Y%m%d%H%M%S`
+	fi
+}