Fix for bug #39952

11 files changed, 234 insertions, 20 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 75aa005ba09f..ac4dc5177dab 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,18 @@
 # 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.121 2004/01/24 12:33:13 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.122 2004/01/31 22:38:34 stuart Exp $
+
+*mod_php-4.3.4-r3 (31 Jan 2004)
+
+  31 Jan 2004; Stuart Herbert <stuart@gentoo.org> mod_php-4.3.3-r1.ebuild,
+  mod_php-4.3.3-r2.ebuild, mod_php-4.3.3-r3.ebuild, mod_php-4.3.4-r1.ebuild,
+  mod_php-4.3.4-r2.ebuild, mod_php-4.3.4-r3.ebuild, mod_php-4.3.4.ebuild,
+  files/mod_php-4.3.4-r3.diff:
+  Removed amd64 from the ARCH list until it passes a 'repoman full' scan.
+
+  31 Jan 2004; Stuart Herbert <stuart@gentoo.org> mod_php-4.3.4-r3.ebuild,
+  files/mod_php-4.3.4-r3.diff:
+  Added patch for bug #39952 - GLSA to follow from plasmaroo
 
   24 Jan 2004; <gustavoz@gentoo.org> mod_php-4.3.4-r2.ebuild:
   marked stable on sparc
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 1165eeefefcf..5bc18ae79dc2 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,17 +1,18 @@
 MD5 233ba34538a697386c6bb4d278cb9c0f mod_php-4.3.2.ebuild 3392
-MD5 c705db7e296c11431002f2f2683a42fe mod_php-4.3.3-r2.ebuild 4978
+MD5 193bde86baf386fbd519ee563ceca3f9 mod_php-4.3.3-r2.ebuild 4970
 MD5 475406c417d82d6dc0ea6e13afdf7910 mod_php-4.3.2-r5.ebuild 5109
-MD5 ffbd5bb5e64ee85336fe4aec2282acbb mod_php-4.3.4-r1.ebuild 5058
+MD5 89b5aedbcfd87dc711a40caf7d42bdbb mod_php-4.3.4-r1.ebuild 5050
 MD5 d601c3fbb04d9ee67d7590d457a86885 mod_php-4.3.3_rc3.ebuild 5133
-MD5 316ca7cc4b59a17862a00e05d52c03d3 mod_php-4.3.4.ebuild 4980
+MD5 9b2b6c5f70a67d3817491427754b2a4e mod_php-4.3.4.ebuild 4972
 MD5 28148a26446e58d9d8fb427fe2f2c936 mod_php-4.3.2-r2.ebuild 3696
-MD5 54a58c74b5ae50d78eac503c57b365a0 mod_php-4.3.3-r1.ebuild 4937
+MD5 a749b45c85593baff5f47e1575c2b7de mod_php-4.3.4-r3.ebuild 5306
+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 61a824c543e99cdb42650f4995b62859 mod_php-4.3.3-r3.ebuild 4985
+MD5 e8f6da390213b16ffdcdc4d374855719 mod_php-4.3.3-r3.ebuild 4977
 MD5 88dbd3f2adfe7f1c09fbee26bb20e5c7 mod_php-4.3.2-r1.ebuild 2759
-MD5 47806ff5e030101931a5e9d5cee70499 mod_php-4.3.4-r2.ebuild 5221
-MD5 36f926b023a0f8cd3caebb7fc10abb59 ChangeLog 24686
+MD5 5907cb67785251cb124a26dfabe43f2f mod_php-4.3.4-r2.ebuild 5214
+MD5 9bb7bd5bbee913b0b8038503465d21ea ChangeLog 25217
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 f72efb54e1262a9401817b6034bfd00c mod_php-4.3.2-r3.ebuild 4939
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
@@ -31,3 +32,5 @@ MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r2 137
 MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r3 137
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r1 137
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r2 137
+MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r3 137
+MD5 a2d8e8581e5d9c13cdc4b5997df05b9f files/mod_php-4.3.4-r3.diff 948
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.4-r3 b/dev-php/mod_php/files/digest-mod_php-4.3.4-r3
new file mode 100644
index 000000000000..d65ce9576341
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.4-r3
@@ -0,0 +1,2 @@
+MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/mod_php/files/mod_php-4.3.4-r3.diff b/dev-php/mod_php/files/mod_php-4.3.4-r3.diff
new file mode 100644
index 000000000000..018aacf62d8c
--- /dev/null
+++ b/dev-php/mod_php/files/mod_php-4.3.4-r3.diff
@@ -0,0 +1,24 @@
+--- sapi/apache/mod_php4.c.old	2004-01-31 21:44:55.000000000 +0000
++++ sapi/apache/mod_php4.c	2004-01-31 21:49:59.000000000 +0000
+@@ -822,6 +822,9 @@
+ 
+ 	if (!(r->finfo.st_mode & S_IXUSR)) {
+ 		r->allowed |= (1 << METHODS) - 1;
++		zend_try {
++			zend_ini_deactivate(TSRMLS_C);
++		} zend_end_try();
+ 		return DECLINED;
+ 	}
+ 	per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_module);
+--- sapi/apache2handler/sapi_apache2.c.old	2004-01-31 21:55:21.000000000 +0000
++++ sapi/apache2handler/sapi_apache2.c	2004-01-31 21:55:26.000000000 +0000
+@@ -465,6 +465,9 @@
+ 	if (strcmp(r->handler, PHP_MAGIC_TYPE) && strcmp(r->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(r->handler, PHP_SCRIPT)) {
+ 		/* Check for xbithack in this case. */
+ 		if (!AP2(xbithack) || strcmp(r->handler, "text/html") || !(r->finfo.protection & APR_UEXECUTE)) {
++			zend_try {
++				zend_ini_deactivate(TSRMLS_C);
++			} zend_end_try();
+ 			return DECLINED;
+ 		}
+ 	}
diff --git a/dev-php/mod_php/mod_php-4.3.3-r1.ebuild b/dev-php/mod_php/mod_php-4.3.3-r1.ebuild
index 9bc37d3064bc..bd7d91095015 100644
--- a/dev-php/mod_php/mod_php-4.3.3-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3-r1.ebuild
@@ -1,11 +1,11 @@
 # 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.3-r1.ebuild,v 1.7 2004/01/08 06:33:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r1.ebuild,v 1.8 2004/01/31 22:38:34 stuart Exp $
 
 IUSE="${IUSE} apache2"
 
 DESCRIPTION="Apache module for PHP"
-KEYWORDS="x86 ~sparc ~ppc ~alpha hppa ~amd64"
+KEYWORDS="x86 ~sparc ~ppc ~alpha hppa"
 EXCLUDE_DB4_FIX=1
 EXCLUDE_PEAR_FIX=1
 
diff --git a/dev-php/mod_php/mod_php-4.3.3-r2.ebuild b/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
index 5e6981ebc739..a3799a1f2bc5 100644
--- a/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3-r2.ebuild
@@ -1,11 +1,11 @@
 # 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.3-r2.ebuild,v 1.6 2004/01/08 06:33:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r2.ebuild,v 1.7 2004/01/31 22:38:34 stuart Exp $
 
 IUSE="${IUSE} apache2"
 
 DESCRIPTION="Apache module for PHP"
-KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa ~amd64"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-4.3.3-r3.ebuild b/dev-php/mod_php/mod_php-4.3.3-r3.ebuild
index 2c0564ba8f1d..3217519f04db 100644
--- a/dev-php/mod_php/mod_php-4.3.3-r3.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.3-r3.ebuild
@@ -1,11 +1,11 @@
 # 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.3-r3.ebuild,v 1.9 2004/01/10 18:24:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.3-r3.ebuild,v 1.10 2004/01/31 22:38:34 stuart Exp $
 
 IUSE="${IUSE} apache2"
 
 DESCRIPTION="Apache module for PHP"
-KEYWORDS="x86 sparc ~ppc alpha hppa ~amd64 ia64"
+KEYWORDS="x86 sparc ~ppc alpha hppa ia64"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-4.3.4-r1.ebuild b/dev-php/mod_php/mod_php-4.3.4-r1.ebuild
index 8f6c4d1ffece..ec27aa9f89cf 100644
--- a/dev-php/mod_php/mod_php-4.3.4-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.4-r1.ebuild
@@ -1,11 +1,11 @@
 # 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.4-r1.ebuild,v 1.5 2004/01/08 06:33:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r1.ebuild,v 1.6 2004/01/31 22:38:34 stuart Exp $
 
 IUSE="${IUSE} apache2"
 
 DESCRIPTION="Apache module for PHP"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~amd64"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-4.3.4-r2.ebuild b/dev-php/mod_php/mod_php-4.3.4-r2.ebuild
index e476645f4838..47a2a5a7461d 100644
--- a/dev-php/mod_php/mod_php-4.3.4-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.4-r2.ebuild
@@ -1,11 +1,11 @@
 # 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.4-r2.ebuild,v 1.9 2004/01/24 12:33:13 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r2.ebuild,v 1.10 2004/01/31 22:38:34 stuart Exp $
 
 IUSE="${IUSE} apache2"
 
 DESCRIPTION="Apache module for PHP"
-KEYWORDS="x86 sparc ~ppc alpha hppa amd64 ia64"
+KEYWORDS="x86 sparc ~ppc alpha hppa ia64"
 
 detectapache() {
 	local domsg=
diff --git a/dev-php/mod_php/mod_php-4.3.4-r3.ebuild b/dev-php/mod_php/mod_php-4.3.4-r3.ebuild
new file mode 100644
index 000000000000..51a63590c862
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.4-r3.ebuild
@@ -0,0 +1,173 @@
+# 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.4-r3.ebuild,v 1.1 2004/01/31 22:38:34 stuart Exp $
+
+IUSE="${IUSE} apache2"
+
+DESCRIPTION="Apache module for PHP"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~ia64"
+
+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
+
+	# 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-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/mod_php/mod_php-4.3.4.ebuild b/dev-php/mod_php/mod_php-4.3.4.ebuild
index 66a55bc461bb..a24302ea2ad4 100644
--- a/dev-php/mod_php/mod_php-4.3.4.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.4.ebuild
@@ -1,11 +1,11 @@
 # 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.4.ebuild,v 1.5 2004/01/08 06:33:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4.ebuild,v 1.6 2004/01/31 22:38:34 stuart Exp $
 
 IUSE="${IUSE} apache2"
 
 DESCRIPTION="Apache module for PHP"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~amd64"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa"
 
 detectapache() {
 	local domsg=