From bae45fc461d773d5cc650a2d985fe690cb8be2fd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:46 +0000 Subject: [PATCH] app-arch/xz-utils: Sync with Gentoo It's from Gentoo commit 1ce522ed271960a3ba7674e92591c9cecc352ca7. --- .../portage-stable/app-arch/xz-utils/Manifest | 4 ++-- .../portage-stable/app-arch/xz-utils/metadata.xml | 1 + ...{xz-utils-5.4.0.ebuild => xz-utils-5.4.1.ebuild} | 13 ++++++++++--- .../app-arch/xz-utils/xz-utils-9999.ebuild | 11 +++++++++-- 4 files changed, 22 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/portage-stable/app-arch/xz-utils/{xz-utils-5.4.0.ebuild => xz-utils-5.4.1.ebuild} (80%) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest index b9679e514c..8e72b07133 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest @@ -1,4 +1,4 @@ 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.4.0.tar.gz 2332619 BLAKE2B 7bcf2e48470b885ae48b1fd0d46ab504961e7c5b1358d8c57a6fe1ba32311f5ca837740cff7ba77767f0a25ef80ec68c3d43029f87af035131526cb71f961d0f SHA512 29b2cd25bb5b234b329ffe9547692d2c29be393db9d8d4ce70a66dfdaebd54433e79a89d80c57e58cd4559c3c68b9845507d5fedf3eec1c528a81e3d9ddbd811 -DIST xz-5.4.0.tar.gz.sig 566 BLAKE2B 6f8a6c81c0d91cea08b218e8f8ed74cea3b471a0adb0b5aac114f85d103977052b735ce5582e4fe5354dde17a7072d776f2fd64844531c3f67e60c770ccdc10e SHA512 9bebc2ad25ff63036e6cb07e9ea6767441138fd91ef59e6f068c370296a594135479477a18f086dbf06b7dda5188fa0da09c24a6b7b3e7222e4bca70104d20d2 +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 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/metadata.xml index 7780c7209f..89d8ff6798 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/metadata.xml @@ -13,5 +13,6 @@ cpe:/a:tukaani:xz lzmautils + tukaani-project/xz diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.0.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.1.ebuild similarity index 80% rename from sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.0.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.1.ebuild index 53811b5967..9aa96a389d 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Remember: we cannot leverage autotools in this ebuild in order @@ -9,7 +9,12 @@ EAPI=7 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.tukaani.org/xz.git" + # Per tukaani.org, git.tukaani.org is a mirror of github and + # may be behind. + EGIT_REPO_URI=" + https://github.com/tukaani-project/xz + https://git.tukaani.org/xz.git + " inherit git-r3 autotools # bug #272880 and bug #286068 @@ -20,15 +25,17 @@ else MY_P="${PN/-utils}-${PV/_}" SRC_URI=" + https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz mirror://sourceforge/lzmautils/${MY_P}.tar.gz https://tukaani.org/xz/${MY_P}.tar.gz verify-sig? ( + https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig https://tukaani.org/xz/${MY_P}.tar.gz.sig ) " if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild index 53811b5967..cb694cd99a 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Remember: we cannot leverage autotools in this ebuild in order @@ -9,7 +9,12 @@ EAPI=7 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.tukaani.org/xz.git" + # Per tukaani.org, git.tukaani.org is a mirror of github and + # may be behind. + EGIT_REPO_URI=" + https://github.com/tukaani-project/xz + https://git.tukaani.org/xz.git + " inherit git-r3 autotools # bug #272880 and bug #286068 @@ -20,9 +25,11 @@ else MY_P="${PN/-utils}-${PV/_}" SRC_URI=" + https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz mirror://sourceforge/lzmautils/${MY_P}.tar.gz https://tukaani.org/xz/${MY_P}.tar.gz verify-sig? ( + https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig https://tukaani.org/xz/${MY_P}.tar.gz.sig ) "