[pkgsrc/trunk]: pkgsrc/devel/pcre Release 8.41:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e68158d5f38
branches:  trunk
changeset: 364855:4e68158d5f38
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jul 06 06:27:42 2017 +0000

description:
Release 8.41:
This is a bug-fix release.

diffstat:

 devel/pcre/Makefile                         |   5 +--
 devel/pcre/distinfo                         |  13 ++++------
 devel/pcre/patches/patch-pcre__internal.h   |  36 -----------------------------
 devel/pcre/patches/patch-pcre__ucd.c        |  29 -----------------------
 devel/pcre/patches/patch-pcre_jit_compile.c |  16 ------------
 5 files changed, 7 insertions(+), 92 deletions(-)

diffs (127 lines):

diff -r e2251a8e322a -r 4e68158d5f38 devel/pcre/Makefile
--- a/devel/pcre/Makefile       Thu Jul 06 05:25:15 2017 +0000
+++ b/devel/pcre/Makefile       Thu Jul 06 06:27:42 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2017/06/10 18:02:12 spz Exp $
+# $NetBSD: Makefile,v 1.85 2017/07/06 06:27:42 adam Exp $
 
-DISTNAME=      pcre-8.40
-PKGREVISION=   2
+DISTNAME=      pcre-8.41
 CATEGORIES=    devel
 MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
 MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pcre/}
diff -r e2251a8e322a -r 4e68158d5f38 devel/pcre/distinfo
--- a/devel/pcre/distinfo       Thu Jul 06 05:25:15 2017 +0000
+++ b/devel/pcre/distinfo       Thu Jul 06 06:27:42 2017 +0000
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.64 2017/06/10 18:02:12 spz Exp $
+$NetBSD: distinfo,v 1.65 2017/07/06 06:27:42 adam Exp $
 
-SHA1 (pcre-8.40.tar.bz2) = 12f338719b8b028a2eecbf9192fcc00a13fc04f6
-RMD160 (pcre-8.40.tar.bz2) = 1e2ebc58764e3b990d475323b4ffc848979e9c5d
-SHA512 (pcre-8.40.tar.bz2) = b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2
-Size (pcre-8.40.tar.bz2) = 1560119 bytes
+SHA1 (pcre-8.41.tar.bz2) = 7d1f4aae4191512744a718cc2b81bcf995ec1437
+RMD160 (pcre-8.41.tar.bz2) = 29342fea75514f96553149b18c44eae0abe86b9d
+SHA512 (pcre-8.41.tar.bz2) = cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
+Size (pcre-8.41.tar.bz2) = 1561874 bytes
 SHA1 (patch-aa) = ed20cfb5ca7b1e620e368c8e41a7f691d6f93282
 SHA1 (patch-ab) = 0b8fbde09c27e2716e5bfa32abce8ee4a79fb7fb
 SHA1 (patch-doc_pcredemo.3) = 90f9b3a021f58973149d839735d40c5e2e245912
-SHA1 (patch-pcre__internal.h) = 8b0e8552dcb9e13ef29fe609fa5268ac320ecce9
-SHA1 (patch-pcre__ucd.c) = 1251b3effaa4195f65b5432575acabfde08e9908
-SHA1 (patch-pcre_jit_compile.c) = 13c472caccc02e727d7d9377dba71f810feb89e9
diff -r e2251a8e322a -r 4e68158d5f38 devel/pcre/patches/patch-pcre__internal.h
--- a/devel/pcre/patches/patch-pcre__internal.h Thu Jul 06 05:25:15 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-pcre__internal.h,v 1.1 2017/06/10 18:02:13 spz Exp $
-
-from
-https://vcs.pcre.org/pcre/code/trunk/pcre_internal.h?r1=1649&r2=1688
-for CVE-2017-7186
-
---- pcre_internal.h.orig       2016-05-21 13:33:24.000000000 +0000
-+++ pcre_internal.h
-@@ -2772,6 +2772,9 @@ extern const pcre_uint8  PRIV(ucd_stage1
- extern const pcre_uint16 PRIV(ucd_stage2)[];
- extern const pcre_uint32 PRIV(ucp_gentype)[];
- extern const pcre_uint32 PRIV(ucp_gbtable)[];
-+#ifdef COMPILE_PCRE32
-+extern const ucd_record  PRIV(dummy_ucd_record)[];
-+#endif
- #ifdef SUPPORT_JIT
- extern const int         PRIV(ucp_typerange)[];
- #endif
-@@ -2780,10 +2783,16 @@ extern const int         PRIV(ucp_typera
- /* UCD access macros */
- 
- #define UCD_BLOCK_SIZE 128
--#define GET_UCD(ch) (PRIV(ucd_records) + \
-+#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \
-         PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
-         UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
- 
-+#ifdef COMPILE_PCRE32
-+#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch))
-+#else
-+#define GET_UCD(ch) REAL_GET_UCD(ch)
-+#endif
-+
- #define UCD_CHARTYPE(ch)    GET_UCD(ch)->chartype
- #define UCD_SCRIPT(ch)      GET_UCD(ch)->script
- #define UCD_CATEGORY(ch)    PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
diff -r e2251a8e322a -r 4e68158d5f38 devel/pcre/patches/patch-pcre__ucd.c
--- a/devel/pcre/patches/patch-pcre__ucd.c      Thu Jul 06 05:25:15 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-pcre__ucd.c,v 1.1 2017/06/10 18:02:13 spz Exp $
-
-from
-https://vcs.pcre.org/pcre/code/trunk/pcre_ucd.c?r1=1490&r2=1688
-for CVE-2017-7186
-
---- pcre_ucd.c.orig    2014-06-20 11:26:05.000000000 +0000
-+++ pcre_ucd.c
-@@ -38,6 +38,20 @@ const pcre_uint16 PRIV(ucd_stage2)[] = {
- const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0};
- #else
- 
-+/* If the 32-bit library is run in non-32-bit mode, character values
-+greater than 0x10ffff may be encountered. For these we set up a
-+special record. */
-+
-+#ifdef COMPILE_PCRE32
-+const ucd_record PRIV(dummy_ucd_record)[] = {{
-+  ucp_Common,    /* script */
-+  ucp_Cn,        /* type unassigned */
-+  ucp_gbOther,   /* grapheme break property */
-+  0,             /* case set */
-+  0,             /* other case */
-+  }};
-+#endif
-+
- /* When recompiling tables with a new Unicode version, please check the
- types in this structure definition from pcre_internal.h (the actual
- field names will be different):
diff -r e2251a8e322a -r 4e68158d5f38 devel/pcre/patches/patch-pcre_jit_compile.c
--- a/devel/pcre/patches/patch-pcre_jit_compile.c       Thu Jul 06 05:25:15 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-pcre_jit_compile.c,v 1.1 2017/02/22 03:22:57 sevan Exp $
-
-CVE-2017-6004
-https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-6004
-
---- pcre_jit_compile.c.orig    2016-07-02 15:53:59.000000000 +0000
-+++ pcre_jit_compile.c
-@@ -8111,7 +8111,7 @@ if (opcode == OP_COND || opcode == OP_SC
- 
-     if (*matchingpath == OP_FAIL)
-       stacksize = 0;
--    if (*matchingpath == OP_RREF)
-+    else if (*matchingpath == OP_RREF)
-       {
-       stacksize = GET2(matchingpath, 1);
-       if (common->currententry == NULL)