CVS commit: [pkgsrc-2017Q3] pkgsrc/textproc/icu

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Nov 25 09:05:15 UTC 2017

Modified Files:
        pkgsrc/textproc/icu [pkgsrc-2017Q3]: Makefile distinfo
        pkgsrc/textproc/icu/patches [pkgsrc-2017Q3]:
            patch-config_mh-solaris-gcc
Added Files:
        pkgsrc/textproc/icu/patches [pkgsrc-2017Q3]: patch-i18n_zonemeta.cpp

Log Message:
Pullup ticket #5651 - requested by he
textproc/icu: security fix

Revisions pulled up:
- textproc/icu/Makefile                                         1.111-1.112
- textproc/icu/distinfo                                         1.66,1.70
- textproc/icu/patches/patch-config_mh-solaris-gcc              1.4
- textproc/icu/patches/patch-i18n_zonemeta.cpp                  1.1

---
   Module Name: pkgsrc
   Committed By:        jperkin
   Date:                Wed Oct  4 10:52:40 UTC 2017

   Modified Files:
        pkgsrc/textproc/icu: Makefile distinfo
        pkgsrc/textproc/icu/patches: patch-config_mh-solaris-gcc

   Log Message:
   icu: Remove -nodefaultlibs -nostdlib from SunOS linker args.

   This prevented GCC libraries from being used and thus disabled SSP and
   other features.  Bump PKGREVISION.

---
   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.110 -r1.110.4.1 pkgsrc/textproc/icu/Makefile
cvs rdiff -u -r1.65 -r1.65.6.1 pkgsrc/textproc/icu/distinfo
cvs rdiff -u -r1.3 -r1.3.18.1 \
    pkgsrc/textproc/icu/patches/patch-config_mh-solaris-gcc
cvs rdiff -u -r0 -r1.1.2.2 \
    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.110 pkgsrc/textproc/icu/Makefile:1.110.4.1
--- pkgsrc/textproc/icu/Makefile:1.110  Mon Sep 18 09:53:05 2017
+++ pkgsrc/textproc/icu/Makefile        Sat Nov 25 09:05:15 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.110 2017/09/18 09:53:05 maya Exp $
+# $NetBSD: Makefile,v 1.110.4.1 2017/11/25 09:05:15 bsiegert Exp $
 
 DISTNAME=      icu4c-59_1-src
 PKGNAME=       ${DISTNAME:S/4c//:S/-src//:S/_/./g}
-PKGREVISION=   1
+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.65 pkgsrc/textproc/icu/distinfo:1.65.6.1
--- pkgsrc/textproc/icu/distinfo:1.65   Tue Apr 25 08:58:44 2017
+++ pkgsrc/textproc/icu/distinfo        Sat Nov 25 09:05:15 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2017/04/25 08:58:44 maya Exp $
+$NetBSD: distinfo,v 1.65.6.1 2017/11/25 09:05:15 bsiegert Exp $
 
 SHA1 (icu4c-59_1-src.tgz) = e86189f53c0a01cecf093a555e1ebbd14abf5b82
 RMD160 (icu4c-59_1-src.tgz) = fe4bad598bbe0833b05e4626a1c941ad5e58a809
@@ -15,10 +15,11 @@ SHA1 (patch-config_Makefile.inc.in) = e7
 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
 SHA1 (patch-config_mh-darwin) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
-SHA1 (patch-config_mh-solaris-gcc) = 19f76c27bef22cc3b572e4b67a526d5f1aa077bc
+SHA1 (patch-config_mh-solaris-gcc) = e1097930f577917d3583e425d9d2affa1c3dcaf2
 SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d
 SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158
 SHA1 (patch-i18n_digitlst.cpp) = 2db1a8e28e353ecf201f965d9719d451534865ad
+SHA1 (patch-i18n_zonemeta.cpp) = 8a222ef88837c3afdbc7c7e11a94245c97a1f0e5
 SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663
 SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2
 SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110

Index: pkgsrc/textproc/icu/patches/patch-config_mh-solaris-gcc
diff -u pkgsrc/textproc/icu/patches/patch-config_mh-solaris-gcc:1.3 pkgsrc/textproc/icu/patches/patch-config_mh-solaris-gcc:1.3.18.1
--- pkgsrc/textproc/icu/patches/patch-config_mh-solaris-gcc:1.3 Mon Oct 26 09:28:20 2015
+++ pkgsrc/textproc/icu/patches/patch-config_mh-solaris-gcc     Sat Nov 25 09:05:15 2017
@@ -1,10 +1,19 @@
-$NetBSD: patch-config_mh-solaris-gcc,v 1.3 2015/10/26 09:28:20 jperkin Exp $
+$NetBSD: patch-config_mh-solaris-gcc,v 1.3.18.1 2017/11/25 09:05:15 bsiegert Exp $
 
 Pass -h correctly to linker for clang.
 
---- config/mh-solaris-gcc.orig 2015-10-08 03:54:32.000000000 +0000
+--- config/mh-solaris-gcc.orig 2016-06-15 18:58:17.000000000 +0000
 +++ config/mh-solaris-gcc
-@@ -23,7 +23,7 @@ LD_RPATH=       -R'$$'ORIGIN 
+@@ -15,7 +15,7 @@ GEN_DEPS.c=  $(CC) -E -MM $(DEFS) $(CPPF
+ GEN_DEPS.cc=  $(CXX) -E -MM $(DEFS) $(CPPFLAGS) $(CXXFLAGS)
+ 
+ ## These are the library specific LDFLAGS
+-LDFLAGSICUDT=-nodefaultlibs -nostdlib
++#LDFLAGSICUDT=-nodefaultlibs -nostdlib
+ 
+ ## Additional flags when building libraries and with threads
+ THREADSCPPFLAGS = -D_REENTRANT
+@@ -25,7 +25,7 @@ LD_RPATH=       -R'$$'ORIGIN
  LD_RPATH_PRE=   -R
  
  ## Compiler switch to embed a library name

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.2.2
--- /dev/null   Sat Nov 25 09:05:15 2017
+++ pkgsrc/textproc/icu/patches/patch-i18n_zonemeta.cpp Sat Nov 25 09:05:15 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-i18n_zonemeta.cpp,v 1.1.2.2 2017/11/25 09:05:15 bsiegert 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;
+                     }