[patch] Silly fix for PHP 4.3.5.

patch.txt (text/plain), 8.66 KB, created by Shawn Holwegner on 2004-03-29 01:20:39 UTC

diff -urN mod_php.old/ChangeLog mod_php/ChangeLog
--- mod_php.old/ChangeLog	2004-03-29 01:09:57.146021688 -0800
+++ mod_php/ChangeLog	2004-03-29 01:11:58.234613424 -0800
@@ -1,9 +1,12 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /home/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.130 2004/03/29 00:05:16 stuart Exp $
+# $Header: /home/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.130 2004/03/29 01:11:04 shawm Exp $
 
 *mod_php-4.3.5 (29 Mar 2004)
 
+  29 Mar 2004; Shawn Holwegner <[e-mail]> mod_php-4.3.5-r1.ebuild
+  Fixed trivial patch to work with Apache 1; Apache 2 patches outdated.
+
   29 Mar 2004; Stuart Herbert <[e-mail]> mod_php-4.3.5.ebuild:
   Version bump
 
diff -urN mod_php.old/Manifest mod_php/Manifest
--- mod_php.old/Manifest	2004-03-29 01:10:12.374706576 -0800
+++ mod_php/Manifest	2004-03-29 01:09:48.196382240 -0800
@@ -17,6 +17,7 @@
 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 811254b2df5489879b1abe5d95c066c2 mod_php-4.3.5-r1.ebuild
 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
@@ -36,6 +37,7 @@
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r2 137
 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r3 137
 MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717
+MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5.diff
 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 -urN mod_php.old/files/digest-mod_php-4.3.5-r1 mod_php/files/digest-mod_php-4.3.5-r1
--- mod_php.old/files/digest-mod_php-4.3.5-r1	1969-12-31 16:00:00.000000000 -0800
+++ mod_php/files/digest-mod_php-4.3.5-r1	2004-03-29 01:09:48.205380872 -0800
@@ -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 -urN mod_php.old/files/mod_php-4.3.5.diff mod_php/files/mod_php-4.3.5.diff
--- mod_php.old/files/mod_php-4.3.5.diff	1969-12-31 16:00:00.000000000 -0800
+++ mod_php/files/mod_php-4.3.5.diff	2004-03-29 01:09:48.199381784 -0800
@@ -0,0 +1,12 @@
+--- php-4.3.5/sapi/apache/mod_php4.c.old	2004-01-31 21:44:55.000000000 +0000
++++ php-4.3.5/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);
diff -urN mod_php.old/mod_php-4.3.5-r1.ebuild mod_php/mod_php-4.3.5-r1.ebuild
--- mod_php.old/mod_php-4.3.5-r1.ebuild	1969-12-31 16:00:00.000000000 -0800
+++ mod_php/mod_php-4.3.5-r1.ebuild	2004-03-29 01:13:35.650803912 -0800
@@ -0,0 +1,177 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /home/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.5.ebuild,v 1.1 2004/03/29 01:11:16 shawn 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.5.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
+}