diff options
| author |   Sebastian Bergmann <sebastian@gentoo.org> | 2005-05-06 09:46:49 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@gentoo.org> | 2005-05-06 09:46:49 +0000 |
| commit | 213d92a24af7e4c11b6b4d2c3973353e10a1fcc2 (patch) | |
| tree | 7db66c2e507bdf5c2157f418c13bcd3650767eaf /dev-php/mod_php | |
| parent | Manual Manifest commit. (diff) | |
| download | historical-213d92a24af7e4c11b6b4d2c3973353e10a1fcc2.tar.gz historical-213d92a24af7e4c11b6b4d2c3973353e10a1fcc2.tar.bz2 historical-213d92a24af7e4c11b6b4d2c3973353e10a1fcc2.zip | |
Fix bug #88756.
Package-Manager: portage-2.0.51.21-r1
Diffstat (limited to 'dev-php/mod_php')
| -rw-r--r-- | dev-php/mod_php/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-php/mod_php/files/php-4.3.11-flash.patch | 25 | ||||
| -rw-r--r-- | dev-php/mod_php/mod_php-4.3.11-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-php/mod_php/mod_php-4.3.11-r2.ebuild | 5 | ||||
| -rw-r--r-- | dev-php/mod_php/mod_php-4.3.11.ebuild | 5 |
5 files changed, 43 insertions, 4 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index ca2698d1c00b..f198151fce0b 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.227 2005/05/06 09:14:06 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.228 2005/05/06 09:46:02 sebastian Exp $ + + 06 May 2005; Sebastian Bergmann <sebastian@gentoo.org> + +files/php-4.3.11-flash.patch, mod_php-4.3.11.ebuild, + mod_php-4.3.11-r1.ebuild, mod_php-4.3.11-r2.ebuild: + Fix bug #88756. 06 May 2005; Sebastian Bergmann <sebastian@gentoo.org> +files/php-4.3.11-gmp.patch, mod_php-4.3.11.ebuild, diff --git a/dev-php/mod_php/files/php-4.3.11-flash.patch b/dev-php/mod_php/files/php-4.3.11-flash.patch new file mode 100644 index 000000000000..9cda1b40ce9c --- /dev/null +++ b/dev-php/mod_php/files/php-4.3.11-flash.patch @@ -0,0 +1,25 @@ +--- ext/swf/swf.c.orig 2005-04-01 14:27:16.419352696 -0500 ++++ ext/swf/swf.c 2005-04-01 14:25:41.775740712 -0500 +@@ -240,7 +240,10 @@ PHP_FUNCTION(swf_openfile) + na = tmpna; + #endif + if (php_check_open_basedir(na TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(na, "wb+", CHECKUID_CHECK_MODE_PARAM))) { +- goto err; ++#ifdef VIRTUAL_DIR ++ free(na); ++#endif ++ return; + } + + if (!SWFG(use_file)) +@@ -249,10 +252,6 @@ PHP_FUNCTION(swf_openfile) + swf_openfile(na,(float)Z_DVAL_PP(sizeX), (float)Z_DVAL_PP(sizeY), + (float)Z_DVAL_PP(frameRate), (float)Z_DVAL_PP(r), + (float)Z_DVAL_PP(g), (float)Z_DVAL_PP(b)); +-err: +-#ifdef VIRTUAL_DIR +- free(na); +-#endif + } + /* }}} */ + 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 b63cae90b48d..2c62ba339d78 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.5 2005/05/06 09:14:06 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r1.ebuild,v 1.6 2005/05/06 09:46:03 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 88756 + use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch + # Bug 88795 use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch 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 085bc16dbee9..b13113db96f1 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.2 2005/05/06 09:14:06 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r2.ebuild,v 1.3 2005/05/06 09:46:03 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 88756 + use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch + # Bug 88795 use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch 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 ccda97e4590d..9d6b6897cf2b 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.11 2005/05/06 09:14:06 sebastian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11.ebuild,v 1.12 2005/05/06 09:46:03 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 88756 + use flash && epatch ${FILESDIR}/php-4.3.11-flash.patch + # Bug 88795 use gmp && epatch ${FILESDIR}/php-4.3.11-gmp.patch |