From b06df78d14c06dbb1caf8bedd0b9802c668d915f4ae8396995396bf117d2b714 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 5 Jun 2013 17:42:10 +0000 Subject: [PATCH] icu-51.2 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/icu?expand=0&rev=25 --- icu-remove-datetime.patch | 4 ++++ icu-rpmlint.diff | 5 +++++ icu.changes | 12 ++++++++++++ icu.spec | 18 +++++++----------- icu4c-51_1-docs.tar.xz | 3 --- icu4c-51_1-src.tar.xz | 3 --- icu4c-51_2-docs.tar.xz | 3 +++ icu4c-51_2-src.tar.xz | 3 +++ download.sh => sanitize_docs.sh | 6 ++++-- 9 files changed, 38 insertions(+), 19 deletions(-) delete mode 100644 icu4c-51_1-docs.tar.xz delete mode 100644 icu4c-51_1-src.tar.xz create mode 100644 icu4c-51_2-docs.tar.xz create mode 100644 icu4c-51_2-src.tar.xz rename download.sh => sanitize_docs.sh (73%) diff --git a/icu-remove-datetime.patch b/icu-remove-datetime.patch index ab80fc9..487db6c 100644 --- a/icu-remove-datetime.patch +++ b/icu-remove-datetime.patch @@ -1,3 +1,7 @@ +From: + +Do not put date/time in icu-config (needed for build-compare) + --- source/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/icu-rpmlint.diff b/icu-rpmlint.diff index 44bb8a8..38bf5d5 100644 --- a/icu-rpmlint.diff +++ b/icu-rpmlint.diff @@ -1,3 +1,8 @@ +From: Jan Engelhardt +Reference: http://bugs.icu-project.org/trac/ticket/7808 + +build: resolve potential buffer overflow in icu + I: Statement might be overflowing a buffer in strncat. Common mistake: BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong, it takes the left over size as 3rd argument GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1) diff --git a/icu.changes b/icu.changes index 558b0a2..4cd54fd 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jun 5 17:19:12 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 51.2 +* Common Locale Data Repository (CLDR) 23.1 +* Time zone database version 2013c +* Security fixes for font layout and glyph table errors. NOTE: + Applications must implement + LEFontInstance::getFontTable(LETag, size_t &length) in their + LEFontInstance subclasses, so that ICU can properly bounds-check + font tables. + ------------------------------------------------------------------- Mon May 6 07:51:07 UTC 2013 - jengelh@inai.de diff --git a/icu.spec b/icu.spec index 089cbfb..433c15d 100644 --- a/icu.spec +++ b/icu.spec @@ -18,9 +18,9 @@ Name: icu %define lname libicu51 -Version: 51.1 +Version: 51.2 Release: 0 -%define aversion 51_1 +%define aversion 51_2 Summary: International Components for Unicode License: X11 Group: Development/Libraries/C and C++ @@ -29,11 +29,9 @@ Url: http://icu-project.org/ #DL-URL: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-src.tgz Source: icu4c-%aversion-src.tar.xz Source2: icu4c-%aversion-docs.tar.xz -Source3: download.sh -# PATCH-FIX-UPSTREAM icu-rpmlint.diff -- http://bugs.icu-project.org/trac/ticket/7808 +Source3: sanitize_docs.sh Patch1: icu-rpmlint.diff -# PATCH-FIX-OPENSUSE icu-remove-datetime.patch vuntz@novell.com -- Do not put date/time in icu-config (needed for build-compare) -Patch99: icu-remove-datetime.patch +Patch2: icu-remove-datetime.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -56,8 +54,8 @@ This subpackage contains the runtime programs for interacting with ICU. # icudata (largest part) is always needed. Summary: International Components for Unicode (development files) Group: Development/Libraries/C and C++ -# bug437293 %ifarch ppc64 +# bug437293 Obsoletes: libicu-64bit %endif Requires: timezone @@ -74,11 +72,10 @@ libraries for ICU which include precompiled locale data. %package -n libicu-devel Summary: International Components for Unicode (development files) Group: Development/Libraries/C and C++ -# bug437293 %ifarch ppc64 +# bug437293 Obsoletes: libicu-devel-64bit %endif -# Requires: %lname = %version %description -n libicu-devel @@ -111,8 +108,7 @@ the "%lname" package. %prep %setup -qn icu -a2 -%patch1 -p1 -%patch99 -p1 +%patch -P 1 -P 2 -p1 %build cd source diff --git a/icu4c-51_1-docs.tar.xz b/icu4c-51_1-docs.tar.xz deleted file mode 100644 index fab00f7..0000000 --- a/icu4c-51_1-docs.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0a57d4a10421e9ed24aed657bd430174986b85fe0e4d6df9068eaed184e7102 -size 2587952 diff --git a/icu4c-51_1-src.tar.xz b/icu4c-51_1-src.tar.xz deleted file mode 100644 index c3e3470..0000000 --- a/icu4c-51_1-src.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20ac1bb25a1b4c214bd551d0bd00801952bbba2ad3b01dd1392ebcc72a07f435 -size 11994208 diff --git a/icu4c-51_2-docs.tar.xz b/icu4c-51_2-docs.tar.xz new file mode 100644 index 0000000..49085b6 --- /dev/null +++ b/icu4c-51_2-docs.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb795ee5e6d80dcc4e72087694094428f3d6a0a3e57b0d80b02a8e4157b92cba +size 2410720 diff --git a/icu4c-51_2-src.tar.xz b/icu4c-51_2-src.tar.xz new file mode 100644 index 0000000..df16faa --- /dev/null +++ b/icu4c-51_2-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67719e4f6292e7262c4d6ddba60b3a40d5df30af5f97aa50a706a993561ca3ec +size 12147252 diff --git a/download.sh b/sanitize_docs.sh similarity index 73% rename from download.sh rename to sanitize_docs.sh index 196cf3e..c07c96e 100644 --- a/download.sh +++ b/sanitize_docs.sh @@ -1,7 +1,9 @@ #!/bin/sh -ex -ver="51.1" -name="icu4c-51_1-docs.zip" +ver="51.2" +name="icu4c-51_2-docs.zip" + +# Put docs in a separate directory wget -c "http://download.icu-project.org/files/icu4c/$ver/$name" rm -Rf html mkdir html