diff --git a/icu.8984.CVE-2011-4599.patch b/icu.8984.CVE-2011-4599.patch deleted file mode 100644 index fc5fd63..0000000 --- a/icu.8984.CVE-2011-4599.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- icu/source/common/uloc.c -+++ icu/source/common/uloc.c -@@ -1797,7 +1797,7 @@ - int32_t variantLen = _deleteVariant(variant, uprv_min(variantSize, (nameCapacity-len)), variantToCompare, n); - len -= variantLen; - if (variantLen > 0) { -- if (name[len-1] == '_') { /* delete trailing '_' */ -+ if (len > 0 && name[len-1] == '_') { /* delete trailing '_' */ - --len; - } - addKeyword = VARIANT_MAP[j].keyword; -@@ -1805,7 +1805,7 @@ - break; - } - } -- if (name[len-1] == '_') { /* delete trailing '_' */ -+ if (len > 0 && len <= nameCapacity && name[len-1] == '_') { /* delete trailing '_' */ - --len; - } - } diff --git a/icu.spec b/icu.spec index 39a2b82..f1b6e2d 100644 --- a/icu.spec +++ b/icu.spec @@ -1,18 +1,17 @@ Name: icu -Version: 4.8.1.1 -Release: 3%{?dist} +Version: 49.1.1 +Release: 1%{?dist} Summary: International Components for Unicode Group: Development/Tools License: MIT and UCD and Public Domain URL: http://www.icu-project.org/ -Source: http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz +Source: http://download.icu-project.org/files/icu4c/49.1.1/icu4c-49_1_1-src.tgz BuildRequires: doxygen, autoconf Requires: lib%{name} = %{version}-%{release} Patch1: icu.8198.revert.icu5431.patch Patch2: icu.8800.freeserif.crash.patch Patch3: icu.7601.Indic-ccmp.patch -Patch4: icu.8984.CVE-2011-4599.patch %description Tools and utilities for developing with icu. @@ -55,7 +54,6 @@ BuildArch: noarch %patch1 -p2 -R -b .icu8198.revert.icu5431.patch %patch2 -p1 -b .icu8800.freeserif.crash.patch %patch3 -p1 -b .icu7601.Indic-ccmp.patch -%patch4 -p1 -b .icu8984.CVE-2011-4599.patch %build cd source @@ -142,6 +140,9 @@ make -C source check %doc source/__docs/%{name}/html/* %changelog +* Thu Apr 19 2012 Eike Rathke - 49.1.1-1 +- Update to 49.1.1 + * Thu Apr 19 2012 Eike Rathke - 4.8.1.1-3 - Resolves: rhbz#813484 doxygen 1.8.0 does not provide installdox, omit from install diff --git a/sources b/sources index f6ccab5..e5aee89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea93970a0275be6b42f56953cd332c17 icu4c-4_8_1_1-src.tgz +7c53f83e0327343f4060c0eb83842daf icu4c-49_1_1-src.tgz