Date: Saturday, October 22, 2011 @ 09:36:34 Author: allan Revision: 141046
upgpkg: pcre 8.20-1 upstream update Modified: pcre/trunk/PKGBUILD Deleted: pcre/trunk/r661.diff -----------+ PKGBUILD | 18 +++++++----------- r661.diff | 26 -------------------------- 2 files changed, 7 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-10-22 13:25:45 UTC (rev 141045) +++ PKGBUILD 2011-10-22 13:36:34 UTC (rev 141046) @@ -4,28 +4,24 @@ # Contributor: John Proctor <jproc...@prium.net> pkgname=pcre -pkgver=8.13 -pkgrel=2 +pkgver=8.20 +pkgrel=1 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64') url="http://www.pcre.org/" license=('BSD') depends=('gcc-libs') options=('!libtool') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2 - r661.diff) -md5sums=('5e595edbcded141813fa1a10dbce05cb' - '70e2725b46ff6f3f114ce5067fd03405') +source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('a1931c70e1273e3450d5036fe273d25c' + '41c2dceac25c6ebf192ec128021be339') build() { cd "${srcdir}"/${pkgname}-${pkgver} - # http://bugs.exim.org/show_bug.cgi?id=1136 - patch -Np2 -i "${srcdir}"/r661.diff - sed -i '12140d' testdata/testoutput2 - [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --enable-utf8 --enable-unicode-properties + ./configure --prefix=/usr --enable-jit \ + --enable-utf8 --enable-unicode-properties make } Deleted: r661.diff =================================================================== --- r661.diff 2011-10-22 13:25:45 UTC (rev 141045) +++ r661.diff 2011-10-22 13:36:34 UTC (rev 141046) @@ -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)