diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-02-14 12:44:23 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-02-14 12:44:23 +0000 |
| commit | 205f1ac23dd674163b211b136715384d89c1bf4d (patch) | |
| tree | 9c81baefcee3d377ac0c3395066592b349bb4959 /lang/php5 | |
| parent | Proc::SafeExec provides an easy, safe way to execute external programs. It (diff) | |
Bump pcre library dependency due to 8.30 update
Add (vendor) patch for deprecated pcre_info()
Notes
Notes:
svn path=/head/; revision=291337
Diffstat (limited to 'lang/php5')
| -rw-r--r-- | lang/php5/Makefile | 4 | ||||
| -rw-r--r-- | lang/php5/files/patch-ext-pcre-php_pcre.c | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 5fd82b465746..39404b778c5f 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -7,7 +7,7 @@ PORTNAME= php5 PORTVERSION= 5.3.10 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions @@ -23,7 +23,7 @@ MAKE_JOBS_SAFE= yes .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS= pcre.1:${PORTSDIR}/devel/pcre CONFIGURE_ARGS= \ --with-layout=GNU \ diff --git a/lang/php5/files/patch-ext-pcre-php_pcre.c b/lang/php5/files/patch-ext-pcre-php_pcre.c new file mode 100644 index 000000000000..d51f255d15f4 --- /dev/null +++ b/lang/php5/files/patch-ext-pcre-php_pcre.c @@ -0,0 +1,23 @@ +--- ext/pcre/php_pcre.c 2012/01/01 13:15:04 321634 ++++ ext/pcre/php_pcre.c 2012/02/06 18:18:53 323097 +@@ -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 +253,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 |