diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2016-12-20 10:06:26 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2016-12-26 08:30:36 +0000 |
| commit | 383064a721ebafed7c65d9e32dc4c6606e95bbd3 (patch) | |
| tree | dd55db570042e21611b43b8ad07d11be469ce458 /main/icu | |
| parent | 8785916c0cbc83dd571ac494c509513cd055cf0a (diff) | |
| download | aports-383064a721ebafed7c65d9e32dc4c6606e95bbd3.tar.bz2 aports-383064a721ebafed7c65d9e32dc4c6606e95bbd3.tar.xz | |
main/icu: security upgrade to 58.1 (CVE-2016-7415). Fixes #6548
Diffstat (limited to 'main/icu')
| -rw-r--r-- | main/icu/APKBUILD | 18 | ||||
| -rw-r--r-- | main/icu/musl-fixes.patch | 11 |
2 files changed, 21 insertions, 8 deletions
diff --git a/main/icu/APKBUILD b/main/icu/APKBUILD index a84f584f70..a70e2c795a 100644 --- a/main/icu/APKBUILD +++ b/main/icu/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=icu -pkgver=57.1 +pkgver=58.1 # convert x.y.z to x_y_z _ver=${pkgver//./_} @@ -15,12 +15,14 @@ depends= makedepends= source="http://download.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz icu-timezone.patch - CVE-2016-6293.patch + musl-fixes.patch " # secfixes: # 57.1-r1: # - CVE-2016-6293 +# 58.1-r1: +# - CVE-2016-7415 _builddir="$srcdir"/icu/source @@ -72,12 +74,12 @@ libs() { replaces="icu" } -md5sums="976734806026a4ef8bdd17937c8898b9 icu4c-57_1-src.tgz +md5sums="1901302aaff1c1633ef81862663d2917 icu4c-58_1-src.tgz 2c81d9c9a6ea0af5b7391e001f37a5e0 icu-timezone.patch -7e65666fd48718440d819748118834ba CVE-2016-6293.patch" -sha256sums="ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581 icu4c-57_1-src.tgz +391f6976653b48459edd7a089745259f musl-fixes.patch" +sha256sums="0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 icu4c-58_1-src.tgz 1c3c432228ee254af7adc995d65b65a4c9dac3b868fe1e49fe588a0ffa55a158 icu-timezone.patch -4b7322fa2d222bf20e74f8fb5d31f3ee44f214fc4b17e60dd89cc6252348435e CVE-2016-6293.patch" -sha512sums="a3c701e9c81622db545bcf93f315c7b13159750f43f009d0aec59ceae3a8e1ccb751826d4b8a7387aca47f38bff2a85816b1a123b07d2bf731558c7b66e47b8a icu4c-57_1-src.tgz +bec3afc90cdec0325b2c1c8c02864c6ed0a484f520f2e7230f2b9c38e8a61dfd musl-fixes.patch" +sha512sums="59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155 icu4c-58_1-src.tgz 40489c36e28e160f08e045acab6c19cdb712ad3b7f87f67099deac7d579aaf13d8841cd3278a6bb0e998b5c34a378348a13fcc8bb14c9c4eb4f6adbd10d66825 icu-timezone.patch -8fba91b583896c52c12a0c8327f12fb77826779e453f91752826143bfdd5d2a2abe8db9836cdb6e12bcd31b9c683c00163e7c787807209d2e87ee8558d6293fb CVE-2016-6293.patch" +2fe06ab01a123c36942db1f1dc8b42e79bcd033ac09b0bc964e3b1b7f309bb44570585dc8b50f28f9fb0a6d9540b12dd9e147660eec9b50b80b7257d6a840d82 musl-fixes.patch" diff --git a/main/icu/musl-fixes.patch b/main/icu/musl-fixes.patch new file mode 100644 index 0000000000..3418230862 --- /dev/null +++ b/main/icu/musl-fixes.patch @@ -0,0 +1,11 @@ +--- a/i18n/digitlst.cpp ++++ b/i18n/digitlst.cpp +@@ -61,7 +61,7 @@ + #endif + + #if U_USE_STRTOD_L && !U_PLATFORM_USES_ONLY_WIN32_API +-# if U_PLATFORM == U_PF_CYGWIN ++# if U_PLATFORM == U_PF_CYGWIN || U_PLATFORM == U_PF_LINUX + # include <locale.h> + # else + # include <xlocale.h> |