# HG changeset patch # User Christopher Rogers # Date 1318806861 0 # Node ID 98b056351a5486fcd4a5dc9c6cdd6b2a90435df8 # Parent 1c0a598ad465faaf2b81256469ab276dc116d679 Up: pcre to 8.13. diff -r 1c0a598ad465 -r 98b056351a54 pcre-dev/receipt --- a/pcre-dev/receipt Sun Oct 16 23:12:55 2011 +0000 +++ b/pcre-dev/receipt Sun Oct 16 23:14:21 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="pcre-dev" -VERSION="8.12" +VERSION="8.13" CATEGORY="development" SHORT_DESC="Perl Compatible Regular Expressions devel files." MAINTAINER="pankso@slitaz.org" diff -r 1c0a598ad465 -r 98b056351a54 pcre/receipt --- a/pcre/receipt Sun Oct 16 23:12:55 2011 +0000 +++ b/pcre/receipt Sun Oct 16 23:14:21 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="pcre" -VERSION="8.12" +VERSION="8.13" CATEGORY="system-tools" SHORT_DESC="Perl Compatible Regular Expressions." MAINTAINER="pankso@slitaz.org" @@ -13,6 +13,9 @@ compile_rules() { cd $src + # http://bugs.exim.org/show_bug.cgi?id=1136 + patch -Np2 -i $stuff/r661.diff + sed -i '12140d' testdata/testoutput2 ./configure --enable-utf8 $CONFIGURE_ARGS && make && make install } diff -r 1c0a598ad465 -r 98b056351a54 pcre/stuff/r661.diff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pcre/stuff/r661.diff Sun Oct 16 23:14:21 2011 +0000 @@ -0,0 +1,26 @@ +--- code/trunk/pcre_compile.c 2011/08/02 11:00:40 654 ++++ code/trunk/pcre_compile.c 2011/08/21 09:00:54 661 +@@ -2295,8 +2295,13 @@ + A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not. + It seems that the appearance of a nested POSIX class supersedes an apparent + external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or +-a digit. Also, unescaped square brackets may also appear as part of class +-names. For example, [:a[:abc]b:] gives unknown class "[:abc]b:]"in Perl. ++a digit. ++ ++In Perl, unescaped square brackets may also appear as part of class names. For ++example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for ++[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not ++seem right at all. PCRE does not allow closing square brackets in POSIX class ++names. + + Arguments: + ptr pointer to the initial [ +@@ -2314,6 +2319,7 @@ + { + if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) + ptr++; ++ else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE; + else + { + if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)