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 | |
parent | 3a5a5a3b60daa9f939e7761f8990e8956b5db1b3 (diff) | |
download | ports-205f1ac23dd674163b211b136715384d89c1bf4d.tar.gz ports-205f1ac23dd674163b211b136715384d89c1bf4d.zip |
Notes
-rw-r--r-- | devel/php52-pcre/files/patch-php_pcre.c | 21 | ||||
-rw-r--r-- | lang/php5/Makefile | 4 | ||||
-rw-r--r-- | lang/php5/files/patch-ext-pcre-php_pcre.c | 23 | ||||
-rw-r--r-- | lang/php52/Makefile | 2 | ||||
-rw-r--r-- | lang/php53/Makefile | 4 | ||||
-rw-r--r-- | lang/php53/files/patch-ext-pcre-php_pcre.c | 23 | ||||
-rw-r--r-- | math/freemat/Makefile | 4 | ||||
-rw-r--r-- | math/freemat/files/patch-libs__thirdparty__pcre__pcreposix.c | 12 | ||||
-rw-r--r-- | www/apache20/Makefile | 4 | ||||
-rw-r--r-- | www/apache20/files/patch-server__util_pcre.c | 4 | ||||
-rw-r--r-- | www/apache22/Makefile | 4 | ||||
-rw-r--r-- | www/apache22/files/patch-server__util_pcre.c | 12 | ||||
-rw-r--r-- | www/httest/Makefile | 3 | ||||
-rw-r--r-- | www/httest/files/patch-src-regex.c | 12 | ||||
-rw-r--r-- | www/hypermail/Makefile | 4 | ||||
-rw-r--r-- | www/hypermail/files/patch-src-pcre-pcreposix.c | 12 | ||||
-rw-r--r-- | www/hypermail/files/patch-src-pcre-pcretest.c | 27 |
17 files changed, 159 insertions, 16 deletions
diff --git a/devel/php52-pcre/files/patch-php_pcre.c b/devel/php52-pcre/files/patch-php_pcre.c index 4cab8e3aefaf..40036f9df98c 100644 --- a/devel/php52-pcre/files/patch-php_pcre.c +++ b/devel/php52-pcre/files/patch-php_pcre.c @@ -11,3 +11,24 @@ #include "php.h" #include "php_ini.h" #include "php_globals.h" +@@ -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 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 diff --git a/lang/php52/Makefile b/lang/php52/Makefile index 23c76f8f8fdb..a55469c40c96 100644 --- a/lang/php52/Makefile +++ b/lang/php52/Makefile @@ -7,7 +7,7 @@ PORTNAME= php52 PORTVERSION= 5.2.17 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 5fd82b465746..39404b778c5f 100644 --- a/lang/php53/Makefile +++ b/lang/php53/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/php53/files/patch-ext-pcre-php_pcre.c b/lang/php53/files/patch-ext-pcre-php_pcre.c new file mode 100644 index 000000000000..d51f255d15f4 --- /dev/null +++ b/lang/php53/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 diff --git a/math/freemat/Makefile b/math/freemat/Makefile index 77472ed68aeb..32ad006dadda 100644 --- a/math/freemat/Makefile +++ b/math/freemat/Makefile @@ -8,7 +8,7 @@ PORTNAME= FreeMat PORTVERSION= 4.0 DISTVERSIONSUFFIX= -Source -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math science MASTER_SITES= SF MASTER_SITE_SUBDIR= freemat/FreeMat4 @@ -20,7 +20,7 @@ MAINTAINER= glarkin@FreeBSD.org COMMENT= An environment for rapid engineering and scientific processing LIB_DEPENDS= lapack.4:${PORTSDIR}/math/lapack \ - pcre.0:${PORTSDIR}/devel/pcre + pcre.1:${PORTSDIR}/devel/pcre BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LICENSE= GPLv2 diff --git a/math/freemat/files/patch-libs__thirdparty__pcre__pcreposix.c b/math/freemat/files/patch-libs__thirdparty__pcre__pcreposix.c new file mode 100644 index 000000000000..fc1d28b76a56 --- /dev/null +++ b/math/freemat/files/patch-libs__thirdparty__pcre__pcreposix.c @@ -0,0 +1,12 @@ +--- libs/thirdparty/pcre/pcreposix.c.orig 2012-02-14 11:08:58.826982602 +0100 ++++ libs/thirdparty/pcre/pcreposix.c 2012-02-14 11:09:36.105982836 +0100 +@@ -238,7 +238,8 @@ + + if (preg->re_pcre == NULL) return eint[errorcode]; + +-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub)); + return 0; + } + diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 06a00c0c3995..93497863692d 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -9,7 +9,7 @@ PORTNAME= apache PORTVERSION= 2.0.64 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITE_LOCAL:S/$/:powerlogo/} @@ -23,7 +23,7 @@ MAINTAINER?= apache@FreeBSD.org COMMENT?= Version 2.0.x of Apache web server with ${WITH_MPM:L} MPM. LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - pcre.0:${PORTSDIR}/devel/pcre \ + pcre.1:${PORTSDIR}/devel/pcre \ apr-0:${PORTSDIR}/devel/apr0 MAKE_JOBS_SAFE= yes diff --git a/www/apache20/files/patch-server__util_pcre.c b/www/apache20/files/patch-server__util_pcre.c index fb610f1a8821..c47d1a4f1bbb 100644 --- a/www/apache20/files/patch-server__util_pcre.c +++ b/www/apache20/files/patch-server__util_pcre.c @@ -142,13 +142,13 @@ + +if (preg->re_pcre == NULL) return AP_REG_INVARG; + -+preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub)); +return 0; +} + + + -+ +/************************************************* +* Match a regular expression * +*************************************************/ diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 4f189f57460d..d2fa3b6f93df 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -9,7 +9,7 @@ PORTNAME= apache PORTVERSION= 2.2.22 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -20,7 +20,7 @@ COMMENT?= Version 2.2.x of Apache web server with ${WITH_MPM:L} MPM. LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ apr-1:${PORTSDIR}/devel/apr1 \ - pcre.0:${PORTSDIR}/devel/pcre + pcre.1:${PORTSDIR}/devel/pcre MAKE_JOBS_SAFE= yes diff --git a/www/apache22/files/patch-server__util_pcre.c b/www/apache22/files/patch-server__util_pcre.c new file mode 100644 index 000000000000..8950e56de897 --- /dev/null +++ b/www/apache22/files/patch-server__util_pcre.c @@ -0,0 +1,12 @@ +--- server/util_pcre.c.orig 2005-11-10 16:20:05.000000000 +0100 ++++ server/util_pcre.c 2012-02-13 23:11:17.898984171 +0100 +@@ -137,7 +137,8 @@ + + if (preg->re_pcre == NULL) return AP_REG_INVARG; + +-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub)); + return 0; + } + diff --git a/www/httest/Makefile b/www/httest/Makefile index 82c76007b4f0..8a1c19444927 100644 --- a/www/httest/Makefile +++ b/www/httest/Makefile @@ -7,6 +7,7 @@ PORTNAME= httest PORTVERSION= 2.1.12 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF MASTER_SITE_SUBDIR= htt/htt2.1/${PORTNAME}-${PORTVERSION} @@ -15,7 +16,7 @@ MAINTAINER= mm@FreeBSD.org COMMENT= HTTP Test Tool LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 \ - pcre.0:${PORTSDIR}/devel/pcre + pcre.1:${PORTSDIR}/devel/pcre LICENSE= AL2 diff --git a/www/httest/files/patch-src-regex.c b/www/httest/files/patch-src-regex.c new file mode 100644 index 000000000000..6536595245c9 --- /dev/null +++ b/www/httest/files/patch-src-regex.c @@ -0,0 +1,12 @@ +--- src/regex.c.orig 2012-02-14 10:50:10.169982096 +0100 ++++ src/regex.c 2012-02-14 10:51:09.360982595 +0100 +@@ -88,7 +88,8 @@ + if (preg->re_pcre == NULL) + return NULL; + +- preg->re_nsub = pcre_info((const pcre *) preg->re_pcre, NULL, NULL); ++ pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub)); + + apr_pool_cleanup_register(p, (void *) preg, regex_cleanup, + apr_pool_cleanup_null); diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile index 86c6c97dead0..9edebffc203e 100644 --- a/www/hypermail/Makefile +++ b/www/hypermail/Makefile @@ -7,7 +7,7 @@ PORTNAME= hypermail PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www mail MASTER_SITES= SF @@ -15,7 +15,7 @@ MAINTAINER= dan@langille.org COMMENT= A program to generate a cross-referenced HTML mail archive LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm \ - pcre.0:${PORTSDIR}/devel/pcre + pcre.1:${PORTSDIR}/devel/pcre GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-htmldir=${PREFIX}/share/doc/hypermail \ diff --git a/www/hypermail/files/patch-src-pcre-pcreposix.c b/www/hypermail/files/patch-src-pcre-pcreposix.c new file mode 100644 index 000000000000..415d4f4746fa --- /dev/null +++ b/www/hypermail/files/patch-src-pcre-pcreposix.c @@ -0,0 +1,12 @@ +--- src/pcre/pcreposix.c.orig 2003-07-03 20:04:06.000000000 +0200 ++++ src/pcre/pcreposix.c 2012-02-14 12:49:55.077985140 +0100 +@@ -217,7 +217,8 @@ + + if (preg->re_pcre == NULL) return pcre_posix_error_code(errorptr); + +-preg->re_nsub = pcre_info(preg->re_pcre, NULL, NULL); ++pcre_fullinfo((const pcre *)preg->re_pcre, NULL, ++ PCRE_INFO_CAPTURECOUNT, &(preg->re_nsub)); + return 0; + } + diff --git a/www/hypermail/files/patch-src-pcre-pcretest.c b/www/hypermail/files/patch-src-pcre-pcretest.c new file mode 100644 index 000000000000..389e9cb8e1b5 --- /dev/null +++ b/www/hypermail/files/patch-src-pcre-pcretest.c @@ -0,0 +1,27 @@ +--- src/pcre/pcretest.c.orig 2012-02-14 12:36:59.560983755 +0100 ++++ src/pcre/pcretest.c 2012-02-14 12:45:15.056415687 +0100 +@@ -748,24 +748,6 @@ + new_info(re, NULL, PCRE_INFO_NAMECOUNT, &namecount); + new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable); + +- old_count = pcre_info(re, &old_options, &old_first_char); +- if (count < 0) fprintf(outfile, +- "Error %d from pcre_info()\n", count); +- else +- { +- if (old_count != count) fprintf(outfile, +- "Count disagreement: pcre_fullinfo=%d pcre_info=%d\n", count, +- old_count); +- +- if (old_first_char != first_char) fprintf(outfile, +- "First char disagreement: pcre_fullinfo=%d pcre_info=%d\n", +- first_char, old_first_char); +- +- if (old_options != (int)get_options) fprintf(outfile, +- "Options disagreement: pcre_fullinfo=%ld pcre_info=%d\n", +- get_options, old_options); +- } +- + if (size != gotten_store) fprintf(outfile, + "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n", + size, gotten_store); |