From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A182D158012 for ; Fri, 24 Sep 2021 18:15:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20256E099E; Fri, 24 Sep 2021 18:15:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6F88E099E for ; Fri, 24 Sep 2021 18:15:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3319342A7A for ; Fri, 24 Sep 2021 18:15:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9401E5 for ; Fri, 24 Sep 2021 18:15:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1632507224.7a771de8495a19e73ee8c2bd3cd7f08fbe341e7d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/files/, dev-libs/icu/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/icu/files/icu-69.1-fix-ub-units.patch dev-libs/icu/icu-69.1-r1.ebuild dev-libs/icu/icu-69.1.ebuild X-VCS-Directories: dev-libs/icu/ dev-libs/icu/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7a771de8495a19e73ee8c2bd3cd7f08fbe341e7d X-VCS-Branch: master Date: Fri, 24 Sep 2021 18:15:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f1918b89-1a68-4cd0-ae62-2f88276daa45 X-Archives-Hash: 145aff8be03f40ad9c836ebd603434ea commit: 7a771de8495a19e73ee8c2bd3cd7f08fbe341e7d Author: Sam James gentoo org> AuthorDate: Fri Sep 24 18:13:44 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 24 18:13:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a771de8 dev-libs/icu: add upstream patch for test failure This may cause runtime breakage (not just a failure in a test, but exposed by it on hppa and actually riscv) and it's a straightforward patch, so let's `git mv` in stable. Bug: https://bugs.gentoo.org/788112 Closes: https://bugs.gentoo.org/807893 Signed-off-by: Sam James gentoo.org> dev-libs/icu/files/icu-69.1-fix-ub-units.patch | 23 ++++++++++++++++++++++ .../icu/{icu-69.1.ebuild => icu-69.1-r1.ebuild} | 3 +++ 2 files changed, 26 insertions(+) diff --git a/dev-libs/icu/files/icu-69.1-fix-ub-units.patch b/dev-libs/icu/files/icu-69.1-fix-ub-units.patch new file mode 100644 index 00000000000..6847d585155 --- /dev/null +++ b/dev-libs/icu/files/icu-69.1-fix-ub-units.patch @@ -0,0 +1,23 @@ +https://github.com/unicode-org/icu/pull/1715 +https://bugs.gentoo.org/788112 + +From 29f1188d191a7a75ac7ffa4bfa390f625da39c53 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Tue, 11 May 2021 19:04:24 +0200 +Subject: [PATCH] ICU-21613 Fix undefined behaviour in + ComplexUnitsConverter::applyRounder + +--- a/i18n/units_complexconverter.cpp ++++ b/i18n/units_complexconverter.cpp +@@ -237,6 +237,11 @@ void ComplexUnitsConverter::applyRounder(MaybeStackArray &intValues, + } + quantity = decimalQuantity.toDouble(); + ++ if (uprv_isNaN(quantity) || uprv_isInfinite(quantity)) { ++ // Do nothing for non-finite values, since conversion to int64_t is undefined ++ return; ++ } ++ + int32_t lastIndex = unitsConverters_.length() - 1; + if (lastIndex == 0) { + // Only one element, no need to bubble up the carry diff --git a/dev-libs/icu/icu-69.1.ebuild b/dev-libs/icu/icu-69.1-r1.ebuild similarity index 96% rename from dev-libs/icu/icu-69.1.ebuild rename to dev-libs/icu/icu-69.1-r1.ebuild index 1d2630ee16e..b540e57c81b 100644 --- a/dev-libs/icu/icu-69.1.ebuild +++ b/dev-libs/icu/icu-69.1-r1.ebuild @@ -32,6 +32,9 @@ PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" "${FILESDIR}/${PN}-64.2-darwin.patch" "${FILESDIR}/${PN}-68.1-nonunicode.patch" + # Should be in the next rleease, but check + # https://bugs.gentoo.org/788112 + "${FILESDIR}/${PN}-69.1-fix-ub-units.patch" ) src_prepare() {