Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d54dd6497cbad1f28670570dfb274f7dfde75b34
commit d54dd6497cbad1f28670570dfb274f7dfde75b34 Author: kikadf <[email protected]> Date: Wed Dec 10 10:35:42 2014 +0100 pcre-8.32-2-x86_64 * Fix CVE-2014-8964 diff --git a/source/base/pcre/CVE-2014-8964.patch b/source/base/pcre/CVE-2014-8964.patch new file mode 100644 index 0000000..cfaf064 --- /dev/null +++ b/source/base/pcre/CVE-2014-8964.patch @@ -0,0 +1,72 @@ +From db5ce1f052c354faff0b74832934659753dfaae7 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Wed, 19 Nov 2014 20:57:13 +0000 +Subject: [PATCH] Fix zero-repeat assertion condition bug. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1513 2f5784b3-3f2a-0410-8824-cb99058d5e15 +Signed-off-by: Petr PÃsaÅ <[email protected]> + +Petr Pisar: Ported to 8.33. + +Signed-off-by: Petr PÃsaÅ <[email protected]> +--- + pcre_exec.c | 4 +++- + testdata/testinput2 | 6 ++++++ + testdata/testoutput2 | 10 ++++++++++ + 3 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/pcre_exec.c b/pcre_exec.c +index 970ed3e..a8fe12b 100644 +--- a/pcre_exec.c ++++ b/pcre_exec.c +@@ -1488,7 +1488,9 @@ for (;;) + if (md->end_offset_top > offset_top) + offset_top = md->end_offset_top; /* Captures may have happened */ + condition = TRUE; +- ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2); ++ ecode += 1 + LINK_SIZE; ++ if (*ecode == OP_BRAZERO) ecode++; ++ ecode += GET(ecode, 1); + while (*ecode == OP_ALT) ecode += GET(ecode, 1); + } + +diff --git a/testdata/testinput2 b/testdata/testinput2 +index 3b26f4b..aba73af 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -3839,4 +3839,10 @@ backtracking verbs. --/ + + /(((a\2)|(a*)\g<-1>))*a?/BZ + ++"((?=(?(?=(?(?=(?(?=())))*)))))" ++ a ++ ++"(?(?=)?==)(((((((((?=)))))))))" ++ a ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index e884638..0dcc5f9 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -12689,4 +12689,14 @@ Error -21 (recursion limit exceeded) + End + ------------------------------------------------------------------ + ++"((?=(?(?=(?(?=(?(?=())))*)))))" ++ a ++ 0: ++ 1: ++ 2: ++ ++"(?(?=)?==)(((((((((?=)))))))))" ++ a ++No match ++ + /-- End of testinput2 --/ +-- +1.9.3 + diff --git a/source/base/pcre/FrugalBuild b/source/base/pcre/FrugalBuild index fbb1383..63ebaed 100644 --- a/source/base/pcre/FrugalBuild +++ b/source/base/pcre/FrugalBuild @@ -4,16 +4,19 @@ pkgname=pcre pkgver=8.32 -pkgrel=1 +pkgrel=2 pkgdesc="Perl-compatible regular expression library" -url="http://pcre.sourceforge.net"; groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'arm') depends=('zlib' 'bzip2' 'readline' 'libstdc++>=4.3.1-3') -up2date="lynx -dump ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/|grep '.tar.gz$'|sort -n -r|grep -m1 '.tar.gz'|sed 's/.*-\(.*\).t.*/\1/'" -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.gz) +Finclude sourceforge Fconfopts+=" --disable-static --enable-jit --enable-unicode-properties --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-pcretest-libreadline" options=('nodocs') signatures=($source.sig) +# FSA fix *** +source=(${source[@]} CVE-2014-8964.patch) +sha1sums=(${sha1sums[@]} '8246ad8f98fb48199f5211df49f2932eb54f0990') +# *********** + # optimization OK
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
