Change mod_php-4.4.0.ebuild to use the old Apache layout, thus allowing it to become stable. mod_php-4.4.0-r1.ebuild uses the new Apache layout and is supposed to stay in unstable until the new Apache layout goes into stable.

(Portage version: 2.0.51.22-r1)

5 files changed, 259 insertions, 53 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 37bf2309eb07..fb8675e96ca7 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.249 2005/07/11 15:40:01 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.250 2005/07/12 07:26:34 sebastian Exp $
+
+*mod_php-4.4.0-r1 (12 Jul 2005)
+
+  12 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  mod_php-4.4.0.ebuild, +mod_php-4.4.0-r1.ebuild:
+  Change mod_php-4.4.0.ebuild to use the old Apache layout, thus allowing it
+  to become stable. mod_php-4.4.0-r1.ebuild uses the new Apache layout and is
+  supposed to stay in unstable until the new Apache layout goes into stable.
 
   11 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
   files/digest-mod_php-4.4.0, Manifest:
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 79e3703d43ea..22ba36d03fe9 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,24 +1,26 @@
-MD5 feaa74d1703a6d658ec5e2b9257b2928 ChangeLog 43286
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 1704d647cb88a92adebed33f10d3f31b mod_php-4.4.0.ebuild 6283
+MD5 615448ba5839cec9e20d260c9449b2a5 mod_php-4.4.0.ebuild 6077
 MD5 bc61d0a7ca0fa2b489073275c1cb9d28 mod_php-5.1.0_beta-r1.ebuild 2431
+MD5 1704d647cb88a92adebed33f10d3f31b mod_php-4.4.0-r1.ebuild 6283
 MD5 2b6e8a15d7fd5d82d50db473856a5333 mod_php-4.3.11.ebuild 6203
 MD5 b91268f902ce021485b29c4fbc7d1e45 mod_php-5.0.4.ebuild 2408
-MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
-MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
-MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0 285
-MD5 4efe4b530f5c86d8d9252a414ecd5abe files/digest-mod_php-5.1.0_beta-r1 65
+MD5 db7941bde3e908459b5ab83528d41b16 ChangeLog 43659
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
-MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
-MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850
 MD5 225b57325cbdf582288a8796da9d72f5 files/digest-mod_php-4.3.11 287
+MD5 4efe4b530f5c86d8d9252a414ecd5abe files/digest-mod_php-5.1.0_beta-r1 65
+MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
+MD5 058042718bc876bf27ab902673919ca9 files/php5-prefork.patch 850
+MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0 285
 MD5 74a728966bc5ec6d37ad89f4182ee135 files/digest-mod_php-5.0.4 143
-MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
-MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
+MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
 MD5 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
+MD5 80c45eef4f54629e893249f869cff5c6 files/70_mod_php5.conf 484
+MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0-r1 285
+MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
+MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536
 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
 MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
-MD5 60cfe0c621237790195bafe595ddcbee files/5.0.4/70_mod_php5.conf 536
diff --git a/dev-php/mod_php/files/digest-mod_php-4.4.0-r1 b/dev-php/mod_php/files/digest-mod_php-4.4.0-r1
new file mode 100644
index 000000000000..fe5e22bcebde
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.4.0-r1
@@ -0,0 +1,4 @@
+MD5 e85b606fe48198bfcd785e5a5b1c9613 php-4.4.0.tar.bz2 4086074
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
+MD5 fbb6b365f4c0263b1dfd498aef092a77 php-4.3.6-includepath.diff 285
+MD5 0a52b85692ebbc299e6b1f6d9d206691 hardening-patch-4.4.0-0.3.2.patch.gz 33347
diff --git a/dev-php/mod_php/mod_php-4.4.0-r1.ebuild b/dev-php/mod_php/mod_php-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..b66aa46dbc64
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.4.0-r1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0-r1.ebuild,v 1.1 2005/07/12 07:26:34 sebastian Exp $
+
+IUSE="${IUSE} apache2"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+
+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}"
+SRC_URI_BASE="http://downloads.php.net/ilia/" # for RC only
+
+# 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 apache-module flag-o-matic
+
+DESCRIPTION="Apache module for PHP"
+
+DEPEND_EXTRA=">=net-www/apache-1.3.33-r10
+			  apache2? ( >=net-www/apache-2.0.54-r10 )"
+DEPEND="${DEPEND} ${DEPEND_EXTRA}"
+RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
+IUSE="${IUSE} debug"
+# for this revision only
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
+PROVIDE="${PROVIDE} virtual/httpd-php"
+
+# generalize some apache{,2} vars (defined by apache-module.eclass)
+if [ -n ${USE_APACHE2} ]; then
+	APACHE_MODULESDIR=${APACHE2_MODULESDIR}
+	APACHE_CONFDIR=${APACHE2_CONFDIR}
+else
+	APACHE_MODULESDIR=${APACHE_MODULESDIR}
+	APACHE_CONFDIR=${APACHE_CONFDIR}
+fi
+
+# 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
+}
+
+setup_environ() {
+	append-flags `apr-config --cppflags --cflags`
+}
+
+src_compile() {
+	setup_environ
+
+	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
+	if [ -n "${USE_APACHE2}" ]; then
+		APACHE2_MPM="`/usr/sbin/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 ${APACHE_CONFDIR}
+	dodir ${PHPINIDIRECTORY}
+	dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE_CONFDIR}/${PHPINIFILENAME}
+
+	einfo "Cleaning up a little"
+	rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so
+
+	einfo "Adding symlink to Apache${USE_APACHE2} modules for PHP"
+	dosym ${APACHE_MODULESDIR} ${PHPINIDIRECTORY}/lib
+	exeinto ${APACHE_MODULESDIR}
+
+	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 ${APACHE2_MODULES_CONFDIR}
+		doins "${FILESDIR}/4.3.11-r2/70_mod_php.conf"
+	else
+		einfo "Installing a Apache config for PHP (mod_php.conf)"
+		insinto ${APACHE1_MODULES_CONFDIR}
+		doins ${FILESDIR}/mod_php.conf
+		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE1_MODULES_CONFDIR}/${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/apache.conf \
+			modules/libphp4.so mod_php4.c php4_module \
+			before=perl define=PHP4 addconf=addon-modules/mod_php.conf
+			:;
+	fi
+}
diff --git a/dev-php/mod_php/mod_php-4.4.0.ebuild b/dev-php/mod_php/mod_php-4.4.0.ebuild
index d988780ae415..2a9606f3ee85 100644
--- a/dev-php/mod_php/mod_php-4.4.0.ebuild
+++ b/dev-php/mod_php/mod_php-4.4.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0.ebuild,v 1.2 2005/07/12 03:59:23 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0.ebuild,v 1.3 2005/07/12 07:26:34 sebastian Exp $
 
 IUSE="${IUSE} apache2"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 detectapache() {
 	local domsg=
@@ -49,28 +49,20 @@ SRC_URI_BASE="http://downloads.php.net/ilia/" # for RC only
 # 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 apache-module flag-o-matic
+inherit php-sapi eutils
 
 DESCRIPTION="Apache module for PHP"
 
-DEPEND_EXTRA=">=net-www/apache-1.3.33-r10
-			  apache2? ( >=net-www/apache-2.0.54-r10 )"
+DEPEND_EXTRA=">=net-www/apache-1.3.26-r2
+			  apache2? ( >=net-www/apache-2.0.43-r1
+			            !>=net-www/apache-2.0.54-r10 )"
 DEPEND="${DEPEND} ${DEPEND_EXTRA}"
 RDEPEND="${RDEPEND} ${DEPEND_EXTRA}"
 IUSE="${IUSE} debug"
 # for this revision only
-PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.10"
+PDEPEND=">=${PHP_PROVIDER_PKG}-4.3.11"
 PROVIDE="${PROVIDE} virtual/httpd-php"
 
-# generalize some apache{,2} vars (defined by apache-module.eclass)
-if [ -n ${USE_APACHE2} ]; then
-	APACHE_MODULESDIR=${APACHE2_MODULESDIR}
-	APACHE_CONFDIR=${APACHE2_CONFDIR}
-else
-	APACHE_MODULESDIR=${APACHE_MODULESDIR}
-	APACHE_CONFDIR=${APACHE_CONFDIR}
-fi
-
 # Add a 'return 0' as we DON'T want the return code checked
 pkg_setup() {
 	use debug && einfo "Installing in SLOT=${SLOT}"
@@ -95,16 +87,10 @@ src_unpack() {
 	done
 }
 
-setup_environ() {
-	append-flags `apr-config --cppflags --cflags`
-}
-
 src_compile() {
-	setup_environ
-
 	# Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety
 	if [ -n "${USE_APACHE2}" ]; then
-		APACHE2_MPM="`/usr/sbin/apache2 -l | egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`"
+		APACHE2_MPM="`/usr/sbin/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*) ;;
@@ -118,34 +104,32 @@ src_compile() {
 	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 ${APACHE_CONFDIR}
+	dodir /etc/apache${USE_APACHE2}/conf/
 	dodir ${PHPINIDIRECTORY}
-	dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE_CONFDIR}/${PHPINIFILENAME}
+	dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache${USE_APACHE2}/conf/${PHPINIFILENAME}
 
 	einfo "Cleaning up a little"
-	rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so
-
-	einfo "Adding symlink to Apache${USE_APACHE2} modules for PHP"
-	dosym ${APACHE_MODULESDIR} ${PHPINIDIRECTORY}/lib
-	exeinto ${APACHE_MODULESDIR}
-
+	rm -rf ${D}/usr/lib/apache${USE_APACHE2}/modules/libphp4.so
+	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 ${APACHE2_MODULES_CONFDIR}
-		doins "${FILESDIR}/4.3.11-r2/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 ${APACHE1_MODULES_CONFDIR}
+		insinto /etc/apache/conf/addon-modules
 		doins ${FILESDIR}/mod_php.conf
-		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE1_MODULES_CONFDIR}/${PHPINIFILENAME}
+		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${PHPINIFILENAME}
 	fi
 }
 
@@ -200,9 +184,9 @@ pkg_config() {
 		apache2msg
 	else
 		${ROOT}/usr/sbin/apacheaddmod \
-			${ROOT}/etc/apache/apache.conf \
-			modules/libphp4.so mod_php4.c php4_module \
-			before=perl define=PHP4 addconf=addon-modules/mod_php.conf
+			${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
 }