Fix bug #88756.

(Portage version: 2.0.51.21-r1)

12 files changed, 113 insertions, 19 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
 
diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index c9847c1de1c1..d8dabfa5ad40 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.64 2005/05/06 09:10:39 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.65 2005/05/06 09:46:49 sebastian Exp $
+
+  06 May 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +files/php-4.3.11-flash.patch, php-cgi-4.3.11.ebuild:
+  Fix bug #88756.
 
   06 May 2005; Sebastian Bergmann <sebastian@gentoo.org>
   +files/php-4.3.11-gmp.patch, php-cgi-4.3.11.ebuild:
diff --git a/dev-php/php-cgi/files/php-4.3.11-flash.patch b/dev-php/php-cgi/files/php-4.3.11-flash.patch
new file mode 100644
index 000000000000..9cda1b40ce9c
--- /dev/null
+++ b/dev-php/php-cgi/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/php-cgi/php-cgi-4.3.11.ebuild b/dev-php/php-cgi/php-cgi-4.3.11.ebuild
index 6a086c499546..3b3c734c1449 100644
--- a/dev-php/php-cgi/php-cgi-4.3.11.ebuild
+++ b/dev-php/php-cgi/php-cgi-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/php-cgi/php-cgi-4.3.11.ebuild,v 1.9 2005/05/06 09:10:39 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.11.ebuild,v 1.10 2005/05/06 09:46:49 sebastian Exp $
 
 PHPSAPI="cgi"
 inherit php-sapi eutils
@@ -16,6 +16,9 @@ PROVIDE="${PROVIDE} virtual/httpd-php-${PV}"
 src_unpack() {
 	php-sapi_src_unpack
 
+	# 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/php/ChangeLog b/dev-php/php/ChangeLog
index facaeec8f280..8c582b663bbf 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.154 2005/05/06 09:09:45 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.155 2005/05/06 09:44:27 sebastian Exp $
+
+  06 May 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +files/php-4.3.11-flash.patch, php-4.3.11.ebuild:
+  Fix bug #88756.
 
   06 May 2005; Sebastian Bergmann <sebastian@gentoo.org>
   +files/php-4.3.11-gmp.patch, php-4.3.11.ebuild:
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index cd1957e6e1c3..818a84ce4c08 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fbba8d77e8712b6026b0815967281540 php-4.3.10.ebuild 1137
 MD5 dab26470d59fb70ae71e4f2f34fa6036 php-5.0.3-r1.ebuild 801
 MD5 a477b4bbabe5481c1f3ce596a407201a php-5.0.1.ebuild 540
@@ -8,7 +5,7 @@ MD5 6518027f5a5facef0ca800bfae5774bd php-5.0.3.ebuild 753
 MD5 97c1b04653195a69b39505b7f4ea9206 php-5.0.2-r1.ebuild 595
 MD5 1d25a66511eb4e2ed454554525f21139 php-5.0.0.ebuild 520
 MD5 35529685a3e1830ead5cacfad90c737b php-4.3.9.ebuild 1076
-MD5 3e9b1f759f22dfdc467030963c578578 php-4.3.11.ebuild 1147
+MD5 140f5f5024f8a58951b2e4207be45abf php-4.3.11.ebuild 1217
 MD5 8ae4ced093c22d77265dc452f24ee631 php-4.3.9_rc1.ebuild 1135
 MD5 bb72d15f50c43726d3e53dc821addf2b php-5.0.2.ebuild 557
 MD5 7ec1793534bc9febfe5a6ad9b6f6315a ChangeLog 20869
@@ -34,10 +31,4 @@ MD5 89a3a3b437e24b7ccc044376843d8446 files/digest-php-5.0.3 63
 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
 MD5 541741db181f5a324ab6061ffd2ac424 files/digest-php-4.3.10 132
 MD5 8182230ef883009b51552da518ea4103 files/digest-php-4.3.11 132
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCezRoaGfFFLhbXWkRAraXAJ4tfWOzUpTnS5Xx4gHv5v5tBIbROwCfVcTd
-tADB1l/wyGyhybpesLuPmPo=
-=Ft1+
------END PGP SIGNATURE-----
+MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
diff --git a/dev-php/php/files/php-4.3.11-flash.patch b/dev-php/php/files/php-4.3.11-flash.patch
new file mode 100644
index 000000000000..9cda1b40ce9c
--- /dev/null
+++ b/dev-php/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/php/php-4.3.11.ebuild b/dev-php/php/php-4.3.11.ebuild
index 7ce7e39bcb6c..1bf8280600da 100644
--- a/dev-php/php/php-4.3.11.ebuild
+++ b/dev-php/php/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/php/php-4.3.11.ebuild,v 1.11 2005/05/06 09:09:46 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.11.ebuild,v 1.12 2005/05/06 09:44:27 sebastian Exp $
 
 PHPSAPI="cli"
 inherit php-sapi eutils
@@ -14,6 +14,9 @@ src_unpack() {
 	php-sapi_src_unpack
 	[ "${ARCH}" == "amd64" ] && epatch ${FILESDIR}/php-4.3.4-amd64hack.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
 }