Fix bug #88795.

(Portage version: 2.0.51.21-r1)

5 files changed, 47 insertions, 4 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 98465238257b..ca2698d1c00b 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.226 2005/05/04 23:43:18 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.227 2005/05/06 09:14:06 sebastian Exp $
+
+  06 May 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +files/php-4.3.11-gmp.patch, mod_php-4.3.11.ebuild,
+  mod_php-4.3.11-r1.ebuild, mod_php-4.3.11-r2.ebuild:
+  Fix bug #88795.
 
 *mod_php-5.0.4 (05 May 2005)
 
diff --git a/dev-php/mod_php/files/php-4.3.11-gmp.patch b/dev-php/mod_php/files/php-4.3.11-gmp.patch
new file mode 100644
index 000000000000..76d7b7b9d94e
--- /dev/null
+++ b/dev-php/mod_php/files/php-4.3.11-gmp.patch
@@ -0,0 +1,29 @@
+--- ext/gmp/gmp.c.orig	2005-03-01 14:18:31.000000000 +0100
++++ ext/gmp/gmp.c	2005-04-12 10:22:02.000000000 +0200
+@@ -205,7 +205,7 @@
+ if(Z_TYPE_PP(zval) == IS_RESOURCE) { \
+ 	ZEND_FETCH_RESOURCE(gmpnumber, mpz_t *, zval, -1, GMP_RESOURCE_NAME, le_gmp);\
+ } else {\
+-	if(convert_to_gmp(&gmpnumber, zval, 0) == FAILURE) {\
++	if(convert_to_gmp(&gmpnumber, zval, 0 TSRMLS_CC) == FAILURE) {\
+ 		RETURN_FALSE;\
+ 	}\
+ 	ZEND_REGISTER_RESOURCE(NULL, gmpnumber, le_gmp);\
+@@ -217,7 +217,7 @@
+ 
+ /* {{{ convert_to_gmp
+  * Convert zval to be gmp number */
+-static int convert_to_gmp(mpz_t * *gmpnumber, zval **val, int base) 
++static int convert_to_gmp(mpz_t * *gmpnumber, zval **val, int base TSRMLS_DC) 
+ {
+ 	int ret = 0;
+ 	int skip_lead = 0;
+@@ -509,7 +509,7 @@
+ 		}
+ 	}
+ 
+-	if(convert_to_gmp(&gmpnumber, number_arg, base) == FAILURE) {
++	if(convert_to_gmp(&gmpnumber, number_arg, base TSRMLS_CC) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+ 
diff --git a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
index 8b126ba00029..b63cae90b48d 100644
--- a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.11-r1.ebuild,v 1.4 2005/04/12 23:34:27 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r1.ebuild,v 1.5 2005/05/06 09:14:06 sebastian Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -89,6 +89,9 @@ src_unpack() {
 	# second revision as the apache2 stuff was resolved upstream
 	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
 
+	# Bug 88795
+	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
+
 	# 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
diff --git a/dev-php/mod_php/mod_php-4.3.11-r2.ebuild b/dev-php/mod_php/mod_php-4.3.11-r2.ebuild
index db2b4b0c4695..085bc16dbee9 100644
--- a/dev-php/mod_php/mod_php-4.3.11-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.11-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3.11-r2.ebuild,v 1.1 2005/04/13 01:20:04 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r2.ebuild,v 1.2 2005/05/06 09:14:06 sebastian Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -89,6 +89,9 @@ src_unpack() {
 	# second revision as the apache2 stuff was resolved upstream
 	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
 
+	# Bug 88795
+	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
+
 	# 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
diff --git a/dev-php/mod_php/mod_php-4.3.11.ebuild b/dev-php/mod_php/mod_php-4.3.11.ebuild
index 2a86955ca443..ccda97e4590d 100644
--- a/dev-php/mod_php/mod_php-4.3.11.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.11.ebuild
@@ -1,6 +1,6 @@
 # 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.3.11.ebuild,v 1.10 2005/04/25 00:51:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11.ebuild,v 1.11 2005/05/06 09:14:06 sebastian Exp $
 
 IUSE="${IUSE} apache2"
 
@@ -81,6 +81,9 @@ src_unpack() {
 	# second revision as the apache2 stuff was resolved upstream
 	epatch ${FILESDIR}/mod_php-4.3.5-apache1security.diff
 
+	# Bug 88795
+	use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch
+
 	# 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