From 9eb2b49fd4ab266c1a1c9a495d3e189b82323a8d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 12 Mar 2010 12:49:08 +0000
Subject: main/php: upgrade to 5.3.2

---
 main/php/APKBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'main/php')

diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 25689cc242..34a5c77971 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=php
-pkgver=5.3.1
-_suhosinver=${pkgver}-0.9.8
-pkgrel=5
+pkgver=5.3.2
+_suhosinver=${pkgver}-0.9.9.1
+pkgrel=0
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
@@ -240,5 +240,5 @@ dev() {
 	mv "$pkgdir"/usr/bin/phpize "$subpkgdir"/usr/bin/
 }
 
-md5sums="63e97ad450f0f7259e785100b634c797  php-5.3.1.tar.bz2
-bf75fe3a9bda8c7a041d86197d6da09a  suhosin-patch-5.3.1-0.9.8.patch.gz"
+md5sums="46f500816125202c48a458d0133254a4  php-5.3.2.tar.bz2
+4647b05330862d6a1fc4469245cc6ade  suhosin-patch-5.3.2-0.9.9.1.patch.gz"
-- 
cgit v1.2.3


From 86f5dd8f22d0f1d0285888865861703ea51725e3 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 17 Mar 2010 10:06:46 +0000
Subject: main/php: apply upstream patch to fix issue that affects mediawiki

Mediawiki page has it on download page
http://www.mediawiki.org/w/index.php?title=Download&oldid=308208

References:
http://www.mwusers.com/forums/showthread.php?14371-ConfirmEdit-and-reCaptcha-extensions-cause-Internal-Errors
http://bugs.php.net/bug.php?id=50394
---
 main/php/APKBUILD                 |  6 ++++--
 main/php/zend_execute_API.c.patch | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 main/php/zend_execute_API.c.patch

(limited to 'main/php')

diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 34a5c77971..1b72cc3098 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=php
 pkgver=5.3.2
 _suhosinver=${pkgver}-0.9.9.1
-pkgrel=0
+pkgrel=1
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 license="PHP-3"
@@ -63,6 +63,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-cli
 
 source="http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2
         http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz
+	zend_execute_API.c.patch
 	"
 
 _extdir="/usr/lib/php/20090626"
@@ -241,4 +242,5 @@ dev() {
 }
 
 md5sums="46f500816125202c48a458d0133254a4  php-5.3.2.tar.bz2
-4647b05330862d6a1fc4469245cc6ade  suhosin-patch-5.3.2-0.9.9.1.patch.gz"
+4647b05330862d6a1fc4469245cc6ade  suhosin-patch-5.3.2-0.9.9.1.patch.gz
+55f9d24316a57e0c0f6b4b84791a1a17  zend_execute_API.c.patch"
diff --git a/main/php/zend_execute_API.c.patch b/main/php/zend_execute_API.c.patch
new file mode 100644
index 0000000000..0976a7b391
--- /dev/null
+++ b/main/php/zend_execute_API.c.patch
@@ -0,0 +1,10 @@
+--- PHP_5_3/Zend/zend_execute_API.c	2009/12/18 18:41:53	292294
++++ PHP_5_3/Zend/zend_execute_API.c	2009/12/18 19:12:11	292295
+@@ -838,6 +838,7 @@
+ 		zval *param;
+ 
+ 		if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION 
++			&& (EX(function_state).function->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) == 0 
+ 			&& !ARG_SHOULD_BE_SENT_BY_REF(EX(function_state).function, i + 1)
+ 			&& PZVAL_IS_REF(*fci->params[i])) {
+ 			SEPARATE_ZVAL(fci->params[i]);
-- 
cgit v1.2.3