[pkgsrc/trunk]: pkgsrc/devel/pcre Fix a potential buffer overflow in libpcre'...

[tonnerre <tonnerre%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac42608b8b37
branches:  trunk
changeset: 544043:ac42608b8b37
user:      tonnerre <tonnerre%pkgsrc.org@localhost>
date:      Fri Jul 04 21:30:24 2008 +0000

description:
Fix a potential buffer overflow in libpcre's compiler (CVE-2008-2371).

diffstat:

 devel/pcre/Makefile         |   4 ++--
 devel/pcre/distinfo         |   3 ++-
 devel/pcre/patches/patch-ac |  13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 371a87c1c879 -r ac42608b8b37 devel/pcre/Makefile
--- a/devel/pcre/Makefile       Fri Jul 04 21:25:19 2008 +0000
+++ b/devel/pcre/Makefile       Fri Jul 04 21:30:24 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2008/05/27 16:20:52 tnn Exp $
+# $NetBSD: Makefile,v 1.51 2008/07/04 21:30:24 tonnerre Exp $
 
 DISTNAME=      pcre-7.7
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \
                ${MASTER_SITE_SOURCEFORGE:=pcre/}
diff -r 371a87c1c879 -r ac42608b8b37 devel/pcre/distinfo
--- a/devel/pcre/distinfo       Fri Jul 04 21:25:19 2008 +0000
+++ b/devel/pcre/distinfo       Fri Jul 04 21:30:24 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.32 2008/05/27 16:20:52 tnn Exp $
+$NetBSD: distinfo,v 1.33 2008/07/04 21:30:24 tonnerre Exp $
 
 SHA1 (pcre-7.7.tar.bz2) = f1f54d3e13e6cb427de962e62eaaee32c74cba38
 RMD160 (pcre-7.7.tar.bz2) = fdf7785b982879ce91847130960fa1531caffaeb
 Size (pcre-7.7.tar.bz2) = 818897 bytes
 SHA1 (patch-aa) = 2bca13cdd4a398ae3dbf26f75fd94557cb076dbe
 SHA1 (patch-ab) = a51a173c41825effd94c104f3b7eea3e48d019f9
+SHA1 (patch-ac) = 3e161c431ffe0d1b0361eea12e5347cd5c3aebaa
diff -r 371a87c1c879 -r ac42608b8b37 devel/pcre/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pcre/patches/patch-ac       Fri Jul 04 21:30:24 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5 2008/07/04 21:30:24 tonnerre Exp $
+
+--- pcre_compile.c.orig        2008-04-28 17:06:46.000000000 +0200
++++ pcre_compile.c
+@@ -4931,7 +4931,7 @@ we set the flag only if there is a liter
+                (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
+             {
+             cd->external_options = newoptions;
+-            options = newoptions;
++            options = *optionsptr = newoptions;
+             }
+          else
+             {