# HG changeset patch # User Christopher Rogers # Date 1320279251 0 # Node ID ce9eff8c45099aea40d9e7524bfcda5be3acc932 # Parent 6e5bc54eeaebeebbe920c459ee13965c3106430f Up: pcre to 8.20. diff -r 6e5bc54eeaeb -r ce9eff8c4509 pcre-dev/receipt --- a/pcre-dev/receipt Thu Nov 03 00:12:09 2011 +0000 +++ b/pcre-dev/receipt Thu Nov 03 00:14:11 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="pcre-dev" -VERSION="8.13" +VERSION="8.20" CATEGORY="development" SHORT_DESC="Perl Compatible Regular Expressions devel files." MAINTAINER="pankso@slitaz.org" diff -r 6e5bc54eeaeb -r ce9eff8c4509 pcre/receipt --- a/pcre/receipt Thu Nov 03 00:12:09 2011 +0000 +++ b/pcre/receipt Thu Nov 03 00:14:11 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="pcre" -VERSION="8.13" +VERSION="8.20" CATEGORY="system-tools" SHORT_DESC="Perl Compatible Regular Expressions." MAINTAINER="pankso@slitaz.org" @@ -13,9 +13,6 @@ 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 6e5bc54eeaeb -r ce9eff8c4509 pcre/stuff/r661.diff --- a/pcre/stuff/r661.diff Thu Nov 03 00:12:09 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ ---- 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)