Merge branch 'master' into zfs

1 files changed, 13 insertions, 24 deletions

diff --git a/system/icu/APKBUILD b/system/icu/APKBUILD
index 7676fbf2b..046698316 100644
--- a/system/icu/APKBUILD
+++ b/system/icu/APKBUILD
@@ -1,24 +1,23 @@
 # Contributor: Sergey Lukin <sergej.lukin@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=icu
-pkgver=63.1
+pkgver=65.1
 
 # convert x.y.z to x_y_z
 _ver=$(printf '%s' "$pkgver" | tr . _)
 
 pkgrel=1
-pkgdesc="International Components for Unicode library"
+pkgdesc="International Components for Unicode"
 url="http://site.icu-project.org/"
 arch="all"
 license="ICU"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs"
 depends=""
-checkdepends="diffutils"
+checkdepends="diffutils python3"
 makedepends=""
-source="https://ssl.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src.tgz
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs"
+source="https://github.com/unicode-org/icu/releases/download/release-$(printf '%s' "$pkgver" | tr . -)/${pkgname}4c-$_ver-src.tgz
 	icu-60.2-always-use-utf8.patch
-	checkimpl.patch
-	icu-63.1-test-failure.patch
+	CVE-2020-10531.patch
 	"
 
 # secfixes:
@@ -29,21 +28,15 @@ source="https://ssl.icu-project.org/files/icu4c/${pkgver}/${pkgname}4c-$_ver-src
 #   58.2-r2:
 #     - CVE-2017-7867
 #     - CVE-2017-7868
+#   65.1-r1:
+#     - CVE-2020-10531
+
 builddir="$srcdir"/icu/source
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 
-	# strtod_l() is not supported by musl; also xlocale.h is missing
-	# It is not possible to disable its use via configure switches or env vars
-	# so monkey patching is needed. Idea was stollen from openembedded
-	# https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-support/icu/icu.inc#L30
-	sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' configure.ac
-	sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' configure
-
-	local x
 	# https://bugs.icu-project.org/trac/ticket/6102
 	for x in ARFLAGS CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
 		sed -i -e "/^${x} =.*/s:@${x}@::" "config/Makefile.inc.in"
@@ -51,7 +44,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -62,18 +54,16 @@ build() {
 		--with-data-packaging=library \
 		--disable-samples \
 		--mandir=/usr/share/man
+	# Weird build system glitch.
+	mkdir data/out
 	make
 }
 
 check() {
-	# armhf tests fail with gensprep: Bus error
-	[ "$CARCH" != armhf ] || return 0
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 	chmod +x "$pkgdir"/usr/bin/icu-config
 	install -Dm644 "$srcdir"/icu/license.html \
@@ -86,7 +76,6 @@ static() {
 	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
 }
 
-sha512sums="9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c  icu4c-63_1-src.tgz
+sha512sums="8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139  icu4c-65_1-src.tgz
 f86c62422f38f6485c58d4766e629bab69e4b0e00fa910854e40e7db1ace299152eaefa99ae2fbab7465e65d3156cbea7124612defa60680db58ab5c34d6262f  icu-60.2-always-use-utf8.patch
-af27a474af041a6ac522901a635c3f328dee5f2b8e42d1229970908c740cd2b97fc06e5432541773d7c80339382f75d795911540f844b6d89ec0ee99d4fa6ff9  checkimpl.patch
-24a64f05e10b59d2f7fdd063e032195d446c668497934a0f5012a7b6088b61d260f7ddb8ecbe60bdc49e16ab810fda169bc1d330f30acdf45a1ad8f844fc464d  icu-63.1-test-failure.patch"
+2901235a24b1973516e495473188b077eb0486714ac47f702f226a3406176e913672159978b67548a1316284ecc716e06158b05c190ddfa83ad576a7a3539d72  CVE-2020-10531.patch"