Upgraded packages to latest upstream
Upgraded app-arch/xz-utils to v5.4.2
BUG=b/277108880
TEST=presubmit
RELEASE_NOTE=Upgraded app-arch/xz-utils to v5.4.2.
Change-Id: Iffc78a7d71ca1cb48c765e02fc9c2a2e74236eb0
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/portage-stable/+/46249
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Chenglong Tang <chenglongtang@google.com>
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 8e72b07..457b0d0 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,4 +1,8 @@
DIST xz-5.2.10.tar.gz 2123206 BLAKE2B fdd9e77e21ee65482401e0e43e0b291093a227d452991a9182562989b7a4388ceed30d5d54cd7f86320dcc073eb792032a49741880338a29043a8380507c4215 SHA512 c3814680fcad421efa71cf977217a62c34e3223900302a6fd7d505f310a7b338815feee2c8225b1232bd22b9e29c7dda3664e54dae2d80f816daec6adf560ca1
DIST xz-5.2.10.tar.gz.sig 566 BLAKE2B ce72730816d03084dc0d1559d6f2890b3ebe25a5e6b0720d4775ba2364762b5d1934a3a53f2255f6e68a1cdf42778d85d8b02ab30396b2addab619e95855f733 SHA512 48a0864abee6639116678afab6e8319eb2de903b381362c611fb77f9b6fc21df5f7d9783a250810f7ecc08380fb371a3a791ab55f5a343b68b9d4f9e414da403
+DIST xz-5.2.11.tar.gz 2130684 BLAKE2B e513f99b2e28fa79f32747e21138cc13ab9340e95a302ac742bc6bda088465488173ea212704c4612f4059bbbc6c6a5b041332d84b999dc7df5b3fab1b1ac4e9 SHA512 8f75450380563229465420f4518fa7a60bbe6f0c9a3b580c2a9a7bf9bf380ad69209f792764115c346d89c49711478e8db42325ef9a46ccd3a6ec72292890ac8
+DIST xz-5.2.11.tar.gz.sig 566 BLAKE2B 34186ea22960f508dd796736107b99e1e3884ffae683f26671f455e46e4debf87400f2d7bb64b446fb142370a8bcebc6c05dce34dcc2678a761b9401b1e23860 SHA512 036ed0f663e179057a805a41052d3e437fbfb9dbbe173c5180fbb255f5a01ac4fa2561424228f4e568e63b22802b3a4ffd88dec2ba7c41a454998ebea30bea7c
DIST xz-5.4.1.tar.gz 2528617 BLAKE2B f4dc8698fb97002aa0548107b448ab0dd8659cce506a83775930f95fd775601f7de1df44866310ac617853410a1915cd4e90ad4088b2fd56418e67b6f0fc4e98 SHA512 5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b
DIST xz-5.4.1.tar.gz.sig 566 BLAKE2B f384bcf7ea6bd7d3af65b6b17b379b48826257f403bca0bed1b42697f88edbc38f38eaac03c5564fc466df670f40e2e7ee49974232da4eb849718e89234c224b SHA512 2e6c3bf04ceb29c1bac8fdde7aa09c4d0f96442515d797e06ea860f365fd94777630b0034b98006cf844083efea8642a0bf87b1ff56de6a58446a644b1fd3c1c
+DIST xz-5.4.2.tar.gz 2799022 BLAKE2B 3c622b0823f0cbb5fbc5eaa0372fc2f0fefe0950d131417f831bce47b6d9747d145429f0649de106819331f9ae6a289c497182c7b6d1e211513308dd083a9b72 SHA512 149f980338bea3d66de1ff5994b2b236ae1773135eda68b62b009df0c9dcdf5467f8cb2c06da95a71b6556d60bd3d21f475feced34d5dfdb80ee95416a2f9737
+DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 95c9c70fdd25b92095dd9691e4d9d4306a3f982becfe7bd42ca6132a76f29be2c2bc66f4fc2bda547058c18e227292f4185799eb905084fc3ab415ae867b4b1b SHA512 30e965c228ed3a8ecb804db8eb11703a765b7ee934030ea69bb3940b630811eb71bf74fd20371ef7759761904ece4f0144a0b00be4d843cf98299fd016f161aa
diff --git a/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch b/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
new file mode 100644
index 0000000..217cc75
--- /dev/null
+++ b/app-arch/xz-utils/files/xz-utils-5.4.2-Wsign-conversion.patch
@@ -0,0 +1,23 @@
+https://github.com/tukaani-project/xz/commit/0673c9ec98b6bae12b33dc295564514aaa26e2fc
+
+From 0673c9ec98b6bae12b33dc295564514aaa26e2fc Mon Sep 17 00:00:00 2001
+From: Lasse Collin <lasse.collin@tukaani.org>
+Date: Sun, 19 Mar 2023 22:45:59 +0200
+Subject: [PATCH] liblzma: Silence -Wsign-conversion in SSE2 code in
+ memcmplen.h.
+
+Thanks to Christian Hesse for reporting the issue.
+Fixes: https://github.com/tukaani-project/xz/issues/44
+--- a/src/liblzma/common/memcmplen.h
++++ b/src/liblzma/common/memcmplen.h
+@@ -89,7 +89,8 @@ lzma_memcmplen(const uint8_t *buf1, const uint8_t *buf2,
+ // version isn't used on x86-64.
+ # define LZMA_MEMCMPLEN_EXTRA 16
+ while (len < limit) {
+- const uint32_t x = 0xFFFF ^ _mm_movemask_epi8(_mm_cmpeq_epi8(
++ const uint32_t x = 0xFFFF ^ (uint32_t)_mm_movemask_epi8(
++ _mm_cmpeq_epi8(
+ _mm_loadu_si128((const __m128i *)(buf1 + len)),
+ _mm_loadu_si128((const __m128i *)(buf2 + len))));
+
+
diff --git a/app-arch/xz-utils/xz-utils-5.4.1.ebuild b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
similarity index 92%
rename from app-arch/xz-utils/xz-utils-5.4.1.ebuild
rename to app-arch/xz-utils/xz-utils-5.4.2.ebuild
index d0b4981..62c0b9f 100644
--- a/app-arch/xz-utils/xz-utils-5.4.1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -47,12 +47,16 @@
# See top-level COPYING file as it outlines the various pieces and their licenses.
LICENSE="public-domain LGPL-2.1+ GPL-2+"
SLOT="0"
-IUSE="+extra-filters nls static-libs"
+IUSE="doc +extra-filters nls static-libs"
if [[ ${PV} != 9999 ]] ; then
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
fi
+PATCHES=(
+ "${FILESDIR}"/${P}-Wsign-conversion.patch
+)
+
src_prepare() {
default
@@ -68,6 +72,7 @@
multilib_src_configure() {
local myconf=(
--enable-threads
+ $(multilib_native_use_enable doc)
$(use_enable nls)
$(use_enable static-libs static)
)
@@ -110,7 +115,10 @@
multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
- rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+
+ if use doc ; then
+ rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
+ fi
}
pkg_preinst() {
