diff options
| author | he <he@pkgsrc.org> | 2017-11-16 09:58:26 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2017-11-16 09:58:26 +0000 |
| commit | efdf8e55b3bf79528c48478798610181f12e2caf (patch) | |
| tree | 337e58032efdf7dc9c94a6aa47a7bdca56a56ee6 /textproc/icu | |
| parent | 1189fbce44c89fb8473c6c2c4800178d48cb195a (diff) | |
| download | pkgsrc-efdf8e55b3bf79528c48478798610181f12e2caf.tar.gz | |
Apply a fix for CVE-2017-14952 from
http://bugs.icu-project.org/trac/changeset/40324/trunk/icu4c/source/i18n/zonemeta.cpp
Bump PKGREVISION.
Diffstat (limited to 'textproc/icu')
| -rw-r--r-- | textproc/icu/Makefile | 4 | ||||
| -rw-r--r-- | textproc/icu/distinfo | 3 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-i18n_zonemeta.cpp | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 5acfe7a6d67..24d6c86cb51 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -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 diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 91de86e7a58..4a06976b936 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -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) = e1097930f577917d3583e425d9d2affa1c3dcaf2 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 diff --git a/textproc/icu/patches/patch-i18n_zonemeta.cpp b/textproc/icu/patches/patch-i18n_zonemeta.cpp new file mode 100644 index 00000000000..a61c6007c90 --- /dev/null +++ b/textproc/icu/patches/patch-i18n_zonemeta.cpp @@ -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; + } |