wok-6.x rev 11053
Up: pcre to 8.13.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sun Oct 16 23:14:21 2011 +0000 (2011-10-16) |
parents | 1c0a598ad465 |
children | 594242fe0541 |
files | pcre-dev/receipt pcre/receipt pcre/stuff/r661.diff |
line diff
1.1 --- a/pcre-dev/receipt Sun Oct 16 23:12:55 2011 +0000 1.2 +++ b/pcre-dev/receipt Sun Oct 16 23:14:21 2011 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="pcre-dev" 1.7 -VERSION="8.12" 1.8 +VERSION="8.13" 1.9 CATEGORY="development" 1.10 SHORT_DESC="Perl Compatible Regular Expressions devel files." 1.11 MAINTAINER="pankso@slitaz.org"
2.1 --- a/pcre/receipt Sun Oct 16 23:12:55 2011 +0000 2.2 +++ b/pcre/receipt Sun Oct 16 23:14:21 2011 +0000 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="pcre" 2.7 -VERSION="8.12" 2.8 +VERSION="8.13" 2.9 CATEGORY="system-tools" 2.10 SHORT_DESC="Perl Compatible Regular Expressions." 2.11 MAINTAINER="pankso@slitaz.org" 2.12 @@ -13,6 +13,9 @@ 2.13 compile_rules() 2.14 { 2.15 cd $src 2.16 + # http://bugs.exim.org/show_bug.cgi?id=1136 2.17 + patch -Np2 -i $stuff/r661.diff 2.18 + sed -i '12140d' testdata/testoutput2 2.19 ./configure --enable-utf8 $CONFIGURE_ARGS && 2.20 make && make install 2.21 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/pcre/stuff/r661.diff Sun Oct 16 23:14:21 2011 +0000 3.3 @@ -0,0 +1,26 @@ 3.4 +--- code/trunk/pcre_compile.c 2011/08/02 11:00:40 654 3.5 ++++ code/trunk/pcre_compile.c 2011/08/21 09:00:54 661 3.6 +@@ -2295,8 +2295,13 @@ 3.7 + A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not. 3.8 + It seems that the appearance of a nested POSIX class supersedes an apparent 3.9 + external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or 3.10 +-a digit. Also, unescaped square brackets may also appear as part of class 3.11 +-names. For example, [:a[:abc]b:] gives unknown class "[:abc]b:]"in Perl. 3.12 ++a digit. 3.13 ++ 3.14 ++In Perl, unescaped square brackets may also appear as part of class names. For 3.15 ++example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for 3.16 ++[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not 3.17 ++seem right at all. PCRE does not allow closing square brackets in POSIX class 3.18 ++names. 3.19 + 3.20 + Arguments: 3.21 + ptr pointer to the initial [ 3.22 +@@ -2314,6 +2319,7 @@ 3.23 + { 3.24 + if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) 3.25 + ptr++; 3.26 ++ else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE; 3.27 + else 3.28 + { 3.29 + if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)