diff options
Diffstat (limited to 'devel/pcre')
| -rw-r--r-- | devel/pcre/Makefile | 5 | ||||
| -rw-r--r-- | devel/pcre/distinfo | 9 | ||||
| -rw-r--r-- | devel/pcre/patches/patch-CVE-2014-8964 | 20 |
3 files changed, 6 insertions, 28 deletions
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 2a2e9bbabfa..5d633976fb8 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.75 2014/11/30 14:48:43 spz Exp $ +# $NetBSD: Makefile,v 1.76 2015/04/29 11:24:48 mef Exp $ -DISTNAME= pcre-8.36 -PKGREVISION= 1 +DISTNAME= pcre-8.37 CATEGORIES= devel MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ ${MASTER_SITE_SOURCEFORGE:=pcre/} diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo index 3dd7a5775be..c483c69cd85 100644 --- a/devel/pcre/distinfo +++ b/devel/pcre/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.55 2014/11/30 14:48:43 spz Exp $ +$NetBSD: distinfo,v 1.56 2015/04/29 11:24:48 mef Exp $ -SHA1 (pcre-8.36.tar.bz2) = 9a074e9cbf3eb9f05213fd9ca5bc188644845ccc -RMD160 (pcre-8.36.tar.bz2) = e13ce590fbb12aaa375645edeea6fa4938d31efb -Size (pcre-8.36.tar.bz2) = 1533818 bytes -SHA1 (patch-CVE-2014-8964) = 4779bf53dd08d7be070c3860c35ab896a26d29e9 +SHA1 (pcre-8.37.tar.bz2) = 4c629b3f582366fae4e8912f0d9fa3140347d6e7 +RMD160 (pcre-8.37.tar.bz2) = 2f38e201b921a9dc73ab7d555cc58a4320c599e5 +Size (pcre-8.37.tar.bz2) = 1557603 bytes SHA1 (patch-aa) = ed20cfb5ca7b1e620e368c8e41a7f691d6f93282 SHA1 (patch-ab) = 0b8fbde09c27e2716e5bfa32abce8ee4a79fb7fb SHA1 (patch-doc_pcredemo.3) = 90f9b3a021f58973149d839735d40c5e2e245912 diff --git a/devel/pcre/patches/patch-CVE-2014-8964 b/devel/pcre/patches/patch-CVE-2014-8964 deleted file mode 100644 index 61bf1a9d106..00000000000 --- a/devel/pcre/patches/patch-CVE-2014-8964 +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-CVE-2014-8964,v 1.1 2014/11/30 14:48:43 spz Exp $ - -patch for CVE-2014-8964 taken from -http://bugs.exim.org/show_bug.cgi?id=1546 - ---- pcre_exec.c.orig 2014-09-15 13:48:59.000000000 +0000 -+++ pcre_exec.c -@@ -1404,8 +1404,11 @@ for (;;) - condition = TRUE; - - /* Advance ecode past the assertion to the start of the first branch, -- but adjust it so that the general choosing code below works. */ -+ but adjust it so that the general choosing code below works. If the -+ assertion has a quantifier that allows zero repeats we must skip over -+ the BRAZERO. This is a lunatic thing to do, but somebody did! */ - -+ if (*ecode == OP_BRAZERO) ecode++; - ecode += GET(ecode, 1); - while (*ecode == OP_ALT) ecode += GET(ecode, 1); - ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode]; |