pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/icu Update from version 3.6nb2 to 4.0.1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a14ffb0a5ef3
branches:  trunk
changeset: 556650:a14ffb0a5ef3
user:      he <he%pkgsrc.org@localhost>
date:      Wed Mar 25 22:30:19 2009 +0000

description:
Update from version 3.6nb2 to 4.0.1.


Pkgsrc changes:
 o New MASTER_SITE
 o Adjust PLIST
 o Remove no-longer-needed patches, since corresponding changes
   have been adopted upstream
 o BUILDLINK_ABI_DEPENDS bumped to >=4.0, since a new shared library
   version is installed
 o Fixes security vulnerability, ref. below.

Dependent pkgsrc packages will have their revisions bumped shortly
due to the (possibly/probably) changed ABI.


Upstream changes:
4.0.1:
  ICU4C 4.0.1 is a maintenance release of ICU4J 4.0. The primary
  changes of this release were:

    * Updated time zone data to 2008i
    * Technical preview of string search implementation using
      Boyer-Moore algorithm (#6286). For detail information, please
      see the tech note here.
    * #5691 Conversion: consistent illegal sequences
    * #6435 Bad @stable ICU4.0 tags
    * #6597 TestDisplayNamesMeta failure
    * #6670 Test failure in format/TimeZoneTest/TestShortZoneIDs

4.0:
  Major changes in ICU 4.0 include the following:

    * Common Changes
          o Unicode 5.1 (#5696)
          o Locale Data: ICU uses and supports data from Common
            Locale Data Repository (CLDR) 1.6 , which includes many
            improvements in quality and quantity of data.
          o add/removeLikelySubtags (#6124)
          o Charset converter file size improvement (#5987)
          o Date Interval Formatting (#6157) Note: Calendar type
            supported by this feature is Gregorian only in this
            release.
          o Improved Plural support
    * ICU4C Specific Changes
            Additional Calendars
                + Chinese (#4081)
                + Coptic/Ethiopic (#4571)
    * ICU4J Specific Changes
          o Charset
                + Graduated from Technology Preview status
                + ICU2022 Converter (#5791)
                + HZ Converter (#6128)
                + SCSU/BOCU-1 Converter (#2147)
                + Charset Converter Callback (#6144)
          o Thai Dictionary break iterator (#5385)
          o JDK TimeZone support (#5975)
          o Locale Service Provider (#5976)
          o More convenient formatting of year+month, day+month,
            and other combinations (#6304)
          o Simple Duration Formatting (#6303)
    * ICU4C Security Fixes
      ICU4C 4.0 resolves the vulnerabilities CVE-2007-4770 and
      CVE-2007-4771 which were found in earlier versions of ICU.
      The standard ICU tests verify that these have been corrected,
      however, the updated versions of the previous tests may be
      run by applying the following patch to ICU 4.0: r24324. As
      well, ICU4C and ICU4J 4.0 resolve the issue underlying
      CVE-2008-1036.

diffstat:

 textproc/icu/Makefile         |  11 ++--
 textproc/icu/PLIST            |  51 ++++++++++++++++-------
 textproc/icu/buildlink3.mk    |   4 +-
 textproc/icu/distinfo         |  14 +----
 textproc/icu/patches/patch-ba |  89 -------------------------------------------
 textproc/icu/patches/patch-bb |  47 ----------------------
 textproc/icu/patches/patch-bc |  28 -------------
 textproc/icu/patches/patch-bd |  81 ---------------------------------------
 textproc/icu/patches/patch-be |  56 ---------------------------
 textproc/icu/patches/patch-bf |  12 -----
 10 files changed, 46 insertions(+), 347 deletions(-)

diffs (truncated from 540 to 300 lines):

diff -r 4215cf046fe5 -r a14ffb0a5ef3 textproc/icu/Makefile
--- a/textproc/icu/Makefile     Wed Mar 25 18:27:11 2009 +0000
+++ b/textproc/icu/Makefile     Wed Mar 25 22:30:19 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.57 2008/12/18 00:29:19 roy Exp $
+# $NetBSD: Makefile,v 1.58 2009/03/25 22:30:19 he Exp $
 #
 
-DISTNAME=      icu4c-3_6-src
-PKGNAME=       icu-3.6
-PKGREVISION=   2
+DISTNAME=      icu4c-4_0_1-src
+PKGNAME=       icu-4.0.1
 CATEGORIES=    textproc
-MASTER_SITES=  ftp://ftp.software.ibm.com/software/globalization/icu/${PKGVERSION_NOREV}/
+MASTER_SITES=  http://download.icu-project.org/files/icu4c/4.0.1/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -15,7 +14,7 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 MAKE_JOBS_SAFE=                no
 
-WRKSRC=                        ${WRKDIR}/${PKGBASE}/source
+WRKSRC=                        ${WRKDIR}/icu/source
 USE_TOOLS+=            gmake
 USE_LANGUAGES=         c c++
 TEST_TARGET=           check
diff -r 4215cf046fe5 -r a14ffb0a5ef3 textproc/icu/PLIST
--- a/textproc/icu/PLIST        Wed Mar 25 18:27:11 2009 +0000
+++ b/textproc/icu/PLIST        Wed Mar 25 22:30:19 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2007/03/31 15:36:57 obache Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/03/25 22:30:19 he Exp $
 bin/derb
 bin/genbrk
 bin/gencnval
@@ -19,6 +19,12 @@
 include/layout/LayoutEngine.h
 include/layout/ParagraphLayout.h
 include/layout/RunArrays.h
+include/layout/loengine.h
+include/layout/playout.h
+include/layout/plruns.h
+include/unicode/basictz.h
+include/unicode/bms.h
+include/unicode/bmsearch.h
 include/unicode/brkiter.h
 include/unicode/calendar.h
 include/unicode/caniter.h
@@ -26,6 +32,7 @@
 include/unicode/choicfmt.h
 include/unicode/coleitr.h
 include/unicode/coll.h
+include/unicode/colldata.h
 include/unicode/curramt.h
 include/unicode/currunit.h
 include/unicode/datefmt.h
@@ -34,6 +41,11 @@
 include/unicode/decimfmt.h
 include/unicode/docmain.h
 include/unicode/dtfmtsym.h
+include/unicode/dtintrv.h
+include/unicode/dtitvfmt.h
+include/unicode/dtitvinf.h
+include/unicode/dtptngen.h
+include/unicode/dtrule.h
 include/unicode/fieldpos.h
 include/unicode/fmtable.h
 include/unicode/format.h
@@ -48,11 +60,14 @@
 include/unicode/parseerr.h
 include/unicode/parsepos.h
 include/unicode/platform.h
+include/unicode/plurfmt.h
+include/unicode/plurrule.h
 include/unicode/ppalmos.h
 include/unicode/putil.h
 include/unicode/pwin32.h
 include/unicode/rbbi.h
 include/unicode/rbnf.h
+include/unicode/rbtz.h
 include/unicode/regex.h
 include/unicode/rep.h
 include/unicode/resbund.h
@@ -67,6 +82,8 @@
 include/unicode/tblcoll.h
 include/unicode/timezone.h
 include/unicode/translit.h
+include/unicode/tzrule.h
+include/unicode/tztrans.h
 include/unicode/ubidi.h
 include/unicode/ubrk.h
 include/unicode/ucal.h
@@ -85,6 +102,7 @@
 include/unicode/ucurr.h
 include/unicode/udat.h
 include/unicode/udata.h
+include/unicode/udatpg.h
 include/unicode/udeprctd.h
 include/unicode/udraft.h
 include/unicode/uenum.h
@@ -131,36 +149,36 @@
 include/unicode/utrans.h
 include/unicode/utypes.h
 include/unicode/uversion.h
+include/unicode/vtzone.h
 lib/icu/${PKGVERSION}/Makefile.inc
 lib/icu/Makefile.inc
 lib/icu/current
 lib/libicudata.${SO_SUFFIX}
-lib/libicudata.${SO_SUFFIX}.36
-lib/libicudata.${SO_SUFFIX}.36.0
+lib/libicudata.${SO_SUFFIX}.40
+lib/libicudata.${SO_SUFFIX}.40.1
 lib/libicui18n.${SO_SUFFIX}
-lib/libicui18n.${SO_SUFFIX}.36
-lib/libicui18n.${SO_SUFFIX}.36.0
+lib/libicui18n.${SO_SUFFIX}.40
+lib/libicui18n.${SO_SUFFIX}.40.1
 lib/libicuio.${SO_SUFFIX}
-lib/libicuio.${SO_SUFFIX}.36
-lib/libicuio.${SO_SUFFIX}.36.0
+lib/libicuio.${SO_SUFFIX}.40
+lib/libicuio.${SO_SUFFIX}.40.1
 lib/libicule.${SO_SUFFIX}
-lib/libicule.${SO_SUFFIX}.36
-lib/libicule.${SO_SUFFIX}.36.0
+lib/libicule.${SO_SUFFIX}.40
+lib/libicule.${SO_SUFFIX}.40.1
 lib/libiculx.${SO_SUFFIX}
-lib/libiculx.${SO_SUFFIX}.36
-lib/libiculx.${SO_SUFFIX}.36.0
+lib/libiculx.${SO_SUFFIX}.40
+lib/libiculx.${SO_SUFFIX}.40.1
 lib/libicutu.${SO_SUFFIX}
-lib/libicutu.${SO_SUFFIX}.36
-lib/libicutu.${SO_SUFFIX}.36.0
+lib/libicutu.${SO_SUFFIX}.40
+lib/libicutu.${SO_SUFFIX}.40.1
 lib/libicuuc.${SO_SUFFIX}
-lib/libicuuc.${SO_SUFFIX}.36
-lib/libicuuc.${SO_SUFFIX}.36.0
+lib/libicuuc.${SO_SUFFIX}.40
+lib/libicuuc.${SO_SUFFIX}.40.1
 lib/libsicudata.a
 lib/libsicui18n.a
 lib/libsicuio.a
 lib/libsicule.a
 lib/libsiculx.a
-lib/libsicutu.a
 lib/libsicuuc.a
 man/man1/derb.1
 man/man1/genbrk.1
@@ -183,6 +201,7 @@
 sbin/icupkg
 sbin/icuswap
 share/icu/${PKGVERSION}/config/${MH_NAME}
+share/icu/${PKGVERSION}/install-sh
 share/icu/${PKGVERSION}/license.html
 share/icu/${PKGVERSION}/mkinstalldirs
 @dirrm share/icu/${PKGVERSION}/config
diff -r 4215cf046fe5 -r a14ffb0a5ef3 textproc/icu/buildlink3.mk
--- a/textproc/icu/buildlink3.mk        Wed Mar 25 18:27:11 2009 +0000
+++ b/textproc/icu/buildlink3.mk        Wed Mar 25 22:30:19 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2009/03/25 22:30:19 he Exp $
 
 BUILDLINK_TREE+=       icu
 
@@ -6,7 +6,7 @@
 ICU_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.icu+=    icu>=3.4
-BUILDLINK_ABI_DEPENDS.icu?=    icu>=3.4nb1
+BUILDLINK_ABI_DEPENDS.icu?=    icu>=4.0
 BUILDLINK_PKGSRCDIR.icu?=      ../../textproc/icu
 .endif # ICU_BUILDLINK3_MK
 
diff -r 4215cf046fe5 -r a14ffb0a5ef3 textproc/icu/distinfo
--- a/textproc/icu/distinfo     Wed Mar 25 18:27:11 2009 +0000
+++ b/textproc/icu/distinfo     Wed Mar 25 22:30:19 2009 +0000
@@ -1,15 +1,9 @@
-$NetBSD: distinfo,v 1.15 2008/03/20 17:07:54 drochner Exp $
+$NetBSD: distinfo,v 1.16 2009/03/25 22:30:19 he Exp $
 
-SHA1 (icu4c-3_6-src.tgz) = b580c2802e74eb6af7e5e19b05c7d7c5d8c623f9
-RMD160 (icu4c-3_6-src.tgz) = b227ac9ff6019362bc4d01c18433869b0e0ff1c2
-Size (icu4c-3_6-src.tgz) = 10183358 bytes
+SHA1 (icu4c-4_0_1-src.tgz) = 65a65e9cd5670e113031def9448f65fb8f84f47a
+RMD160 (icu4c-4_0_1-src.tgz) = e40e7ffddd3134a34fe7e7bc98d776c5b67b637c
+Size (icu4c-4_0_1-src.tgz) = 12356471 bytes
 SHA1 (patch-aa) = b7299b3aac54410cb686980788dd0b6b435ae069
 SHA1 (patch-ab) = 32d2aeb38ed84352751d0f3d8db5d8b433ef03e4
 SHA1 (patch-ae) = 69caf7c0c226a0b45158a9620f045e943f00b820
 SHA1 (patch-af) = df50984a17111a69c517b26f303866f2d384e857
-SHA1 (patch-ba) = d22f39715b85fe73654b644237d1956091fb26e8
-SHA1 (patch-bb) = 57683caee8c4bb2743332847f78566d5a3934e80
-SHA1 (patch-bc) = 9fd76fb53c7a464883fe5cc21ffbc5b5ac117711
-SHA1 (patch-bd) = 197017d9fb0a6a542e567cfae4512bc38a25ff79
-SHA1 (patch-be) = 9cb76ab05393b8d698c2b77b58b3db6c7b0b199c
-SHA1 (patch-bf) = d03b55651686aeab965747c400753c8b7b643d80
diff -r 4215cf046fe5 -r a14ffb0a5ef3 textproc/icu/patches/patch-ba
--- a/textproc/icu/patches/patch-ba     Wed Mar 25 18:27:11 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2008/03/20 17:07:54 drochner Exp $
-
---- common/uvectr32.cpp.orig   2003-08-27 03:01:30.000000000 +0200
-+++ common/uvectr32.cpp
-@@ -1,6 +1,6 @@
- /*
- ******************************************************************************
--* Copyright (C) 1999-2003, International Business Machines Corporation and   *
-+* Copyright (C) 1999-2008, International Business Machines Corporation and   *
- * others. All Rights Reserved.                                               *
- ******************************************************************************
- *   Date        Name        Description
-@@ -26,6 +26,7 @@ UOBJECT_DEFINE_RTTI_IMPLEMENTATION(UVect
- UVector32::UVector32(UErrorCode &status) :
-     count(0),
-     capacity(0),
-+    maxCapacity(0),
-     elements(NULL)
- {
-     _init(DEFUALT_CAPACITY, status);
-@@ -34,6 +35,7 @@ UVector32::UVector32(UErrorCode &status)
- UVector32::UVector32(int32_t initialCapacity, UErrorCode &status) :
-     count(0),
-     capacity(0),
-+    maxCapacity(0),
-     elements(0)
- {
-     _init(initialCapacity, status);
-@@ -46,6 +48,9 @@ void UVector32::_init(int32_t initialCap
-     if (initialCapacity < 1) {
-         initialCapacity = DEFUALT_CAPACITY;
-     }
-+    if (maxCapacity>0 && maxCapacity<initialCapacity) {
-+        initialCapacity = maxCapacity;
-+    }
-     elements = (int32_t *)uprv_malloc(sizeof(int32_t)*initialCapacity);
-     if (elements == 0) {
-         status = U_MEMORY_ALLOCATION_ERROR;
-@@ -189,21 +194,35 @@ int32_t UVector32::indexOf(int32_t key, 
- UBool UVector32::expandCapacity(int32_t minimumCapacity, UErrorCode &status) {
-     if (capacity >= minimumCapacity) {
-         return TRUE;
--    } else {
--        int32_t newCap = capacity * 2;
--        if (newCap < minimumCapacity) {
--            newCap = minimumCapacity;
--        }
--        int32_t* newElems = (int32_t *)uprv_malloc(sizeof(int32_t)*newCap);
--        if (newElems == 0) {
--            status = U_MEMORY_ALLOCATION_ERROR;
--            return FALSE;
--        }
--        uprv_memcpy(newElems, elements, sizeof(elements[0]) * count);
--        uprv_free(elements);
--        elements = newElems;
--        capacity = newCap;
--        return TRUE;
-+    }
-+    if (maxCapacity>0 && minimumCapacity>maxCapacity) {
-+        status = U_BUFFER_OVERFLOW_ERROR;
-+        return FALSE;
-+    }
-+    int32_t newCap = capacity * 2;
-+    if (newCap < minimumCapacity) {
-+        newCap = minimumCapacity;
-+    }
-+    if (maxCapacity > 0 && newCap > maxCapacity) {
-+        newCap = maxCapacity;
-+    }
-+    int32_t* newElems = (int32_t *)uprv_malloc(sizeof(int32_t)*newCap);
-+    if (newElems == 0) {
-+        status = U_MEMORY_ALLOCATION_ERROR;
-+        return FALSE;
-+    }
-+    uprv_memcpy(newElems, elements, sizeof(elements[0]) * count);
-+    uprv_free(elements);
-+    elements = newElems;
-+    capacity = newCap;
-+    return TRUE;
-+}
-+
-+void UVector32::setMaxCapacity(int32_t limit) {
-+    U_ASSERT(limit >= 0);
-+    maxCapacity = limit;
-+    if (maxCapacity < 0) {
-+        maxCapacity = 0;
-     }
- }
- 
diff -r 4215cf046fe5 -r a14ffb0a5ef3 textproc/icu/patches/patch-bb
--- a/textproc/icu/patches/patch-bb     Wed Mar 25 18:27:11 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@



Home | Main Index | Thread Index | Old Index