1 |
commit: 651f107d52dfc2b2032fe7c01e8c60f515a2ec52 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 27 09:11:00 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 27 10:47:26 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=651f107d |
7 |
|
8 |
dev-libs/icu: Drop 63.1-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.16 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-libs/icu/Manifest | 1 - |
14 |
dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch | 62 ---------- |
15 |
dev-libs/icu/icu-63.1-r1.ebuild | 143 ----------------------- |
16 |
3 files changed, 206 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest |
19 |
index 5bd14af28bc..efaf4e9e515 100644 |
20 |
--- a/dev-libs/icu/Manifest |
21 |
+++ b/dev-libs/icu/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a |
24 |
-DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c |
25 |
DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78 |
26 |
|
27 |
diff --git a/dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch b/dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch |
28 |
deleted file mode 100644 |
29 |
index bbbef9e793d..00000000000 |
30 |
--- a/dev-libs/icu/files/icu-63.1-CVE-2018-18928.patch |
31 |
+++ /dev/null |
32 |
@@ -1,62 +0,0 @@ |
33 |
-From 53d8c8f3d181d87a6aa925b449b51c4a2c922a51 Mon Sep 17 00:00:00 2001 |
34 |
-From: Shane Carr <shane@×××××××.org> |
35 |
-Date: Mon, 29 Oct 2018 23:52:44 -0700 |
36 |
-Subject: [PATCH] ICU-20246 Fixing another integer overflow in number parsing. |
37 |
- |
38 |
---- |
39 |
- i18n/fmtable.cpp | 2 +- |
40 |
- i18n/number_decimalquantity.cpp | 5 ++++- |
41 |
- test/intltest/numfmtst.cpp | 8 ++++++++ |
42 |
- .../icu/impl/number/DecimalQuantity_AbstractBCD.java | 5 ++++- |
43 |
- .../impl/number/DecimalQuantity_DualStorageBCD.java | 10 +++++++++- |
44 |
- .../com/ibm/icu/dev/test/format/NumberFormatTest.java | 5 +++++ |
45 |
- 6 files changed, 31 insertions(+), 4 deletions(-) |
46 |
- |
47 |
-diff --git a/i18n/fmtable.cpp b/i18n/fmtable.cpp |
48 |
-index 45c7024fc29..8601d95f4a6 100644 |
49 |
---- a/i18n/fmtable.cpp |
50 |
-+++ b/i18n/fmtable.cpp |
51 |
-@@ -734,7 +734,7 @@ CharString *Formattable::internalGetCharString(UErrorCode &status) { |
52 |
- // not print scientific notation for magnitudes greater than -5 and smaller than some amount (+5?). |
53 |
- if (fDecimalQuantity->isZero()) { |
54 |
- fDecimalStr->append("0", -1, status); |
55 |
-- } else if (std::abs(fDecimalQuantity->getMagnitude()) < 5) { |
56 |
-+ } else if (fDecimalQuantity->getMagnitude() != INT32_MIN && std::abs(fDecimalQuantity->getMagnitude()) < 5) { |
57 |
- fDecimalStr->appendInvariantChars(fDecimalQuantity->toPlainString(), status); |
58 |
- } else { |
59 |
- fDecimalStr->appendInvariantChars(fDecimalQuantity->toScientificString(), status); |
60 |
-diff --git a/i18n/number_decimalquantity.cpp b/i18n/number_decimalquantity.cpp |
61 |
-index 47b930a564b..d5dd7ae694c 100644 |
62 |
---- a/i18n/number_decimalquantity.cpp |
63 |
-+++ b/i18n/number_decimalquantity.cpp |
64 |
-@@ -898,7 +898,10 @@ UnicodeString DecimalQuantity::toScientificString() const { |
65 |
- } |
66 |
- result.append(u'E'); |
67 |
- int32_t _scale = upperPos + scale; |
68 |
-- if (_scale < 0) { |
69 |
-+ if (_scale == INT32_MIN) { |
70 |
-+ result.append({u"-2147483648", -1}); |
71 |
-+ return result; |
72 |
-+ } else if (_scale < 0) { |
73 |
- _scale *= -1; |
74 |
- result.append(u'-'); |
75 |
- } else { |
76 |
-diff --git a/test/intltest/numfmtst.cpp b/test/intltest/numfmtst.cpp |
77 |
-index 34355939113..8d52dc122bf 100644 |
78 |
---- a/test/intltest/numfmtst.cpp |
79 |
-+++ b/test/intltest/numfmtst.cpp |
80 |
-@@ -9226,6 +9226,14 @@ void NumberFormatTest::Test20037_ScientificIntegerOverflow() { |
81 |
- assertEquals(u"Should not overflow and should parse only the first exponent", |
82 |
- u"1E-2147483647", |
83 |
- {sp.data(), sp.length(), US_INV}); |
84 |
-+ |
85 |
-+ // Test edge case overflow of exponent |
86 |
-+ result = Formattable(); |
87 |
-+ nf->parse(u".0003e-2147483644", result, status); |
88 |
-+ sp = result.getDecimalNumber(status); |
89 |
-+ assertEquals(u"Should not overflow", |
90 |
-+ u"3E-2147483648", |
91 |
-+ {sp.data(), sp.length(), US_INV}); |
92 |
- } |
93 |
- |
94 |
- void NumberFormatTest::Test13840_ParseLongStringCrash() { |
95 |
|
96 |
diff --git a/dev-libs/icu/icu-63.1-r1.ebuild b/dev-libs/icu/icu-63.1-r1.ebuild |
97 |
deleted file mode 100644 |
98 |
index 2023747b6e8..00000000000 |
99 |
--- a/dev-libs/icu/icu-63.1-r1.ebuild |
100 |
+++ /dev/null |
101 |
@@ -1,143 +0,0 @@ |
102 |
-# Copyright 1999-2019 Gentoo Authors |
103 |
-# Distributed under the terms of the GNU General Public License v2 |
104 |
- |
105 |
-EAPI=7 |
106 |
- |
107 |
-inherit flag-o-matic toolchain-funcs autotools multilib-minimal |
108 |
- |
109 |
-DESCRIPTION="International Components for Unicode" |
110 |
-HOMEPAGE="http://www.icu-project.org/" |
111 |
-SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz" |
112 |
- |
113 |
-LICENSE="BSD" |
114 |
- |
115 |
-SLOT="0/${PV}" |
116 |
- |
117 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
118 |
-IUSE="debug doc examples static-libs" |
119 |
- |
120 |
-DEPEND=" |
121 |
- doc? ( app-doc/doxygen[dot] ) |
122 |
-" |
123 |
-BDEPEND=" |
124 |
- virtual/pkgconfig |
125 |
-" |
126 |
- |
127 |
-S="${WORKDIR}/${PN}/source" |
128 |
- |
129 |
-MULTILIB_CHOST_TOOLS=( |
130 |
- /usr/bin/icu-config |
131 |
-) |
132 |
- |
133 |
-PATCHES=( |
134 |
- "${FILESDIR}/${PN}-58.1-remove-bashisms.patch" |
135 |
- "${FILESDIR}/${PN}-58.2-darwin.patch" |
136 |
- "${FILESDIR}/${P}-CVE-2018-18928.patch" |
137 |
-) |
138 |
- |
139 |
-src_prepare() { |
140 |
- default |
141 |
- |
142 |
- local variable |
143 |
- |
144 |
- # Disable renaming as it is stupid thing to do |
145 |
- sed -i \ |
146 |
- -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ |
147 |
- common/unicode/uconfig.h || die |
148 |
- |
149 |
- # Fix linking of icudata |
150 |
- sed -i \ |
151 |
- -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ |
152 |
- config/mh-linux || die |
153 |
- |
154 |
- # Append doxygen configuration to configure |
155 |
- sed -i \ |
156 |
- -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ |
157 |
- configure.ac || die |
158 |
- |
159 |
- eautoreconf |
160 |
-} |
161 |
- |
162 |
-src_configure() { |
163 |
- append-cxxflags -std=c++14 |
164 |
- |
165 |
- if tc-is-cross-compiler; then |
166 |
- mkdir "${WORKDIR}"/host || die |
167 |
- pushd "${WORKDIR}"/host >/dev/null || die |
168 |
- |
169 |
- CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ |
170 |
- CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ |
171 |
- RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ |
172 |
- "${S}"/configure --disable-renaming --disable-debug \ |
173 |
- --disable-samples --enable-static || die |
174 |
- emake |
175 |
- |
176 |
- popd >/dev/null || die |
177 |
- fi |
178 |
- |
179 |
- multilib-minimal_src_configure |
180 |
-} |
181 |
- |
182 |
-multilib_src_configure() { |
183 |
- local myeconfargs=( |
184 |
- --disable-renaming |
185 |
- --disable-samples |
186 |
- --disable-layoutex |
187 |
- $(use_enable debug) |
188 |
- $(use_enable static-libs static) |
189 |
- $(multilib_native_use_enable examples samples) |
190 |
- ) |
191 |
- |
192 |
- tc-is-cross-compiler && myeconfargs+=( |
193 |
- --with-cross-build="${WORKDIR}"/host |
194 |
- ) |
195 |
- |
196 |
- # icu tries to use clang by default |
197 |
- tc-export CC CXX |
198 |
- |
199 |
- # make sure we configure with the same shell as we run icu-config |
200 |
- # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined |
201 |
- export CONFIG_SHELL="${EPREFIX}/bin/sh" |
202 |
- # probably have no /bin/sh in prefix-chain |
203 |
- [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}" |
204 |
- |
205 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
206 |
-} |
207 |
- |
208 |
-multilib_src_compile() { |
209 |
- default |
210 |
- |
211 |
- if multilib_is_native_abi && use doc; then |
212 |
- doxygen -u Doxyfile || die |
213 |
- doxygen Doxyfile || die |
214 |
- fi |
215 |
-} |
216 |
- |
217 |
-multilib_src_test() { |
218 |
- # INTLTEST_OPTS: intltest options |
219 |
- # -e: Exhaustive testing |
220 |
- # -l: Reporting of memory leaks |
221 |
- # -v: Increased verbosity |
222 |
- # IOTEST_OPTS: iotest options |
223 |
- # -e: Exhaustive testing |
224 |
- # -v: Increased verbosity |
225 |
- # CINTLTST_OPTS: cintltst options |
226 |
- # -e: Exhaustive testing |
227 |
- # -v: Increased verbosity |
228 |
- emake -j1 VERBOSE="1" check |
229 |
-} |
230 |
- |
231 |
-multilib_src_install() { |
232 |
- default |
233 |
- |
234 |
- if multilib_is_native_abi && use doc; then |
235 |
- docinto html |
236 |
- dodoc -r doc/html/* |
237 |
- fi |
238 |
-} |
239 |
- |
240 |
-multilib_src_install_all() { |
241 |
- einstalldocs |
242 |
- docinto html |
243 |
- dodoc ../readme.html |
244 |
-} |