rpms/icu
7
0
Fork 0
Code Issues Pull Requests Releases Activity

icu#7039 fix broken use of extract to get tests working

Browse Source
This commit is contained in:
Caolan McNamara 2009-07-28 16:32:49 +00:00
parent a1e7a15443
commit 320a9785ef
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu.icu7039.badextract.patch
View File

@ -6,7 +6,7 @@ diff -ru icu.orig/source/common/unicode/unistr.h icu/source/common/unicode/unist
{ {
// This dstSize value will be checked explicitly // This dstSize value will be checked explicitly
- return extract(start, _length, dst, dst!=0 ? 0xffffffff : 0, codepage); - return extract(start, _length, dst, dst!=0 ? 0xffffffff : 0, codepage);
+ return extract(start, _length, dst, dst!=0 ? ((dst >= ((size_t)-1) - UINT32_MAX) ? (((char*)UINT32_MAX) - dst) : UINT32_MAX) : 0, codepage); + return extract(start, _length, dst, dst!=0 ? (((size_t)dst >= ((size_t)-1) - UINT32_MAX) ? (((char*)UINT32_MAX) - dst) : UINT32_MAX) : 0, codepage);
} }
#endif #endif

12
icu.spec
View File

@ -1,6 +1,6 @@
Name: icu Name: icu
Version: 4.2.1 Version: 4.2.1
Release: 4%{?dist} Release: 5%{?dist}
Summary: International Components for Unicode Summary: International Components for Unicode
Group: Development/Tools Group: Development/Tools
License: MIT License: MIT
@ -14,6 +14,7 @@ Requires: lib%{name} = %{version}-%{release}
Patch1: icu-3.4-multiarchdevel.patch Patch1: icu-3.4-multiarchdevel.patch
Patch2: icu.icu6284.strictalias.patch Patch2: icu.icu6284.strictalias.patch
Patch3: icu.6995.kannada.patch Patch3: icu.6995.kannada.patch
Patch4: icu.icu7039.badextract.patch
%description %description
Tools and utilities for developing with icu. Tools and utilities for developing with icu.
@ -55,7 +56,8 @@ BuildArch: noarch
%setup -q -n %{name} %setup -q -n %{name}
%patch1 -p1 -b .multiarchdevel %patch1 -p1 -b .multiarchdevel
%patch2 -p1 -b .icu6284.strictalias.patch %patch2 -p1 -b .icu6284.strictalias.patch
%patch3 -p1 -b .icu.6995.kannada.patch %patch3 -p1 -b .icu6995.kannada.patch
%patch4 -p1 -b .icu7039.badextract.patch
%build %build
cd source cd source
@ -76,6 +78,9 @@ chmod 0755 $RPM_BUILD_ROOT%{_bindir}/%{name}-config
sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
sed -i s/\\\$\(THREADSCPPFLAGS\)/-D_REENTRANT/ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc sed -i s/\\\$\(THREADSCPPFLAGS\)/-D_REENTRANT/ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc
%check
make -C source check
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -131,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
%doc source/__docs/%{name}/html/* %doc source/__docs/%{name}/html/*
%changelog %changelog
* Tue Jul 28 2009 Caolan McNamara <caolanm@redhat.com> - 4.2.1-5
- icu#7039 fix broken use of extract to get tests working
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1-4 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild