diff options
| author | root <root@rshg054.dnsready.net> | 2012-02-09 23:14:54 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-02-09 23:14:54 +0000 |
| commit | 4bc61018eec54dbe50e7556ce01d2ef2859b2c9f (patch) | |
| tree | 3ea5705a573fd320639395f484fc12335e0a1b88 /testing/php | |
| parent | 54b7119c36756b86ea463649ee972cd6c1ce5863 (diff) | |
Thu Feb 9 23:14:54 UTC 2012
Diffstat (limited to 'testing/php')
| -rw-r--r-- | testing/php/PKGBUILD | 11 | ||||
| -rw-r--r-- | testing/php/pcre_info.patch | 43 |
2 files changed, 50 insertions, 4 deletions
diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD index 5ad593b08..8b5285ca1 100644 --- a/testing/php/PKGBUILD +++ b/testing/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148508 2012-02-02 21:31:10Z pierre $ +# $Id: PKGBUILD 149679 2012-02-08 23:59:58Z allan $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -23,7 +23,7 @@ pkgname=('php' 'php-xsl') pkgver=5.3.10 _suhosinver=5.3.9-0.9.10 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -35,7 +35,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm') + 'logrotate.d.php-fpm' 'pcre_info.patch') md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' 'c099b3d7eac95018ababd41ded7f3066' 'c15d18f846be1d69144a5d0056ee6506' @@ -43,7 +43,8 @@ md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' '740ec5fe2ecfd9d7febd4081c90ec65b' - '07c4e412909ac65a44ec90e7a2c4bade') + '07c4e412909ac65a44ec90e7a2c4bade' + '8d3806bbb19e390f9b32ccf21611d937') build() { phpconfig="--srcdir=../${pkgbase}-${pkgver} \ @@ -136,6 +137,8 @@ build() { cd ${srcdir}/${pkgbase}-${pkgver} + patch -p1 -i ${srcdir}/pcre_info.patch + # apply suhosin patch patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch diff --git a/testing/php/pcre_info.patch b/testing/php/pcre_info.patch new file mode 100644 index 000000000..e6d10df06 --- /dev/null +++ b/testing/php/pcre_info.patch @@ -0,0 +1,43 @@ +--- php-5.3.10/ext/pcre/php_pcre.c 2012-01-01 14:15:04.000000000 +0100 ++++ php-5.3.10/ext/pcre/php_pcre.c 2012-02-06 13:31:36.198935107 +0100 +@@ -241,6 +241,7 @@ + char *pattern; + int do_study = 0; + int poptions = 0; ++ int count = 0; + unsigned const char *tables = NULL; + #if HAVE_SETLOCALE + char *locale = setlocale(LC_CTYPE, NULL); +@@ -252,10 +252,10 @@ + back the compiled pattern, otherwise go on and compile it. */ + if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) { + /* +- * We use a quick pcre_info() check to see whether cache is corrupted, and if it ++ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it + * is, we flush it and compile the pattern from scratch. + */ +- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) { ++ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) { + zend_hash_clean(&PCRE_G(pcre_cache)); + } else { + #if HAVE_SETLOCALE +--- php-5.3.10/ext/pcre/php_pcre.def 2009-01-11 14:59:00.000000000 +0100 ++++ php-5.3.10/ext/pcre/php_pcre.def 2012-02-06 13:31:47.775299315 +0100 +@@ -4,7 +4,6 @@ + php_pcre_exec + php_pcre_get_substring + php_pcre_get_substring_list +-php_pcre_info + php_pcre_maketables + php_pcre_study + php_pcre_version +--- php-5.3.10/main/php_compat.h 2012-01-01 14:15:04.000000000 +0100 ++++ php-5.3.10/main/php_compat.h 2012-02-06 13:26:59.272834580 +0100 +@@ -34,7 +34,6 @@ + #define pcre_exec php_pcre_exec + #define pcre_get_substring php_pcre_get_substring + #define pcre_get_substring_list php_pcre_get_substring_list +-#define pcre_info php_pcre_info + #define pcre_maketables php_pcre_maketables + #define pcre_study php_pcre_study + #define pcre_version php_pcre_version |