diff options
| author | Michael Mason <ms13sp@gmail.com> | 2010-03-17 17:43:41 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2010-03-17 17:43:41 +0000 |
| commit | 4b23d4dfa33b09440ffbdfccbd46571649ccecaa (patch) | |
| tree | 02c3b507f3e038c1e191fa97d59562b468e64b65 /main/php | |
| parent | e59a787cc0775b8f7f97d492674a257baef45f6d (diff) | |
| parent | 192b8fad759488bbe2fea1b43acda638eb6ebe85 (diff) | |
| download | aports-4b23d4dfa33b09440ffbdfccbd46571649ccecaa.tar.bz2 aports-4b23d4dfa33b09440ffbdfccbd46571649ccecaa.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'main/php')
| -rw-r--r-- | main/php/APKBUILD | 12 | ||||
| -rw-r--r-- | main/php/zend_execute_API.c.patch | 10 |
2 files changed, 17 insertions, 5 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD index 25689cc242..1b72cc3098 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=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" @@ -240,5 +241,6 @@ 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 +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]); |