CVS commit: pkgsrc/textproc/icu

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Thu Nov 16 09:58:26 UTC 2017

Modified Files:
        pkgsrc/textproc/icu: Makefile distinfo
Added Files:
        pkgsrc/textproc/icu/patches: patch-i18n_zonemeta.cpp

Log Message:
Apply a fix for CVE-2017-14952 from
http://bugs.icu-project.org/trac/changeset/40324/trunk/icu4c/source/i18n/zonemeta.cpp
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 pkgsrc/textproc/icu/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/textproc/icu/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/icu/patches/patch-i18n_zonemeta.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/icu/Makefile
diff -u pkgsrc/textproc/icu/Makefile:1.111 pkgsrc/textproc/icu/Makefile:1.112
--- pkgsrc/textproc/icu/Makefile:1.111  Wed Oct  4 10:52:40 2017
+++ pkgsrc/textproc/icu/Makefile        Thu Nov 16 09:58:26 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.111 2017/10/04 10:52:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.112 2017/11/16 09:58:26 he Exp $
 
 DISTNAME=      icu4c-59_1-src
 PKGNAME=       ${DISTNAME:S/4c//:S/-src//:S/_/./g}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=icu/}
 EXTRACT_SUFX=  .tgz

Index: pkgsrc/textproc/icu/distinfo
diff -u pkgsrc/textproc/icu/distinfo:1.69 pkgsrc/textproc/icu/distinfo:1.70
--- pkgsrc/textproc/icu/distinfo:1.69   Fri Oct  6 15:20:42 2017
+++ pkgsrc/textproc/icu/distinfo        Thu Nov 16 09:58:26 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2017/10/06 15:20:42 maya Exp $
+$NetBSD: distinfo,v 1.70 2017/11/16 09:58:26 he Exp $
 
 SHA1 (icu4c-59_1-src.tgz) = e86189f53c0a01cecf093a555e1ebbd14abf5b82
 RMD160 (icu4c-59_1-src.tgz) = fe4bad598bbe0833b05e4626a1c941ad5e58a809
@@ -19,6 +19,7 @@ SHA1 (patch-config_mh-solaris-gcc) = e10
 SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d
 SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158
 SHA1 (patch-i18n_digitlst.cpp) = 2091ec0d6fe376d4f3f7ebee63515b86b78d3646
+SHA1 (patch-i18n_zonemeta.cpp) = 8a222ef88837c3afdbc7c7e11a94245c97a1f0e5
 SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663
 SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2
 SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110

Added files:

Index: pkgsrc/textproc/icu/patches/patch-i18n_zonemeta.cpp
diff -u /dev/null pkgsrc/textproc/icu/patches/patch-i18n_zonemeta.cpp:1.1
--- /dev/null   Thu Nov 16 09:58:26 2017
+++ pkgsrc/textproc/icu/patches/patch-i18n_zonemeta.cpp Thu Nov 16 09:58:26 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-i18n_zonemeta.cpp,v 1.1 2017/11/16 09:58:26 he Exp $
+
+Fix for CVE-2017-14952 from
+http://bugs.icu-project.org/trac/changeset/40324/trunk/icu4c/source/i18n/zonemeta.cpp
+
+--- i18n/zonemeta.cpp.orig     2017-03-14 19:39:30.000000000 +0000
++++ i18n/zonemeta.cpp
+@@ -690,7 +690,6 @@ ZoneMeta::createMetazoneMappings(const U
+                     mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status);
+                     if (U_FAILURE(status)) {
+                         delete mzMappings;
+-                        deleteOlsonToMetaMappingEntry(entry);
+                         uprv_free(entry);
+                         break;
+                     }