From 5fd2c3b6b0c2de03f978431d81085b9296e689eb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:19:01 +0000 Subject: [PATCH 01/76] acct-group/pcap: Sync with Gentoo It's from Gentoo commit 4a419599570c5efed5d5f740c41cf0b3904086c4. --- .../third_party/portage-stable/acct-group/pcap/metadata.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/acct-group/pcap/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-group/pcap/metadata.xml index b75adbf441..641cbd3703 100644 --- a/sdk_container/src/third_party/portage-stable/acct-group/pcap/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/acct-group/pcap/metadata.xml @@ -1,10 +1,6 @@ - - zlogene@gentoo.org - Mikle Kolyada - sam@gentoo.org Sam James From 62efca9933acac7defb7e2161874b52b4e0956cb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:12 +0000 Subject: [PATCH 02/76] acct-user/pcap: Sync with Gentoo It's from Gentoo commit 4a419599570c5efed5d5f740c41cf0b3904086c4. --- .../third_party/portage-stable/acct-user/pcap/metadata.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/acct-user/pcap/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/pcap/metadata.xml index b75adbf441..641cbd3703 100644 --- a/sdk_container/src/third_party/portage-stable/acct-user/pcap/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/acct-user/pcap/metadata.xml @@ -1,10 +1,6 @@ - - zlogene@gentoo.org - Mikle Kolyada - sam@gentoo.org Sam James From 81879a18ae063ea043ee43e519c6bdb17c8d7859 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:44 +0000 Subject: [PATCH 03/76] app-arch/cpio: Sync with Gentoo It's from Gentoo commit e82c66c6494159d59fe2d771f8eec43748dd869b. --- ...pio-2.13-r4.ebuild => cpio-2.13-r5.ebuild} | 3 ++- ...wincompatible-function-pointer-types.patch | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/portage-stable/app-arch/cpio/{cpio-2.13-r4.ebuild => cpio-2.13-r5.ebuild} (93%) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.13-wincompatible-function-pointer-types.patch diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r4.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r5.ebuild similarity index 93% rename from sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r4.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r5.ebuild index 79d4ada196..b184309b5c 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r5.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 EAPI=8 @@ -24,6 +24,7 @@ PATCHES=( "${WORKDIR}"/${P}-CVE-2021-38185.patch "${FILESDIR}"/${PN}-2.13-sysmacros-glibc-2.26.patch "${FILESDIR}"/${PN}-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch + "${FILESDIR}"/${PN}-2.13-wincompatible-function-pointer-types.patch ) src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.13-wincompatible-function-pointer-types.patch b/sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.13-wincompatible-function-pointer-types.patch new file mode 100644 index 0000000000..4f2dc31536 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.13-wincompatible-function-pointer-types.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/880373 +https://savannah.gnu.org/bugs/index.php?63349 +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=0cc39712803ade7b2d4b89c36b143dad72404063 + +From 0cc39712803ade7b2d4b89c36b143dad72404063 Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sun, 18 Oct 2020 14:37:13 +0200 +Subject: obstack: Fix a clang warning. + +* lib/obstack.c (print_and_abort): Mark as __attribute_noreturn__. +--- a/gnu/obstack.c ++++ b/gnu/obstack.c +@@ -326,7 +326,7 @@ int obstack_exit_failure = EXIT_FAILURE; + # include + # endif + +-static _Noreturn void ++static __attribute_noreturn__ void + print_and_abort (void) + { + /* Don't change any of these strings. Yes, it would be possible to add +-- +cgit v1.1 From d21a050c6ac25f8a5507f73556b4a5e1922bdb95 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:44 +0000 Subject: [PATCH 04/76] app-arch/gzip: Sync with Gentoo It's from Gentoo commit 75180a96ea6c34e3f37b5c623ceeae66119d5bd7. --- .../app-arch/gzip/{gzip-1.12-r3.ebuild => gzip-1.12-r4.ebuild} | 2 -- ...gzip-1.12_p20221228.ebuild => gzip-1.12_p20221228-r1.ebuild} | 2 -- 2 files changed, 4 deletions(-) rename sdk_container/src/third_party/portage-stable/app-arch/gzip/{gzip-1.12-r3.ebuild => gzip-1.12-r4.ebuild} (96%) rename sdk_container/src/third_party/portage-stable/app-arch/gzip/{gzip-1.12_p20221228.ebuild => gzip-1.12_p20221228-r1.ebuild} (96%) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12-r4.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12-r3.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12-r4.ebuild index 652ddbb315..acc085235b 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12-r4.ebuild @@ -56,8 +56,6 @@ src_install() { for x in gunzip gzip zcat; do mv "${ED}/usr/bin/${x}" "${ED}/bin/${x}-reference" || die done - sed -i -e 's:exec gzip:&-reference:' \ - "${ED}"/bin/{gunzip,zcat}-reference || die mv "${ED}"/usr/share/man/man1/gzip{,-reference}.1 || die rm "${ED}"/usr/share/man/man1/{gunzip,zcat}.1 || die } diff --git a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12_p20221228.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12_p20221228.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild index 5e5dd9d96e..23e799f74e 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12_p20221228.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild @@ -71,8 +71,6 @@ src_install() { for x in gunzip gzip zcat; do mv "${ED}/usr/bin/${x}" "${ED}/bin/${x}-reference" || die done - sed -i -e 's:exec gzip:&-reference:' \ - "${ED}"/bin/{gunzip,zcat}-reference || die mv "${ED}"/usr/share/man/man1/gzip{,-reference}.1 || die rm "${ED}"/usr/share/man/man1/{gunzip,zcat}.1 || die } From c4658ed4dc214bee1eaa13a010fc0e09e55c3bf3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:44 +0000 Subject: [PATCH 05/76] app-arch/lbzip2: Sync with Gentoo It's from Gentoo commit 8f03cd6c9fcc5b5e911cb3379fe0a17052c0a0d8. --- .../files/lbzip2-2.5_p20181227-clang16.patch | 27 +++++++++++++++++++ ....ebuild => lbzip2-2.5_p20181227-r2.ebuild} | 5 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/lbzip2/files/lbzip2-2.5_p20181227-clang16.patch rename sdk_container/src/third_party/portage-stable/app-arch/lbzip2/{lbzip2-2.5_p20181227-r1.ebuild => lbzip2-2.5_p20181227-r2.ebuild} (89%) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lbzip2/files/lbzip2-2.5_p20181227-clang16.patch b/sdk_container/src/third_party/portage-stable/app-arch/lbzip2/files/lbzip2-2.5_p20181227-clang16.patch new file mode 100644 index 0000000000..7342b19cd0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/lbzip2/files/lbzip2-2.5_p20181227-clang16.patch @@ -0,0 +1,27 @@ +https://github.com/kjn/lbzip2/pull/33 + +From 32b5167940ec817e454431956040734af405a9de Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Thu, 5 Jan 2023 18:02:26 +0100 +Subject: [PATCH] Define the GNULIB_XALLOC_DIE macro + +This avoids an implicit function declaration when building gnulib's +xmalloc.c, addressing a build failure with future compiler version. + +Solution proposed by Bruno Haible here: + + Re: xmalloc calling undeclared xalloc_die function + +--- a/configure.ac ++++ b/configure.ac +@@ -31,6 +31,9 @@ AC_PROG_LN_S + AC_PROG_RANLIB + AC_PROG_CC_C89 + ++AC_DEFINE(GNULIB_XALLOC_DIE, 1, ++ [This package is providing its own definition of the xalloc_die function.]) ++ + gl_ASSERT_NO_GNULIB_TESTS + gl_ASSERT_NO_GNULIB_POSIXCHECK + gl_EARLY + diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild index 1584b8dd8b..4272c9ad02 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 inherit autotools flag-o-matic @@ -17,6 +17,7 @@ IUSE="debug static" PATCHES=( "${FILESDIR}"/${PN}-2.3-s_isreg.patch "${FILESDIR}"/${P}-fix-unaligned.patch + "${FILESDIR}"/${P}-clang16.patch ) src_prepare() { From dc7d3086280dcc9a18d12e91e67ff59e161fe49a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:45 +0000 Subject: [PATCH 06/76] app-arch/ncompress: Sync with Gentoo It's from Gentoo commit e5e8fc552b29179767cc030ca687ff684ac9a715. --- .../ncompress/ncompress-5.0-r1.ebuild | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r1.ebuild new file mode 100644 index 0000000000..2b3cfe6191 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs + +DESCRIPTION="Classic compress & uncompress programs for .Z (LZW) files" +HOMEPAGE="https://vapier.github.io/ncompress/" +SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="" + +src_prepare() { + default + # First sed expression replaces hardlinking with + # symlinking. Second sed expression fixes the symlink target + # to use relative path to a file in the same directory as the + # symlink (so point to compress instead of + # $(DESTDIR)$(BINDIR)/compress). + sed -i \ + -e 's:\bln :ln -s :' \ + -e 's:\(\bln [^$]*\)\$(DESTDIR)\$(BINDIR)/:\1:' \ + Makefile.def || die +} + +src_configure() { + tc-export CC +} + +src_install() { + emake install_core DESTDIR="${ED}" PREFIX="/usr" + dodoc Acknowleds Changes LZW.INFO README.md +} From c74ea15767657bee72ad95cc7595b3dac8a1a900 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:45 +0000 Subject: [PATCH 07/76] app-arch/pigz: Sync with Gentoo It's from Gentoo commit 8a1a91aa281cd0c6f2d3c2054ed9c866a04d594d. --- .../pigz/files/pigz-2.7-memcpy-ub.patch | 26 +++++++++++++ .../app-arch/pigz/pigz-2.7-r1.ebuild | 38 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch b/sdk_container/src/third_party/portage-stable/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch new file mode 100644 index 0000000000..db53660748 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/pigz/files/pigz-2.7-memcpy-ub.patch @@ -0,0 +1,26 @@ +https://github.com/madler/pigz/commit/e1ed230a1599a3cb64c8f5c003cced60e10e3314 +https://github.com/madler/pigz/issues/107 + +From e1ed230a1599a3cb64c8f5c003cced60e10e3314 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Sat, 31 Dec 2022 21:28:26 -0800 +Subject: [PATCH] Avoid calling memcpy() with a NULL pointer. + +This is not permitted by the C99 standard even when the length is +zero. Go figure. +--- a/pigz.c ++++ b/pigz.c +@@ -3414,8 +3414,10 @@ local int outb(void *desc, unsigned char *buf, unsigned len) { + + // copy the output and alert the worker bees + out_len = len; +- g.out_tot += len; +- memcpy(out_copy, buf, len); ++ if (len) { ++ g.out_tot += len; ++ memcpy(out_copy, buf, len); ++ } + twist(outb_write_more, TO, 1); + twist(outb_check_more, TO, 1); + + diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7-r1.ebuild new file mode 100644 index 0000000000..f0a9d1f454 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="A parallel implementation of gzip" +HOMEPAGE="https://www.zlib.net/pigz/" +SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris" +IUSE="static test" +RESTRICT="!test? ( test )" + +LIB_DEPEND="sys-libs/zlib[static-libs(+)]" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + test? ( app-arch/ncompress )" + +PATCHES=( + "${FILESDIR}"/${P}-memcpy-ub.patch +) + +src_compile() { + use static && append-ldflags -static + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin ${PN} + dosym ${PN} /usr/bin/un${PN} + dodoc README + doman ${PN}.1 +} From bae45fc461d773d5cc650a2d985fe690cb8be2fd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:46 +0000 Subject: [PATCH 08/76] 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 ) " From a2535026c04b32bb4c85d9a378165996d1807313 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:47 +0000 Subject: [PATCH 09/76] app-crypt/adcli: Sync with Gentoo It's from Gentoo commit 1259b354f00b4370ed2b5405cdea9ce8d20bbce4. --- .../portage-stable/app-crypt/adcli/Manifest | 1 - .../app-crypt/adcli/adcli-0.9.1-r2.ebuild | 40 ------------------- .../files/adcli-0.9.1-glibc-2.34-resolv.patch | 32 --------------- ...library-include-endian.h-for-le32toh.patch | 21 ---------- 4 files changed, 94 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/adcli/adcli-0.9.1-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/Manifest index 79c8bda78f..9dc8e534d1 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/Manifest @@ -1,2 +1 @@ -DIST adcli-0.9.1.tar.bz2 89684 BLAKE2B deaf6d3a13ad29c77a35b9f9c195dd646f384ad7c9782c15b50b26efceabae268bbb287d488ec7ed8d783d92ce7d8399f05898d30201d0d7fab7c0369c22fce1 SHA512 7e41fb51bfcb8837f9e5f6fd1fceacece0762c237dbc0f58dd581e2be8841d7a613d57507aea4534a66a2bd10ef4d01c4e04885437038c71238739db6e357d6e DIST adcli-0.9.2.tar.bz2 93680 BLAKE2B b5958b276ee43a0ee54aa922f27ed266d4e9fbd1c86e0c007dac9fcf9cc022e1b3ba043b782fceb00066be2577390773dc99fb8d476a6b5e6523d44d008fb667 SHA512 ae8414a0af389b6845dd92d41446a80a9dc1734b874175323c0e491d99944eab442b95ae6d3a29fc69638d2e73bf8d2c369f6fa50e9ed3968527444b78606286 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/adcli-0.9.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/adcli-0.9.1-r2.ebuild deleted file mode 100644 index 4e27d477b6..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/adcli-0.9.1-r2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Tool for performing actions on an Active Directory domain" -HOMEPAGE="https://www.freedesktop.org/software/realmd/adcli/adcli.html" -SRC_URI="https://gitlab.freedesktop.org/realmd/adcli/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND=" - app-crypt/mit-krb5 - net-nds/openldap:=[sasl]" -RDEPEND="${DEPEND}" -BDEPEND=" - doc? ( - app-text/docbook-xml-dtd:4.3 - app-text/xmlto - dev-libs/libxslt - )" - -PATCHES=( - "${FILESDIR}"/${P}-glibc-2.34-resolv.patch - "${FILESDIR}"/${P}-library-include-endian.h-for-le32toh.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_enable doc) -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch deleted file mode 100644 index 105a4c407b..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://gitlab.freedesktop.org/realmd/adcli/-/commit/e841ba7513f3f8b6393183d2dea9adcbf7ba2e44 -https://bugs.gentoo.org/820224 - -From: Sumit Bose -Date: Wed, 28 Jul 2021 12:55:16 +0200 -Subject: [PATCH] configure: check for ns_get16 and ns_get32 as well - -With newer versions of glibc res_query() might ba already available in -glibc with ns_get16() and ns_get32() still requires libresolv. - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984891 ---- a/configure.ac -+++ b/configure.ac -@@ -98,13 +98,15 @@ AC_SUBST(LDAP_CFLAGS) - # ------------------------------------------------------------------- - # resolv - --AC_MSG_CHECKING(for which library has res_query) -+AC_MSG_CHECKING([for which library has res_query, ns_get16 and ns_get32]) - for lib in "" "-lresolv"; do - saved_LIBS="$LIBS" - LIBS="$LIBS $lib" - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([#include ], -- [res_query (0, 0, 0, 0, 0)]) -+ [res_query (0, 0, 0, 0, 0); -+ ns_get32 (NULL); -+ ns_get16 (NULL);]) - ], - [ AC_MSG_RESULT(${lib:-libc}); have_res_query="yes"; break; ], - [ LIBS="$saved_LIBS" ]) -GitLab diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch deleted file mode 100644 index b901796d8d..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/830325 -https://gitlab.freedesktop.org/realmd/adcli/-/merge_requests/47 - -From: Henning Schild -Date: Tue, 11 Jan 2022 08:22:55 +0100 -Subject: [PATCH] library: include endian.h for le32toh - -upstream commit 938065a751c0876eb837a27f8c1443fc7d0d2551 - -linking against musl libc we need to include that specifically, actually -also according to "man 3 endian". ---- a/library/adutil.c -+++ b/library/adutil.c -@@ -29,6 +29,7 @@ - - #include - #include -+#include - #include - #include - #include From 1ef3d93a9f8d51cb095a0084715231f2abdc9b3f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:47 +0000 Subject: [PATCH 10/76] app-crypt/mit-krb5: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/app-crypt/mit-krb5/mit-krb5-1.20.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mit-krb5/mit-krb5-1.20.1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/mit-krb5/mit-krb5-1.20.1.ebuild index 014a0511af..f3e57fc338 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mit-krb5/mit-krb5-1.20.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/mit-krb5/mit-krb5-1.20.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools python-any-r1 systemd toolchain-funcs multilib-minimal MY_P="${P/mit-}" From 8b8047cf4130463d3c73fe38ba26df31351b2da5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:47 +0000 Subject: [PATCH 11/76] app-editors/vim: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/app-editors/vim/Manifest | 1 + .../app-editors/vim/vim-9.0.0099-r1.ebuild | 4 +- .../app-editors/vim/vim-9.0.0828-r1.ebuild | 4 +- .../app-editors/vim/vim-9.0.1000.ebuild | 4 +- .../app-editors/vim/vim-9.0.1157.ebuild | 372 ++++++++++++++++++ .../app-editors/vim/vim-9999.ebuild | 4 +- 6 files changed, 381 insertions(+), 8 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1157.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest index c193a5b4d8..2953ddceb3 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest @@ -1,5 +1,6 @@ DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498 DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8 +DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0099-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0099-r1.ebuild index 512001925c..2e4c3941c6 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0099-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0099-r1.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 EAPI=8 @@ -7,7 +7,7 @@ EAPI=8 VIM_VERSION="9.0" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0828-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0828-r1.ebuild index 0bb399988a..035c07e22f 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0828-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0828-r1.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 EAPI=8 @@ -7,7 +7,7 @@ EAPI=8 VIM_VERSION="9.0" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1000.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1000.ebuild index 069d6d5c42..1e28129127 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1000.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1000.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 EAPI=8 @@ -9,7 +9,7 @@ VIM_VERSION="9.0" VIM_PATCHES_VERSION="9.0.1000" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1157.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1157.ebuild new file mode 100644 index 0000000000..16f9eb7faa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1157.ebuild @@ -0,0 +1,372 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby27 ruby30 ruby31" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + 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 + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + vim-pager? ( !minimal ) +" + +RDEPEND=" + >=app-eselect/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2:0= + nls? ( virtual/libintl ) + acl? ( kernel_linux? ( sys-apps/acl ) ) + crypt? ( dev-libs/libsodium:= ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + ) + ~app-editors/vim-core-${PV} + !> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\> "$c" || die "echo failed" + done + + # conditionally make the manpager.sh script + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man ts=8' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + _EOF_ + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm src/auto/configure || die "rm failed" + + eapply_user +} + +src_configure() { + + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug #57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug #24447). The hvc + # things are for ppc64, see bug #86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + fi + done + + local myconf=() + if use minimal; then + myconf=( + --with-features=tiny + --disable-nls + --disable-canberra + --disable-acl + --enable-gui=no + --without-x + --disable-darwin + --disable-luainterp + --disable-perlinterp + --disable-pythoninterp + --disable-mzschemeinterp + --disable-rubyinterp + --disable-selinux + --disable-tclinterp + --disable-gpm + ) + else + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable crypt libsodium) + $(use_enable cscope) + $(use_enable gpm) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable python python3interp) + $(use_with python python3-command "${PYTHON}") + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable tcl tclinterp) + $(use_enable terminal) + ) + + # --with-features=huge forces on cscope even if we --disable it. We need + # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" + fi + + if use lua; then + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # don't test USE=X here ... see bug #19115 + # but need to provide a way to link against X ... see bug #20093 + myconf+=( + --enable-gui=no + --disable-darwin + $(use_with X x) + ) + fi + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf \ + --with-modified-by=Gentoo-${PVR} \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + einfo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + einfo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + einfo + + # Don't let vim talk to X + unset DISPLAY + + # Arch and opensuse seem to do this and at this point, I'm willing + # to try anything to avoid random test hangs! + export TERM=xterm + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # Looks in wrong location? (bug #742710) + # - Test_job_tty_in_out + # Fragile and depends on TERM(?) + # - Test_spelldump_bang + # Hangs. + # - Test_fuzzy_completion_env + # Too sensitive to leaked environment variables. + # - Test_term_mouse_multiple_clicks_to_select_mode + # Hangs. + # - Test_spelldump + # Hangs. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)' + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug #187449) +eselect_vi_update() { + ebegin "Calling eselect vi update" + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + domenu runtime/vim.desktop + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild index fd6fe05780..16f9eb7faa 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-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 EAPI=8 @@ -9,7 +9,7 @@ VIM_VERSION="9.0" VIM_PATCHES_VERSION="9.0.1000" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" From 9117f270c7b7c56109365f959f0ce7ccc8070480 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:47 +0000 Subject: [PATCH 12/76] app-editors/vim-core: Sync with Gentoo It's from Gentoo commit 33e6817e3d108cb8e4cd1ad17227cf7f408b2fc1. --- .../app-editors/vim-core/Manifest | 1 + .../vim-core/vim-core-9.0.1157.ebuild | 231 ++++++++++++++++++ 2 files changed, 232 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1157.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest index c193a5b4d8..2953ddceb3 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest @@ -1,5 +1,6 @@ DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498 DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8 +DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271 DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1157.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1157.ebuild new file mode 100644 index 0000000000..72a59d3591 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1157.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + 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}/vim-${PV}" + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="nls acl minimal" + +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="sys-devel/autoconf" + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/vim-patches-vim-${VIM_PATCHES_VERSION}-patches + fi + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See bug #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i 's/\> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug #18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + + eapply_user +} + +src_configure() { + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + local myconf=( + --with-modified-by=Gentoo-${PVR} + --enable-gui=no + --without-x + --disable-darwin + --disable-perlinterp + --disable-pythoninterp + --disable-rubyinterp + --disable-gpm + --disable-selinux + $(use_enable nls) + $(use_enable acl) + ) + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf "${myconf[@]}" +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r6 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd + + # install gvim icon since both vim/gvim desktop files reference it + doicon -s scalable "${FILESDIR}"/gvim.svg +} + +pkg_postinst() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} From 7b643fa615b48b3e5396e0ec37778e8ce6ac8bf4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:48 +0000 Subject: [PATCH 13/76] app-emulation/qemu: Sync with Gentoo It's from Gentoo commit 74b06a127f862d7db58d1686fb8482644dc22a64. --- .../qemu/files/qemu-7.2.0-disable-gmp.patch | 45 +++++++++++++++++++ .../app-emulation/qemu/qemu-7.2.0-r1.ebuild | 14 +++--- .../app-emulation/qemu/qemu-7.2.0.ebuild | 2 +- .../app-emulation/qemu/qemu-9999.ebuild | 6 +-- 4 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.2.0-disable-gmp.patch diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.2.0-disable-gmp.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.2.0-disable-gmp.patch new file mode 100644 index 0000000000..3050228b4e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.2.0-disable-gmp.patch @@ -0,0 +1,45 @@ +commit 433c2acd1b9c3f7f5903273e85fed9a7f9157b23 +Author: John Helmert III +Date: Wed Jan 4 12:25:08 2023 -0600 + + meson.build: disable gmp + + gmp isn't required, and we want to avoid linking to it automatigcally + in Gentoo. + + Bug: https://bugs.gentoo.org/886207 + Signed-off-by: John Helmert III + +diff --git a/meson.build b/meson.build +index 5c6b5a1c75..2f9550362d 100644 +--- a/meson.build ++++ b/meson.build +@@ -1234,15 +1234,6 @@ if not gnutls_crypto.found() + endif + endif + +-gmp = dependency('gmp', required: false, method: 'pkg-config', kwargs: static_kwargs) +-if nettle.found() and gmp.found() +- hogweed = dependency('hogweed', version: '>=3.4', +- method: 'pkg-config', +- required: get_option('nettle'), +- kwargs: static_kwargs) +-endif +- +- + gtk = not_found + gtkx11 = not_found + vte = not_found +diff --git a/meson_options.txt b/meson_options.txt +index 4b749ca549..e06b274960 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -277,6 +277,8 @@ option('vduse_blk_export', type: 'feature', value: 'auto', + + option('capstone', type: 'feature', value: 'auto', + description: 'Whether and how to find the capstone library') ++option('gmp', type: 'feature', value: 'auto', ++ description: 'Whether or not to find the gmp library') + option('fdt', type: 'combo', value: 'auto', + choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], + description: 'Whether and how to find the libfdt library') diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0-r1.ebuild index 7d6949eb5d..2656a331fa 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0-r1.ebuild @@ -41,7 +41,7 @@ else fi S="${WORKDIR}/${MY_P}" - # [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -151,7 +151,7 @@ done # respected). This is because qemu supports using the C library's API # when available rather than always using the external library. ALL_DEPEND=" - >=dev-libs/glib-2.0[static-libs(+)] + dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) systemtap? ( dev-util/systemtap ) @@ -176,11 +176,14 @@ SOFTMMU_TOOLS_DEPEND=" fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( - dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] + dev-libs/nettle:=[static-libs(+)] ) gtk? ( + x11-libs/cairo + x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 + x11-libs/libX11 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) @@ -205,7 +208,7 @@ SOFTMMU_TOOLS_DEPEND=" ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( @@ -223,7 +226,7 @@ SOFTMMU_TOOLS_DEPEND=" ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) + usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) @@ -311,6 +314,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.0.0-make.patch "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch + "${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch ) QA_PREBUILT=" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0.ebuild index 53e3c04ee8..ee76679ed3 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0.ebuild @@ -41,7 +41,7 @@ else fi S="${WORKDIR}/${MY_P}" - [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86" + [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild index a9019ee984..ce7fda6680 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild @@ -205,7 +205,7 @@ SOFTMMU_TOOLS_DEPEND=" media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) - png? ( media-libs/libpng:0=[static-libs(+)] ) + png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) @@ -219,8 +219,8 @@ SOFTMMU_TOOLS_DEPEND=" smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] + >=app-emulation/spice-protocol-0.14.0 + >=app-emulation/spice-0.14.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) udev? ( virtual/libudev:= ) From 77ca0f0d70aa7ee337175776f83699b7753043ee Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:48 +0000 Subject: [PATCH 14/76] app-emulation/qemu-guest-agent: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../app-emulation/qemu-guest-agent/metadata.xml | 4 ---- .../qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild | 4 ++-- .../qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/metadata.xml b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/metadata.xml index 74a4e7a083..8995a72400 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/metadata.xml @@ -13,10 +13,6 @@ tamiko@gentoo.org Matthias Maier - - zlogene@gentoo.org - Mikle Kolyada - virtualization@gentoo.org Gentoo Virtualization Project diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild index 90262e9f63..e1c7788718 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{7..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit systemd toolchain-funcs udev python-any-r1 diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild index 2064e3a7dc..2bbb6c2c75 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit edo systemd toolchain-funcs python-any-r1 udev From fbefd9a2b31c7656509328534fdd0c6354019f8c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:48 +0000 Subject: [PATCH 15/76] app-portage/portage-utils: Sync with Gentoo It's from Gentoo commit a50367392098b45791594e5da8773986fcb34038. --- .../portage-stable/app-portage/portage-utils/metadata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml index 33a5917b3e..cfb3f0574e 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/metadata.xml @@ -11,5 +11,7 @@ cpe:/a:gentoo:portage + proj/portage-utils + gentoo/portage-utils From 144ca5ffaa6e53a3ab0f06e86eb40dc99afcf41e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:48 +0000 Subject: [PATCH 16/76] dev-db/sqlite: Sync with Gentoo It's from Gentoo commit 5a8b55018320bbd9a59d4d88354bae1a9f227832. --- .../portage-stable/dev-db/sqlite/Manifest | 4 - .../dev-db/sqlite/sqlite-3.39.4.ebuild | 440 ------------------ .../dev-db/sqlite/sqlite-3.40.0.ebuild | 432 ----------------- .../dev-db/sqlite/sqlite-3.40.1.ebuild | 2 +- 4 files changed, 1 insertion(+), 877 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.39.4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest index ef46a9e600..cd231ad177 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/Manifest @@ -1,6 +1,2 @@ -DIST sqlite-doc-3390400.zip 10853153 BLAKE2B 617927351809e5ec7489011f963337e92b539a83b135daa7ccd48f840d35716d08e8adc08a67e17d674a6bc64ca24fa92b56573c0065105386fc9c75f1f7f9ef SHA512 75d97b0f2f0d530b2e0ad505574af3bf657d82f0859bb5de7ee45c40a80351e933944845cedca56b579925a3d07505c6f4721f756f27862ffafdfc2caff539fb -DIST sqlite-doc-3400000.zip 10921883 BLAKE2B 786bba5f4eec32114b0e12d0a42eb763c3be999506edb65e72a1ea32499c9972be9e546b4773a96165273e3eac4da9c2e3c2c696e07494d8af8f273da72e44fd SHA512 3557fe49e08fd24890da584f3fa7fb93d1e3317787f98a8ce1062dcac07733782026e50dfef7db72582739ddf0a77095cc4d3a81f3df097a69e85c672591bf7e DIST sqlite-doc-3400100.zip 10934836 BLAKE2B 52adbfa911a5d8556e4e071bf14ad83145023fbd426f285d9724d7f06e41257df53d3c28224581f12b4ca8f699bf3d3ec829ee161374ce0208783e5da72639dc SHA512 1131b0a6304a4dd6287c85d38d1450fd2dd0e3377d88a263e3c4716415e0587750357f25486727b9433797da0331229682565e7a8a3986eba89cfcab550a2d41 -DIST sqlite-src-3390400.zip 13405169 BLAKE2B aa0e0abbdcafced086a604ec910dbfd1e4df28e83e0edb6056019391e96367050e59478ee8847d930191a65b21cf0bf9957c35ef056abd9be4947a3838d78eb2 SHA512 0acb8afc87f911c91ec555cc97af5b77b6b0e80cc8672711ddd87c651d9e11b697c9669ff9ba2b58da12b972bb46acdf8b8fe35993950f10735b4036501b73bb -DIST sqlite-src-3400000.zip 13723231 BLAKE2B 4b4d3119f3210497e4e41f1305558e7ed49505b635fed18f466b5fb8dcc60712d0c053a0e569f9af4b2b37803d2670528244bdcf6ef580fd3f85510e8d4dba78 SHA512 c3bb3829f99c663f3381f4c610e401173f133fe944558b70da7521cc44116d048e4e1651993feb128b0f3814381aa4fa93f48ba3e277abca3442af805159287d DIST sqlite-src-3400100.zip 13725560 BLAKE2B 24d2efbbf7f8f35888b1e53c98f9c7fece9b1cf0b175bf49b78869253aa753ce47e2db67247183c07368e69d6eb63a6e39c06b212c8fd5ca36c892ff535bedca SHA512 78f8c6396bf8da090671c6f4c41255e60788324fccdaad906c53610eb6e37705f4d25c7f84da3be00b511ddf9f2e0545901f33f5ae4b6e00b1ea9413af095299 diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.39.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.39.4.ebuild deleted file mode 100644 index ffcf6d0880..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.39.4.ebuild +++ /dev/null @@ -1,440 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools flag-o-matic multilib-minimal toolchain-funcs - -if [[ "${PV}" != "9999" ]]; then - SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))" - DOC_PV="${SRC_PV}" - # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))" -fi - -DESCRIPTION="SQL database engine" -HOMEPAGE="https://sqlite.org/" - -# On version updates, make sure to read the forum (https://sqlite.org/forum/forum) -# for hints regarding test failures, backports, etc. -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip - doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )" -fi - -LICENSE="public-domain" -SLOT="3" -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" -IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" -if [[ "${PV}" == "9999" ]]; then - PROPERTIES="live" -fi -RESTRICT="!test? ( test )" - -if [[ "${PV}" == "9999" ]]; then - BDEPEND=">=dev-lang/tcl-8.6:0 - dev-vcs/fossil" -else - BDEPEND="app-arch/unzip - >=dev-lang/tcl-8.6:0" -fi -RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] - icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) - tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:0= )" -DEPEND="${RDEPEND} - test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" - -if [[ "${PV}" == "9999" ]]; then - S="${WORKDIR}/${PN}" -else - S="${WORKDIR}/${PN}-src-${SRC_PV}" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-3.39.4-icu-72-test.patch -) - -_fossil_fetch() { - local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" - local repo_id="${1}" - local repo_uri="${2}" - - local -x FOSSIL_HOME="${HOME}" - - mkdir -p "${T}/fossil/${repo_id}" || die - pushd "${T}/fossil/${repo_id}" > /dev/null || die - - if [[ -n "${EVCS_OFFLINE}" ]]; then - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" - fi - else - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" - fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die - echo - else - cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die - einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" - fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die - echo - fi - - ( - addwrite "${distdir}" - mkdir -p "${distdir}/fossil-src/${repo_id}" || die - cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die - ) - fi - - popd > /dev/null || die -} - -_fossil_checkout() { - local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" - local repo_id="${1}" - local branch_or_commit="${2}" - local target_directory="${3}" - - local -x FOSSIL_HOME="${HOME}" - - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" - fi - - if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then - mkdir -p "${T}/fossil/${repo_id}" || die - cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die - fi - - mkdir "${target_directory}" || die - pushd "${target_directory}" > /dev/null || die - - einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" - fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die - echo - - popd > /dev/null || die -} - -fossil_fetch() { - local repo_id="${1}" - local repo_uri="${2}" - local target_directory="${3}" - - local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}" - - _fossil_fetch "${repo_id}" "${repo_uri}" - _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}" -} - -src_unpack() { - if [[ "${PV}" == "9999" ]]; then - fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}" - if use doc; then - fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc" - fi - else - default - fi -} - -src_prepare() { - default - - eautoreconf - - multilib_copy_sources -} - -multilib_src_configure() { - local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" - local options=() - - options+=( - --enable-load-extension - --enable-threadsafe - ) - - # Support detection of misuse of SQLite API. - # https://sqlite.org/compile.html#enable_api_armor - append-cppflags -DSQLITE_ENABLE_API_ARMOR - - # Support bytecode and tables_used virtual tables. - # https://sqlite.org/compile.html#enable_bytecode_vtab - # https://sqlite.org/bytecodevtab.html - append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB - - # Support column metadata functions. - # https://sqlite.org/compile.html#enable_column_metadata - # https://sqlite.org/c3ref/column_database_name.html - append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA - - # Support sqlite_dbpage virtual table. - # https://sqlite.org/compile.html#enable_dbpage_vtab - # https://sqlite.org/dbpage.html - append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB - - # Support dbstat virtual table. - # https://sqlite.org/compile.html#enable_dbstat_vtab - # https://sqlite.org/dbstat.html - append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB - - # Support sqlite3_serialize() and sqlite3_deserialize() functions. - # https://sqlite.org/compile.html#enable_deserialize - # https://sqlite.org/c3ref/serialize.html - # https://sqlite.org/c3ref/deserialize.html - append-cppflags -DSQLITE_ENABLE_DESERIALIZE - - # Support comments in output of EXPLAIN. - # https://sqlite.org/compile.html#enable_explain_comments - append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS - - # Support Full-Text Search versions 3, 4 and 5. - # https://sqlite.org/compile.html#enable_fts3 - # https://sqlite.org/compile.html#enable_fts3_parenthesis - # https://sqlite.org/compile.html#enable_fts4 - # https://sqlite.org/compile.html#enable_fts5 - # https://sqlite.org/fts3.html - # https://sqlite.org/fts5.html - append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 - options+=(--enable-fts5) - - # Support hidden columns. - append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS - - # Support memsys5 memory allocator. - # https://sqlite.org/compile.html#enable_memsys5 - # https://sqlite.org/malloc.html#memsys5 - append-cppflags -DSQLITE_ENABLE_MEMSYS5 - - # Support sqlite3_normalized_sql() function. - # https://sqlite.org/c3ref/expanded_sql.html - append-cppflags -DSQLITE_ENABLE_NORMALIZE - - # Support sqlite_offset() function. - # https://sqlite.org/compile.html#enable_offset_sql_func - # https://sqlite.org/lang_corefunc.html#sqlite_offset - append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC - - # Support pre-update hook functions. - # https://sqlite.org/compile.html#enable_preupdate_hook - # https://sqlite.org/c3ref/preupdate_count.html - append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK - - # Support Resumable Bulk Update extension. - # https://sqlite.org/compile.html#enable_rbu - # https://sqlite.org/rbu.html - append-cppflags -DSQLITE_ENABLE_RBU - - # Support R*Trees. - # https://sqlite.org/compile.html#enable_rtree - # https://sqlite.org/compile.html#enable_geopoly - # https://sqlite.org/rtree.html - # https://sqlite.org/geopoly.html - append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY - - # Support Session extension. - # https://sqlite.org/compile.html#enable_session - # https://sqlite.org/sessionintro.html - append-cppflags -DSQLITE_ENABLE_SESSION - - # Support scan status functions. - # https://sqlite.org/compile.html#enable_stmt_scanstatus - # https://sqlite.org/c3ref/stmt_scanstatus.html - # https://sqlite.org/c3ref/stmt_scanstatus_reset.html - append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS - - # Support sqlite_stmt virtual table. - # https://sqlite.org/compile.html#enable_stmtvtab - # https://sqlite.org/stmt.html - append-cppflags -DSQLITE_ENABLE_STMTVTAB - - # Support unknown() function. - # https://sqlite.org/compile.html#enable_unknown_sql_function - append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION - - # Support unlock notification. - # https://sqlite.org/compile.html#enable_unlock_notify - # https://sqlite.org/c3ref/unlock_notify.html - # https://sqlite.org/unlock_notify.html - append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY - - # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. - # https://sqlite.org/compile.html#enable_update_delete_limit - # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses - # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses - append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT - - # Support soundex() function. - # https://sqlite.org/compile.html#soundex - # https://sqlite.org/lang_corefunc.html#soundex - append-cppflags -DSQLITE_SOUNDEX - - # Support URI filenames. - # https://sqlite.org/compile.html#use_uri - # https://sqlite.org/uri.html - append-cppflags -DSQLITE_USE_URI - - # debug USE flag. - options+=($(use_enable debug)) - - # icu USE flag. - if use icu; then - # Support ICU extension. - # https://sqlite.org/compile.html#enable_icu - append-cppflags -DSQLITE_ENABLE_ICU - sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - fi - - # readline USE flag. - options+=( - --disable-editline - $(use_enable readline) - ) - if use readline; then - options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline") - fi - - # secure-delete USE flag. - if use secure-delete; then - # Enable secure_delete pragma by default. - # https://sqlite.org/compile.html#secure_delete - # https://sqlite.org/pragma.html#pragma_secure_delete - append-cppflags -DSQLITE_SECURE_DELETE - fi - - # static-libs USE flag. - options+=($(use_enable static-libs static)) - - # tcl, test, tools USE flags. - if use tcl || use test || { use tools && multilib_is_native_abi; }; then - options+=( - --enable-tcl - --with-tcl="${ESYSROOT}/usr/$(get_libdir)" - ) - else - options+=(--disable-tcl) - fi - - if [[ "${ABI}" == "x86" ]]; then - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then - append-cflags -mfpmath=sse - else - append-cflags -ffloat-store - fi - - # Skip known-broken test for now - # https://sqlite.org/forum/forumpost/d97caf168f - # https://sqlite.org/forum/forumpost/50f136d91d - if use test ; then - rm test/atof1.test || die - fi - fi - - econf "${options[@]}" -} - -multilib_src_compile() { - emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" - - if use tools && multilib_is_native_abi; then - emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh - fi - - if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then - emake tclsqlite3.c - - local build_directory="$(pwd)" - build_directory="${build_directory##*/}" - - mkdir "${WORKDIR}/${PN}-doc-build" || die - pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die - - emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc - rmdir doc/matrix{/*,} || die - - popd > /dev/null || die - fi -} - -multilib_src_test() { - if [[ "${EUID}" -eq 0 ]]; then - ewarn "Skipping tests due to root permissions" - return - fi - - local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}" - - # e_uri.test tries to open files in /. - # https://bugs.gentoo.org/839798 - local SANDBOX_PREDICT=${SANDBOX_PREDICT} - addpredict "/test.db:/ÿ.db" - - emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) -} - -multilib_src_install() { - emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install - - if use tools && multilib_is_native_abi; then - install_tool() { - if [[ -f ".libs/${1}" ]]; then - newbin ".libs/${1}" "${2}" - else - newbin "${1}" "${2}" - fi - } - - install_tool changeset sqlite3-changeset - install_tool dbdump sqlite3-db-dump - install_tool dbhash sqlite3-db-hash - install_tool dbtotxt sqlite3-db-to-txt - install_tool index_usage sqlite3-index-usage - install_tool rbu sqlite3-rbu - install_tool scrub sqlite3-scrub - install_tool showdb sqlite3-show-db - install_tool showjournal sqlite3-show-journal - install_tool showshm sqlite3-show-shm - install_tool showstat4 sqlite3-show-stat4 - install_tool showwal sqlite3-show-wal - install_tool sqldiff sqlite3-diff - install_tool sqlite3_analyzer sqlite3-analyzer - install_tool sqlite3_checker sqlite3-checker - install_tool sqlite3_expert sqlite3-expert - install_tool sqltclsh sqlite3-tclsh - - unset -f install_tool - fi -} - -multilib_src_install_all() { - find "${ED}" -name "*.la" -delete || die - - doman sqlite3.1 - - if use doc; then - if [[ "${PV}" == "9999" ]]; then - pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die - else - pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die - fi - - find "(" -name "*.db" -o -name "*.txt" ")" -delete || die - if [[ "${PV}" != "9999" ]]; then - rm search search.d/admin || die - rmdir search.d || die - find -name "*~" -delete || die - fi - - ( - docinto html - dodoc -r * - ) - - popd > /dev/null || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.0.ebuild deleted file mode 100644 index c10b8c754d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.0.ebuild +++ /dev/null @@ -1,432 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="SQL database engine" -HOMEPAGE="https://sqlite.org/" - -# On version updates, make sure to read the forum (https://sqlite.org/forum/forum) -# for hints regarding test failures, backports, etc. -if [[ ${PV} == 9999 ]]; then - S="${WORKDIR}"/${PN} - PROPERTIES="live" -else - SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))" - DOC_PV="${SRC_PV}" - #DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))" - - SRC_URI=" - https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip - doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip ) - " - S="${WORKDIR}/${PN}-src-${SRC_PV}" - - 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 - -LICENSE="public-domain" -SLOT="3" -IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib:=[${MULTILIB_USEDEP}] - icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) - readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] ) - tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:= ) -" -DEPEND=" - ${RDEPEND} - test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] ) -" -BDEPEND=">=dev-lang/tcl-8.6:0" -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" dev-vcs/fossil" -else - BDEPEND+=" app-arch/unzip" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-3.39.4-icu-72-test.patch -) - -_fossil_fetch() { - local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" - local repo_id="${1}" - local repo_uri="${2}" - - local -x FOSSIL_HOME="${HOME}" - - mkdir -p "${T}/fossil/${repo_id}" || die - pushd "${T}/fossil/${repo_id}" > /dev/null || die - - if [[ -n "${EVCS_OFFLINE}" ]]; then - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" - fi - else - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" - fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die - echo - else - cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die - einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" - fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die - echo - fi - - ( - addwrite "${distdir}" - mkdir -p "${distdir}/fossil-src/${repo_id}" || die - cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die - ) - fi - - popd > /dev/null || die -} - -_fossil_checkout() { - local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" - local repo_id="${1}" - local branch_or_commit="${2}" - local target_directory="${3}" - - local -x FOSSIL_HOME="${HOME}" - - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" - fi - - if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then - mkdir -p "${T}/fossil/${repo_id}" || die - cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die - fi - - mkdir "${target_directory}" || die - pushd "${target_directory}" > /dev/null || die - - einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" - fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die - echo - - popd > /dev/null || die -} - -fossil_fetch() { - local repo_id="${1}" - local repo_uri="${2}" - local target_directory="${3}" - - local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}" - - _fossil_fetch "${repo_id}" "${repo_uri}" - _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}" -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}" - if use doc; then - fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc" - fi - else - default - fi -} - -src_prepare() { - default - - eautoreconf - multilib_copy_sources -} - -multilib_src_configure() { - local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" - local options=() - - options+=( - --enable-load-extension - --enable-threadsafe - ) - - # Support detection of misuse of SQLite API. - # https://sqlite.org/compile.html#enable_api_armor - append-cppflags -DSQLITE_ENABLE_API_ARMOR - - # Support bytecode and tables_used virtual tables. - # https://sqlite.org/compile.html#enable_bytecode_vtab - # https://sqlite.org/bytecodevtab.html - append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB - - # Support column metadata functions. - # https://sqlite.org/compile.html#enable_column_metadata - # https://sqlite.org/c3ref/column_database_name.html - append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA - - # Support sqlite_dbpage virtual table. - # https://sqlite.org/compile.html#enable_dbpage_vtab - # https://sqlite.org/dbpage.html - append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB - - # Support dbstat virtual table. - # https://sqlite.org/compile.html#enable_dbstat_vtab - # https://sqlite.org/dbstat.html - append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB - - # Support sqlite3_serialize() and sqlite3_deserialize() functions. - # https://sqlite.org/compile.html#enable_deserialize - # https://sqlite.org/c3ref/serialize.html - # https://sqlite.org/c3ref/deserialize.html - append-cppflags -DSQLITE_ENABLE_DESERIALIZE - - # Support comments in output of EXPLAIN. - # https://sqlite.org/compile.html#enable_explain_comments - append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS - - # Support Full-Text Search versions 3, 4 and 5. - # https://sqlite.org/compile.html#enable_fts3 - # https://sqlite.org/compile.html#enable_fts3_parenthesis - # https://sqlite.org/compile.html#enable_fts4 - # https://sqlite.org/compile.html#enable_fts5 - # https://sqlite.org/fts3.html - # https://sqlite.org/fts5.html - append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 - options+=( --enable-fts5 ) - - # Support hidden columns. - append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS - - # Support memsys5 memory allocator. - # https://sqlite.org/compile.html#enable_memsys5 - # https://sqlite.org/malloc.html#memsys5 - append-cppflags -DSQLITE_ENABLE_MEMSYS5 - - # Support sqlite3_normalized_sql() function. - # https://sqlite.org/c3ref/expanded_sql.html - append-cppflags -DSQLITE_ENABLE_NORMALIZE - - # Support sqlite_offset() function. - # https://sqlite.org/compile.html#enable_offset_sql_func - # https://sqlite.org/lang_corefunc.html#sqlite_offset - append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC - - # Support pre-update hook functions. - # https://sqlite.org/compile.html#enable_preupdate_hook - # https://sqlite.org/c3ref/preupdate_count.html - append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK - - # Support Resumable Bulk Update extension. - # https://sqlite.org/compile.html#enable_rbu - # https://sqlite.org/rbu.html - append-cppflags -DSQLITE_ENABLE_RBU - - # Support R*Trees. - # https://sqlite.org/compile.html#enable_rtree - # https://sqlite.org/compile.html#enable_geopoly - # https://sqlite.org/rtree.html - # https://sqlite.org/geopoly.html - append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY - - # Support Session extension. - # https://sqlite.org/compile.html#enable_session - # https://sqlite.org/sessionintro.html - append-cppflags -DSQLITE_ENABLE_SESSION - - # Support scan status functions. - # https://sqlite.org/compile.html#enable_stmt_scanstatus - # https://sqlite.org/c3ref/stmt_scanstatus.html - # https://sqlite.org/c3ref/stmt_scanstatus_reset.html - append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS - - # Support sqlite_stmt virtual table. - # https://sqlite.org/compile.html#enable_stmtvtab - # https://sqlite.org/stmt.html - append-cppflags -DSQLITE_ENABLE_STMTVTAB - - # Support unknown() function. - # https://sqlite.org/compile.html#enable_unknown_sql_function - append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION - - # Support unlock notification. - # https://sqlite.org/compile.html#enable_unlock_notify - # https://sqlite.org/c3ref/unlock_notify.html - # https://sqlite.org/unlock_notify.html - append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY - - # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. - # https://sqlite.org/compile.html#enable_update_delete_limit - # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses - # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses - append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT - - # Support soundex() function. - # https://sqlite.org/compile.html#soundex - # https://sqlite.org/lang_corefunc.html#soundex - append-cppflags -DSQLITE_SOUNDEX - - # Support URI filenames. - # https://sqlite.org/compile.html#use_uri - # https://sqlite.org/uri.html - append-cppflags -DSQLITE_USE_URI - - options+=( $(use_enable debug) ) - - if use icu; then - # Support ICU extension. - # https://sqlite.org/compile.html#enable_icu - append-cppflags -DSQLITE_ENABLE_ICU - sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - fi - - options+=( - --disable-editline - $(use_enable readline) - ) - - if use readline; then - options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" ) - fi - - if use secure-delete; then - # Enable secure_delete pragma by default. - # https://sqlite.org/compile.html#secure_delete - # https://sqlite.org/pragma.html#pragma_secure_delete - append-cppflags -DSQLITE_SECURE_DELETE - fi - - options+=( $(use_enable static-libs static) ) - - # tcl, test, tools USE flags. - if use tcl || use test || { use tools && multilib_is_native_abi; }; then - options+=( - --enable-tcl - --with-tcl="${ESYSROOT}/usr/$(get_libdir)" - ) - else - options+=( --disable-tcl ) - fi - - if [[ "${ABI}" == "x86" ]]; then - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then - append-cflags -mfpmath=sse - else - append-cflags -ffloat-store - fi - - # Skip known-broken test for now - # https://sqlite.org/forum/forumpost/d97caf168f - # https://sqlite.org/forum/forumpost/50f136d91d - if use test ; then - rm test/atof1.test || die - fi - fi - - econf "${options[@]}" -} - -multilib_src_compile() { - emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" - - if use tools && multilib_is_native_abi; then - emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh - fi - - if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then - emake tclsqlite3.c - - local build_directory="$(pwd)" - build_directory="${build_directory##*/}" - - mkdir "${WORKDIR}/${PN}-doc-build" || die - pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die - - emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc - rmdir doc/matrix{/*,} || die - - popd > /dev/null || die - fi -} - -multilib_src_test() { - if [[ "${EUID}" -eq 0 ]]; then - ewarn "Skipping tests due to root permissions" - return - fi - - local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}" - - # e_uri.test tries to open files in /. - # bug #839798 - local SANDBOX_PREDICT=${SANDBOX_PREDICT} - addpredict "/test.db:/ÿ.db" - - emake HAVE_TCL="$(usex tcl 1 "")" $(usex debug 'fulltest' 'test') -} - -multilib_src_install() { - emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install - - if use tools && multilib_is_native_abi; then - install_tool() { - if [[ -f ".libs/${1}" ]]; then - newbin ".libs/${1}" "${2}" - else - newbin "${1}" "${2}" - fi - } - - install_tool changeset sqlite3-changeset - install_tool dbdump sqlite3-db-dump - install_tool dbhash sqlite3-db-hash - install_tool dbtotxt sqlite3-db-to-txt - install_tool index_usage sqlite3-index-usage - install_tool rbu sqlite3-rbu - install_tool scrub sqlite3-scrub - install_tool showdb sqlite3-show-db - install_tool showjournal sqlite3-show-journal - install_tool showshm sqlite3-show-shm - install_tool showstat4 sqlite3-show-stat4 - install_tool showwal sqlite3-show-wal - install_tool sqldiff sqlite3-diff - install_tool sqlite3_analyzer sqlite3-analyzer - install_tool sqlite3_checker sqlite3-checker - install_tool sqlite3_expert sqlite3-expert - install_tool sqltclsh sqlite3-tclsh - - unset -f install_tool - fi -} - -multilib_src_install_all() { - find "${ED}" -name "*.la" -delete || die - - doman sqlite3.1 - - if use doc; then - if [[ ${PV} == 9999 ]]; then - pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die - else - pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die - fi - - find "(" -name "*.db" -o -name "*.txt" ")" -delete || die - if [[ ${PV} != 9999 ]]; then - rm search search.d/admin || die - rmdir search.d || die - find -name "*~" -delete || die - fi - - ( - docinto html - dodoc -r * - ) - - popd > /dev/null || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.1.ebuild index e701724ef3..7013595958 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.40.1.ebuild @@ -24,7 +24,7 @@ else " S="${WORKDIR}/${PN}-src-${SRC_PV}" - 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 LICENSE="public-domain" From d588650c395ce3f64e749ea174c45cb0b3d18c9c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:49 +0000 Subject: [PATCH 17/76] dev-lang/perl: Sync with Gentoo It's from Gentoo commit 32a4f6e001d9118b5ea5a1c6b53900d2ce02eab6. --- .../perl/files/perl-5.36.0-clang16.patch | 129 +++ .../dev-lang/perl/perl-5.36.0-r2.ebuild | 825 ++++++++++++++++++ 2 files changed, 954 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.0-clang16.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.0-clang16.patch b/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.0-clang16.patch new file mode 100644 index 0000000000..dc7305a3ac --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.0-clang16.patch @@ -0,0 +1,129 @@ +https://bugs.gentoo.org/879857 +https://github.com/Perl/perl5/commit/e1ca9a418fa6b7d26fbb1931c9164141035262c3 +https://github.com/Perl/perl5/commit/fc35cee89c1a42558f50a37a6b4d5186b77f058b + +From e1ca9a418fa6b7d26fbb1931c9164141035262c3 Mon Sep 17 00:00:00 2001 +From: Peter Levine +Date: Tue, 17 Jan 2023 02:47:12 -0500 +Subject: [PATCH] Add parameter types to declarations for clang-16 + +ANSI C style function declarations without parameter types are errors with clang-16. +--- a/Configure ++++ b/Configure +@@ -7927,10 +7927,10 @@ $cat >malloc.c < + #endif + #ifdef TRY_MALLOC +-void *malloc(); ++void *malloc(size_t); + #endif + #ifdef TRY_FREE +-void free(); ++void free(void *); + #endif + END + case "$malloctype" in + +From fc35cee89c1a42558f50a37a6b4d5186b77f058b Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 17 Jan 2023 19:07:54 +0100 +Subject: [PATCH] Configure: Add various C99 compatibility improvements + +Two C99 compatibility issues are fixed by these changes: Return +types are made explicit where they previously defaulted to int, +and all called functions are now declared explicitly (either by +including additional headers, or by adding prototypes manually). + +This avoids implict ints and implicit function declarations, +both legacy C language features removed in the 1999 revision +of the language. + +Verified with an instrumented GCC compiler on GNU/Linux. +--- a/Configure ++++ b/Configure +@@ -4655,7 +4655,7 @@ esac + # so we will take those off from locincpth. + case "$gccversion" in + 3.*) +- echo "main(){}">try.c ++ echo "int main(){}">try.c + for incdir in $locincpth; do + warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \ + grep '^c[cp]p*[01]: warning: changing search order '` +@@ -5798,6 +5798,7 @@ case "$intsize" in + #ifdef I_STDLIB + #include + #endif ++#include + int main() + { + printf("intsize=%d;\n", (int)sizeof(int)); +@@ -6871,6 +6872,7 @@ case "$doublesize" in + #ifdef I_STDLIB + #include + #endif ++#include + int main() + { + printf("%d\n", (int)sizeof(double)); +@@ -12660,7 +12662,7 @@ case "$dlsrc" in + dl_dlopen.xs) + echo "Checking whether your dlsym() needs a leading underscore ..." >&4 + $cat >dyna.c <<'EOM' +-fred () { } ++void fred (void) { } + EOM + + $cat >fred.c<fred.c< + #endif + +-extern int fred() ; ++extern void fred(void) ; + + int main() + { +@@ -13713,6 +13715,7 @@ $cat >try.c < + #endif ++#include + #define FILE_ptr(fp) $stdio_ptr + #define FILE_cnt(fp) $stdio_cnt + int main() { +@@ -16220,6 +16223,7 @@ echo "Checking to see if your libm supports _LIB_VERSION..." >&4 + $cat >try.c < + #include ++#include + int main (int argc, char *argv[]) + { + printf ("%d\n", _LIB_VERSION); +@@ -22168,13 +22172,15 @@ pager="$ans" + : see if ar generates random libraries by itself + echo " " + echo "Checking how to generate random libraries on your machine..." >&4 +-echo 'int bar1() { return bar2(); }' > bar1.c ++echo 'extern int bar2(); int bar1() { return bar2(); }' > bar1.c + echo 'int bar2() { return 2; }' > bar2.c + $cat > foo.c < + #endif ++#include ++extern int bar1(); + int main() { printf("%d\n", bar1()); exit(0); } + EOP + $cc $ccflags -c bar1.c >/dev/null 2>&1 +@@ -22400,7 +22406,7 @@ EOM + for nfd in 'int' 'size_t' 'unsigned long' 'unsigned' ; do + for tmo in 'struct timeval *' 'const struct timeval *'; do + case "$val" in +- '') try="$extern_C select _(($nfd, $xxx, $xxx, $xxx, $tmo));" ++ '') try="$extern_C int select _(($nfd, $xxx, $xxx, $xxx, $tmo));" + if ./protochk "$try" $hdrs; then + echo "Your system accepts $xxx." + val="$xxx" + diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r2.ebuild new file mode 100644 index 0000000000..a6ed13d97d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r2.ebuild @@ -0,0 +1,825 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing + +PATCH_VER=1 +CROSS_VER=1.4 +PATCH_BASE="perl-5.36.0-patches-${PATCH_VER}" +PATCH_DEV=dilfridge + +DIST_AUTHOR=RJBS + +# Greatest first, don't include yourself +# Devel point-releases are not ABI-intercompatible, but stable point releases are +# BIN_OLDVERSEN contains only C-ABI-intercompatible versions +PERL_BIN_OLDVERSEN="" + +if [[ "${PV##*.}" == "9999" ]]; then + DIST_VERSION=5.30.0 +else + DIST_VERSION="${PV/_rc/-RC}" +fi +SHORT_PV="${DIST_VERSION%.*}" + +# Even numbered major versions are ABI intercompatible +# Odd numbered major versions are not +if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then + SUBSLOT="${DIST_VERSION%-RC*}" +else + SUBSLOT="${DIST_VERSION%.*}" +fi + +# Used only in tar paths +MY_P="perl-${DIST_VERSION}" +# Used in library paths +MY_PV="${DIST_VERSION%-RC*}" + +DESCRIPTION="Larry Wall's Practical Extraction and Report Language" + +SRC_URI=" + mirror://cpan/src/5.0/${MY_P}.tar.xz + mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz + https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz + https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz +" + +HOMEPAGE="https://www.perl.org/" + +LICENSE="|| ( Artistic GPL-1+ )" +SLOT="0/${SUBSLOT}" + +if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; 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" +fi + +IUSE="berkdb debug doc gdbm ithreads minimal quadmath" + +RDEPEND=" + berkdb? ( sys-libs/db:= ) + gdbm? ( >=sys-libs/gdbm-1.8.3:= ) + app-arch/bzip2 + >=sys-libs/zlib-1.2.12 + virtual/libcrypt:= +" +DEPEND="${RDEPEND}" +BDEPEND="${RDEPEND}" + +PDEPEND=" + !minimal? ( + >=app-admin/perl-cleaner-2.5 + >=virtual/perl-CPAN-2.290.0 + >=virtual/perl-Encode-3.120.0 + >=virtual/perl-File-Temp-0.230.400-r2 + >=virtual/perl-Data-Dumper-2.154.0 + virtual/perl-Test-Harness + ) +" +# bug 390719, bug 523624 +# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker + +S="${WORKDIR}/${MY_P}" + +dual_scripts() { + src_remove_dual perl-core/Archive-Tar 2.400.0 ptar ptardiff ptargrep + src_remove_dual perl-core/CPAN 2.330.0 cpan + src_remove_dual perl-core/Digest-SHA 6.20.0 shasum + src_remove_dual perl-core/Encode 3.170.0 enc2xs piconv + src_remove_dual perl-core/ExtUtils-MakeMaker 7.640.0 instmodsh + src_remove_dual perl-core/ExtUtils-ParseXS 3.450.0 xsubpp + src_remove_dual perl-core/IO-Compress 2.106.0 zipdetails + src_remove_dual perl-core/JSON-PP 4.70.0 json_pp + src_remove_dual perl-core/Module-CoreList 5.202.205.200 corelist + src_remove_dual perl-core/Pod-Checker 1.740.0 podchecker + src_remove_dual perl-core/Pod-Perldoc 3.280.100 perldoc + src_remove_dual perl-core/Pod-Usage 2.10.0 pod2usage + src_remove_dual perl-core/Test-Harness 3.440.0 prove + src_remove_dual perl-core/podlators 4.140.0 pod2man pod2text + src_remove_dual_man perl-core/podlators 4.140.0 /usr/share/man/man1/perlpodstyle.1 +} + +check_rebuild() { + # Fresh install + if [[ -z "${REPLACING_VERSIONS}" ]]; then + return 0; + # Major Upgrade + # doesn't matter if there's multiple copies, it still needs a rebuild + # if the string is anything other than "5.CURRENTMAJOR" + elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then + echo "" + ewarn "UPDATE THE PERL MODULES:" + ewarn "After updating dev-lang/perl the installed Perl modules" + ewarn "have to be re-installed. In most cases, this is done automatically" + ewarn "by the package manager, but subsequent steps are still recommended" + ewarn "to ensure system consistency." + ewarn + ewarn "You should start with a depclean to remove any unused perl dependencies" + ewarn "that may confuse portage in future. Regular depcleans are also encouraged" + ewarn "as part of your regular update cycle, as that will keep perl upgrades working." + ewarn "Recommended: emerge --depclean -va" + ewarn + ewarn "You should then call perl-cleaner to clean up any old files and trigger any" + ewarn "remaining rebuilds portage may have missed." + ewarn "Use: perl-cleaner --all" + return 0; + + # Reinstall w/ USE Change + elif + ( use ithreads && ! has_version dev-lang/perl[ithreads] ) || \ + ( ! use ithreads && has_version dev-lang/perl[ithreads] ) || \ + ( use quadmath && ! has_version dev-lang/perl[quadmath] ) || \ + ( ! use quadmath && has_version dev-lang/perl[quadmath] ) || \ + ( use debug && ! has_version dev-lang/perl[debug] ) || \ + ( ! use debug && has_version dev-lang/perl[debug] ) ; then + echo "" + ewarn "TOGGLED USE-FLAGS WARNING:" + ewarn "You changed one of the use-flags ithreads, quadmath, or debug." + ewarn "You must rebuild all perl-modules installed." + ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl" + fi +} + +pkg_setup() { + case ${CHOST} in + *-freebsd*) osname="freebsd" ;; + *-dragonfly*) osname="dragonfly" ;; + *-netbsd*) osname="netbsd" ;; + *-openbsd*) osname="openbsd" ;; + *-darwin*) osname="darwin" ;; + *-solaris*) osname="solaris" ;; + *-cygwin*) osname="cygwin" ;; + *) osname="linux" ;; + esac + + myarch="${CHOST%%-*}-${osname}" + if use debug ; then + myarch+="-debug" + fi + if use quadmath ; then + myarch+="-quadmath" + fi + if use ithreads ; then + mythreading="-multi" + myarch+="-thread" + fi + + PRIV_BASE="/usr/$(get_libdir)/perl5" + SITE_BASE="/usr/local/$(get_libdir)/perl5" + VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl" + + LIBPERL="libperl$(get_libname ${MY_PV} )" + + PRIV_LIB="${PRIV_BASE}/${SUBSLOT}" + ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}" + SITE_LIB="${SITE_BASE}/${SUBSLOT}" + SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}" + VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}" + VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}" + + dual_scripts +} + +src_remove_dual_file() { + local i pkg ver + pkg="$1" + ver="$2" + shift 2 + case "${EBUILD_PHASE:-none}" in + postinst|postrm) + for i in "$@" ; do + alternatives_auto_makesym "${i}" "${i}-[0-9]*" + done + ;; + setup) + for i in "$@" ; do + if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then + has_version ${pkg} && ewarn "You must reinstall ${pkg} !" + break + fi + done + ;; + install) + for i in "$@" ; do + if ! [[ -f "${ED}"${i} ]] ; then + ewarn "${i} does not exist!" + continue + fi + mv "${ED}"${i}{,-${ver}-${P}} || die + done + ;; + esac +} + +src_remove_dual_man() { + local i pkg ver ff + pkg="$1" + ver="$2" + shift 2 + case "${EBUILD_PHASE:-none}" in + postinst|postrm) + for i in "$@" ; do + ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*` + ff=${ff##*${i#${i%.[0-9]}}} + alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*" + done + ;; + install) + for i in "$@" ; do + if ! [[ -f "${ED}"${i} ]] ; then + ewarn "${i} does not exist!" + continue + fi + mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die + done + ;; + esac +} + +src_remove_dual() { + local i pkg ver + pkg="$1" + ver="$2" + shift 2 + for i in "$@" ; do + src_remove_dual_file "${pkg}" "${ver}" "/usr/bin/${i}" + src_remove_dual_man "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1" + done +} + +src_prepare_perlcross() { + cp -a ../perl-cross-${CROSS_VER}/* . || die + + # bug 794463, needs further analysis what is exactly wrong here + eapply "${FILESDIR}/perl-5.34.0-crossfit.patch" + + # bug 604072 + MAKEOPTS+=" -j1" + export MAKEOPTS +} + +src_prepare_dynamic() { + ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die + ln -s ${LIBPERL} libperl$(get_libname ) || die +} + +# Copy a patch into the patch series +# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug'] +# - description is optional, but recommended +# - all arguments after descriptions are bug URLs +add_patch() { + local patchdir="${WORKDIR}/patches" + local infodir="${WORKDIR}/patch-info" + local src_name dest_name desc + src_name="$1" + dest_name="$2" + desc="$3" + shift; shift; shift; + einfo "Adding ${dest_name} to patch bundle" + cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}" + if [[ -n "${desc}" ]]; then + printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc" + fi + if [[ $# -gt 0 ]]; then + # Note: when $@ is more than one element, this emits a + # line for each element + printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs" + fi +} + +# Remove a patch using a glob expr +# eg: +# rm_patch *-darwin-Use-CC* +# +rm_patch() { + local patchdir="${WORKDIR}/patches" + local expr="$1" + local patch="$( cd "${patchdir}"; echo $expr )" + einfo "Removing $patch ($expr) from patch bundle" + if [[ -e "${patchdir}/${patch}" ]]; then + rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )" + else + ewarn "No ${expr} found in ${patchdir} to remove" + fi +} + +# Yes, this is a reasonable amount of code for something seemingly simple +# but this is far easier to debug when things go wrong, and things went wrong +# multiple times while I was getting the exact number of slashes right, which +# requires circumnavigating both bash and sed escape mechanisms. +c_escape_string() { + local slash dquote + slash='\' + dquote='"' + re_slash="${slash}${slash}" + re_dquote="${slash}${dquote}" + + # Convert \ to \\, + # " to \" + echo "$1" |\ + sed "s|${re_slash}|${re_slash}${re_slash}|g" |\ + sed "s|${re_dquote}|${re_slash}${re_dquote}|g" +} +c_escape_file() { + c_escape_string "$(cat "$1")" +} + +apply_patchdir() { + local patchdir="${WORKDIR}/patches" + local infodir="${WORKDIR}/patch-info" + local patchoutput="patchlevel-gentoo.h" + + # Inject Patch-Level info into description for patchlevel.h patch + # to show in -V + local patch_expr="*List-packaged-patches*" + local patch="$( cd "${patchdir}"; echo $patch_expr )"; + einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )" + + if [[ -e "${patchdir}/${patch}" ]]; then + printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\ + >"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc" + else + eerror "No $patch_expr found in ${patchdir}" + fi + + # Compute patch list to apply + # different name other than PATCHES to stop default + # reapplying it + # Single depth is currently only supported, as artifacts can reside + # from the old layout being multiple-directories, as well as it grossly + # simplifying the patchlevel_gentoo.h generation. + local PERL_PATCHES=($( + find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\ + grep -E '[.](diff|patch)$' |\ + sort -n + )) + + for patch in "${PERL_PATCHES[@]}"; do + eapply "${WORKDIR}"/patches/${patch} + done + + einfo "Generating $patchoutput" + + # This code creates a header file, each iteration + # creates one-or-more-lines for each entry found in PERL_PATCHES + # and STDOUT is redirected to the .h file + for patch in "${PERL_PATCHES[@]}"; do + local desc_f="${infodir}/${patch}.desc" + local bugs_f="${infodir}/${patch}.bugs" + + printf ',"%s"\n' "${patch}" + if [[ ! -e "${desc_f}" ]]; then + ewarn "No description provided for ${patch} (expected: ${desc_f} )" + else + local desc="$(c_escape_file "${desc_f}")" + printf ',"- %s"\n' "${desc}" + fi + if [[ -e "${bugs_f}" ]]; then + while read -d $'\n' -r line; do + local esc_line="$(c_escape_string "${line}")" + printf ',"- Bug: %s"\n' "${esc_line}" + done <"${bugs_f}" + fi + done > "${S}/${patchoutput}" + printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST" + +} + +src_prepare() { + local patchdir="${WORKDIR}/patches" + + # Prepare Patch dir with additional patches / remove unwanted patches + # Inject bug/desc entries for perl -V + # Old example: + # add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\ + # "Fix broken miniperl on hppa"\ + # "https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162" + add_patch "${FILESDIR}/${PN}-5.36.0-clang16.patch" "100-5.36.0-clang16.patch" \ + "Fix Clang 16 / modern C issues in configure" \ + "https://bugs.gentoo.org/879857" "https://github.com/Perl/perl5/issues/20715" + + if [[ ${CHOST} == *-solaris* ]] ; then + # do NOT mess with nsl, on Solaris this is always necessary, + # when -lsocket is used e.g. to get h_errno + rm_patch "*-nsl-and-cl*" + fi + + apply_patchdir + + tc-is-cross-compiler && src_prepare_perlcross + + tc-is-static-only || src_prepare_dynamic + + if use gdbm; then + sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \ + ext/NDBM_File/Makefile.PL || die + fi + + # Use errno.h from prefix rather than from host system, bug #645804 + if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then + sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # set a soname, fix linking against just built libperl + sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die + fi + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name (soname) not to reference $D + sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die + + # fix environ linkage absence (only a real issue on Darwin9) + if [[ ${CHOST##*-darwin} -le 9 ]] ; then + sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \ + Makefile.SH || die + fi + fi + + default +} + +myconf() { + # the myconf array is declared in src_configure + myconf=( "${myconf[@]}" "$@" ) +} + +# Outputs a list of versions which have been seen in any of the +# primary perl @INC prefix paths, such as: +# /usr/lib64/perl5/ +# /usr/local/lib64/perl5/ +# /usr/lib64/perl5/vendor_perl/ +# +# All values of NUMBER must be like "5.x.y" or like "5.x" +# +find_candidate_inc_versions() { + local regex='.*/5[.][0-9]+\([.][0-9]+\|\)$' + local dirs=( + "${EROOT}${PRIV_BASE}" + "${EROOT}${SITE_BASE}" + "${EROOT}${VENDOR_BASE}" + ) + for dir in "${dirs[@]}"; do + if [[ ! -e "${dir}" ]]; then + continue + fi + # Without access to readdir() on these dirs, find will not be able + # to reveal any @INC directories inside them, and will subsequently prune + # them from the built perl's @INC support, breaking our compatiblity options + # entirely. + if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then + eerror "Bad permissions on ${dir}, this will probably break things" + eerror "Ensure ${dir} is +rx for at least uid=$EUID" + eerror "Recommended permission is +rx for all" + eerror "> chmod o+rx ${dir}" + fi + done + einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}" + find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f " 2>/dev/null +} + +# Sort versions passed versiony-ly, remove self-version if present +# dedup. Takes each version as an argument +sanitize_inc_versions() { + local vexclude="${SUBSLOT}" + einfo "Normalizing/Sorting candidate list: $*" + einfo " to remove '${vexclude}'" + # Note, general numeric sort has to be used + # for the last component, or unique will convert + # 5.30.0 + 5.30 into just 5.30 + printf "%s\n" "$@" |\ + grep -vxF "${vexclude}" |\ + sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg +} + +versions_to_inclist() { + local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}" + + for v; do + has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ "; + echo -n "${v}/ "; + done +} + +versions_to_gentoolibdirs() { + local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}" + local root + local v + for v; do + for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do + local fullpath="${EROOT}${root}/${v}" + if [[ -e "${fullpath}" ]]; then + has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}"; + printf "%s:" "${fullpath}" + fi + done + done +} + +src_configure() { + declare -a myconf + + export LC_ALL="C" + [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091 + + # Perl has problems compiling with -Os in your flags with glibc + replace-flags "-Os" "-O2" + + # xlocale.h is going away in glibc-2.26, so it's counterproductive + # if we use it and include it in CORE/perl.h ... Perl builds just + # fine with glibc and locale.h only. + # However, the darwin prefix people have no locale.h ... + use elibc_glibc && myconf -Ui_xlocale + + # This flag makes compiling crash in interesting ways + filter-flags "-malign-double" + + # Generic LTO broken since 5.28, triggers EUMM failures + filter-flags "-flto" + + use sparc && myconf -Ud_longdbl + + export BUILD_BZIP2=0 + export BZIP2_INCLUDE=${EROOT}/usr/include + export BZIP2_LIB=${EROOT}/usr/$(get_libdir) + + export BUILD_ZLIB=False + export ZLIB_INCLUDE=${EROOT}/usr/include + export ZLIB_LIB=${EROOT}/usr/$(get_libdir) + + # allow either gdbm to provide ndbm (in ) or db1 + myndbm='U' + mygdbm='U' + mydb='U' + if use gdbm ; then + mygdbm='D' + if use berkdb ; then + myndbm='D' + fi + fi + if use berkdb ; then + mydb='D' + has_version '=sys-libs/db-1*' && myndbm='D' + fi + + myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db" + + if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then + ewarn "Perl will not be built with berkdb support, use gcc if you needed it..." + myconf -Ui_db -Ui_ndbm + fi + + use ithreads && myconf -Dusethreads + + use quadmath && myconf -Dusequadmath + + if use debug ; then + append-cflags "-g" + myconf -DDEBUGGING + elif [[ ${CFLAGS} == *-g* ]] ; then + myconf -DDEBUGGING=-g + else + myconf -DDEBUGGING=none + fi + + # modifying 'optimize' prevents cross configure script from appending required flags + if tc-is-cross-compiler; then + append-cflags "-fwrapv" + fi + + # bug #877659, bug #821577 + append-cflags -fno-strict-aliasing + + # Autodiscover all old version directories, some of them will even be newer + # if you downgrade + if [[ -z ${PERL_OLDVERSEN} ]]; then + PERL_OLDVERSEN="$( find_candidate_inc_versions )" + fi + + # Fixup versions, removing self match, fixing order and dupes + PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )" + + # Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string + if [[ -n "${PERL_OLDVERSEN// }" ]]; then + local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )" + einfo "This version of perl may partially support modules previously" + einfo "installed in any of the following paths:" + for incpath in ${inclist}; do + [[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}" + [[ -e "${EROOT}${PRIV_BASE}/${incpath}" ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}" + [[ -e "${EROOT}${SITE_BASE}/${incpath}" ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}" + done + einfo "This is a temporary measure and you should aim to cleanup these paths" + einfo "via world updates and perl-cleaner" + # myconf -Dinc_version_list="${inclist}" + myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )" + fi + + [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a" + + # Make sure we can do the final link #523730, need to set deployment + # target to override hardcoded 10.3 which breaks on modern OSX + [[ ${CHOST} == *-darwin* ]] && \ + myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)" + + # Older macOS with non-Apple GCC chokes on inline in system headers + # using c89 mode as injected by cflags.SH, in addition, we override + # cflags, so we loose PERL_DARWIN which enables compat code that + # apparently on more recent macOS releases is no longer necessary + [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ + append-cflags -Dinline=__inline__ -DPERL_DARWIN + + # flock on 32-bit sparc Solaris is broken, fall back to fcntl + [[ ${CHOST} == sparc-*-solaris* ]] && \ + myconf -Ud_flock + + # Prefix: the host system needs not to follow Gentoo multilib stuff, and in + # Prefix itself we don't do multilib either, so make sure perl can find + # something compatible. + if use prefix ; then + # Set a hook to check for each detected library whether it actually works. + export libscheck=" + ( echo 'main(){}' > '${T}'/conftest.c && + $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null + ) || xxx=/dev/null" + + # Use all host paths that might contain useful stuff, the hook above will filter out bad choices. + local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib" + myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}" + elif [[ $(get_libdir) != "lib" ]] ; then + # We need to use " and not ', as the written config.sh use ' ... + myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)" + fi + + # don't try building ODBM, bug #354453 + disabled_extensions="ODBM_File" + + if ! use gdbm ; then + # workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm" + disabled_extensions="${disabled_extensions} GDBM_File NDBM_File" + fi + + myconf -Dnoextensions="${disabled_extensions}" + + [[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly + + [[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF} + # allow fiddling via EXTRA_ECONF, bug 558070 + eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})" + + # setting -Dld= to tc-getLD breaks perl and all perl things + # https://github.com/Perl/perl5/issues/17791#issuecomment-630145202 + myconf \ + -Duseshrplib \ + -Darchname="${myarch}" \ + -Dcc="$(tc-getCC)" \ + -Dar="$(tc-getAR)" \ + -Dnm="$(tc-getNM)" \ + -Dcpp="$(tc-getCPP)" \ + -Dranlib="$(tc-getRANLIB)" \ + -Accflags="${CFLAGS}" \ + -Doptimize="${CFLAGS}" \ + -Dldflags="${LDFLAGS}" \ + -Dprefix="${EPREFIX}"'/usr' \ + -Dsiteprefix="${EPREFIX}"'/usr/local' \ + -Dvendorprefix="${EPREFIX}"'/usr' \ + -Dscriptdir="${EPREFIX}"'/usr/bin' \ + -Dprivlib="${EPREFIX}${PRIV_LIB}" \ + -Darchlib="${EPREFIX}${ARCH_LIB}" \ + -Dsitelib="${EPREFIX}${SITE_LIB}" \ + -Dsitearch="${EPREFIX}${SITE_ARCH}" \ + -Dvendorlib="${EPREFIX}${VENDOR_LIB}" \ + -Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \ + -Dman1dir="${EPREFIX}"/usr/share/man/man1 \ + -Dman3dir="${EPREFIX}"/usr/share/man/man3 \ + -Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \ + -Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \ + -Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \ + -Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \ + -Dman1ext='1' \ + -Dman3ext='3pm' \ + -Dlibperl="${LIBPERL}" \ + -Dlocincpth="${EPREFIX}"'/usr/include ' \ + -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \ + -Duselargefiles \ + -Dd_semctl_semun \ + -Dcf_by='Gentoo' \ + -Dmyhostname='localhost' \ + -Dperladmin='root@localhost' \ + -Ud_csh \ + -Dsh="${EPREFIX}"/bin/sh \ + -Dtargetsh="${EPREFIX}"/bin/sh \ + -Uusenm \ + "${EXTRA_ECONF[@]}" + + if tc-is-cross-compiler; then + ./configure \ + --target="${CHOST}" \ + --build="${CBUILD}" \ + -Dinstallprefix='' \ + -Dinstallusrbinperl='undef' \ + -Dusevendorprefix='define' \ + "${myconf[@]}" \ + || die "Unable to configure" + else + sh Configure \ + -des \ + -Dinstallprefix="${EPREFIX}"'/usr' \ + -Dinstallusrbinperl='n' \ + "${myconf[@]}" \ + || die "Unable to configure" + fi +} + +src_test() { + export NO_GENTOO_NETWORK_TESTS=1; + export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}" + export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}" + if [[ ${EUID} == 0 ]] ; then + ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..." + return 0 + fi + TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed" +} + +src_install() { + local i + local coredir="${ARCH_LIB}/CORE" + + emake DESTDIR="${D}" install + + rm -f "${ED}/usr/bin/perl${MY_PV}" + ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die + + if ! tc-is-static-only ; then + dolib.so "${ED}"${coredir}/${LIBPERL} + rm -f "${ED}"${coredir}/${LIBPERL} + ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die + ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die + + ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die + ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die + ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die + fi + + rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages" + + # This removes ${D} from Config.pm + for i in $(find "${D}" -iname "Config.pm" ) ; do + einfo "Removing ${D} from ${i}..." + sed -i -e "s:${D}::" "${i}" || die "Sed failed" + done + + dodoc Changes* README AUTHORS + + if use doc ; then + # HTML Documentation + # We expect errors, warnings, and such with the following. + + dodir /usr/share/doc/${PF}/html + LD_LIBRARY_PATH=. ./perl installhtml \ + --podroot='.' \ + --podpath='lib:ext:pod:vms' \ + --recurse \ + --htmldir="${ED}/usr/share/doc/${PF}/html" + fi + + [[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local + + dual_scripts +} + +pkg_preinst() { + check_rebuild +} + +pkg_postinst() { + dual_scripts + + if [[ -z "${ROOT}" ]] ; then + local INC DIR file + INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }') + einfo "Removing old .ph files" + for DIR in ${INC} ; do + if [[ -d "${DIR}" ]] ; then + for file in $(find "${DIR}" -name "*.ph" -type f ) ; do + rm -f "${file}" + einfo "<< ${file}" + done + fi + done + # Silently remove the now empty dirs + for DIR in ${INC} ; do + if [[ -d "${DIR}" ]] ; then + find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null + fi + done + + fi +} + +pkg_postrm() { + dual_scripts +} From a43df8ca5f0d622fc2ccf1be42605a4b0a2c2678 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:49 +0000 Subject: [PATCH 18/76] dev-lang/python: Sync with Gentoo It's from Gentoo commit 083f1ce6e21171f27abe799035c9bb30c4034f84. --- .../portage-stable/dev-lang/python/Manifest | 3 + .../python/python-2.7.18_p16-r1.ebuild | 317 +++++++++++ .../python/python-3.12.0_alpha4.ebuild | 504 ++++++++++++++++++ ...-3.8.16.ebuild => python-3.8.16-r2.ebuild} | 3 +- .../dev-lang/python/python-3.8.16-r3.ebuild | 422 +++++++++++++++ 5 files changed, 1247 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p16-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha4.ebuild rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.8.16.ebuild => python-3.8.16-r2.ebuild} (99%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16-r3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest index eb56253211..7bb27aeb1a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest @@ -6,6 +6,8 @@ DIST Python-3.11.1.tar.xz 19856648 BLAKE2B 2a8942e7a145cfcc5b6932865ff9a1afd300b DIST Python-3.11.1.tar.xz.asc 833 BLAKE2B 27c6101b2022cb7bea3e6082f1554b31cceb8cabe720e4b19391f550e870588c4defd1552c580a7e063638b80e8b8f415e54a11cf40ae3b0f449500c2e9babc6 SHA512 81ed05c2adf38552bdc5ac761704f2720a646d56681a919a6bfa51f1a4b42cd14edb9c84d58664dbc8e7b561cd78d82ae6b10dda423e1fae543bc7fa4bf3f78e DIST Python-3.12.0a3.tar.xz 19695444 BLAKE2B c869e68612b7b32a3a9cdb5accd1fec3453abbea68ca6993e7ce6d5f8deead50902ee6026c3bf2a3faf92e5a571b6b71fbcfc85d49fa03b4ac12ab5dba3f486a SHA512 82d88adda53a1e5c16fc7165ac0d55f3828bae9249d361fbf7237d8826bd5acd941befb9b2c74f815a251b216d377f416831fbd233f1bfef31c2cab73b6554d1 DIST Python-3.12.0a3.tar.xz.asc 963 BLAKE2B ff0a4eb7a3e27281494450dca7f23f4e1816e18d0487e09b6a9f58d441b766f32e8653b7e01753c8353bb34a235b8296cbe975ee7a917ae4a24e5b8875b4ff5f SHA512 e25a42982f3cab6e38ef7a4f5bfd71ad25811f52dffeffbb827ee9f48bf45003edad14ffdd3289bfda113a34b7ef818d04a413d0da7e8ca52d0c47f9b4475dbb +DIST Python-3.12.0a4.tar.xz 19690792 BLAKE2B f4da53e856afca1acd8ba56dc37d78ef4cfee0007a3a66c9276b7a93dbd4c9e7ddb39aaea344bc55219e33ad09a9b34bf0e8b89273bba8e99643eeafc7e76d42 SHA512 19a98939077004259868cc5e6901d8fbf0ae90ad579700d6993f6b82990b1b4eb92efa5c8b5b7b50cfc46e311cb5c45f83251223a623fe1ade5da45ef2ca5dce +DIST Python-3.12.0a4.tar.xz.asc 963 BLAKE2B da2279932786fad5cb3def5e34f9f113b9203233f70edc805ac1f7c3ddb584883655bb3da7fac1651017269a0dd8ce9a88fcca609ab2072bc6285190c487a566 SHA512 b74a1bf0d5e4f402b6e5164cd140457ed0b172b2bfe61be1642fe053b71092b8bae1f5281e03516a6fba24319c78cd2505494cfada2416b766f4c602c1284d2a DIST Python-3.8.16.tar.xz 19046724 BLAKE2B cbdeec7961d39cb9ab4960760b5d4c7ae71675c174156aa9f6fca55ee92a93a937ef39defe86e423237a25e0e24703233ce4b91dc97005b6ffc1f342ddd9e22c SHA512 d206e80806409410c00ef8acd8c3d90e3cc9553f996d0a57faa63802f2415e9d7591542b2e84b5e8e79245f40f6478790b5ba2acf1da98ebbc9495999183f7fd DIST Python-3.8.16.tar.xz.asc 833 BLAKE2B 678dabc558d013b104bf9e65d4319076c4730a67093a66fefc073b429c640d4facb31a0d6b7238deb08b265586a0cfb2c345051fe4df7bf5001d7317e6c06c9b SHA512 e93c394c0c5afcaaab625a3bd540dcc8e0ab946803d212343b8d1d6d5e6b89b09b6a20607bab0d858b30389a03305d57e14548605a65277d053c7817f32f4546 DIST Python-3.9.16.tar.xz 19738796 BLAKE2B 70dedeb70d9d8f27e4f6db5106623e087c61d451c7a04639cf8d3503ad02d4d43f1b36d0cdf1131aefc9bf6e677e561227dd4baef2c2c3d2dbf6d3e7dc36bd94 SHA512 b5fd0afe131c82bbce6ddf887c59eef6945910d6a9a2bc87c0927f4e4a096bf9ca4d25bcb729c40f6ebb8a65fbe8bf7b0b97a7c4a8c9e551240eb4f34b878653 @@ -14,5 +16,6 @@ DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f DIST python-gentoo-patches-3.10.9.tar.xz 12216 BLAKE2B ced4f951089c51ddaab6c62ade9d2c84f69e7e1baf2acf5247559534c7d0fb0e88dca1222f5bd2209b4e61f5aca17279b8054f269535dbc10de0786c2c5779f5 SHA512 2d01f0f3831beeba004517bb82f7d616f25f08e5c755409ecff79cd68e0a619b5bf6802fffd0e5f7f39f1d9d93e65b018b91cdeb337a5e47f1651f36bea0e96e DIST python-gentoo-patches-3.11.1.tar.xz 7076 BLAKE2B 3ec45f7529d34eabc9d9ba7fa7f8dd51d8754d9758a605b61857a9fd80386a0357837c925263ad7b0e207ff916944b94cc0e03c0f59921f839d5e51d92f0e47e SHA512 4253dbfa057a91db584b92550e2d39d87986f33041233bc400dd0254cbd95415b33fc47b0fe997bb84192c755bc16d3d31941bba4c216ee4d65facf0b48c7862 DIST python-gentoo-patches-3.12.0a3.tar.xz 6152 BLAKE2B 6c8c88100d184440cf27a4b9baf4f192310f62960b2061adca8dd423745836048f3f8489c434c51ab7572320356bc889498d68f3635f174194d6009e1b9277e4 SHA512 7b0dbcbefeafbdb2a822bb06950844ff21336ba1685a2af6bf2bd32b1ecde7c17591d01b2a018105b8c094149a9804d709c3ca17af67378644ad40fd5e02c012 +DIST python-gentoo-patches-3.12.0a4.tar.xz 8504 BLAKE2B 1257c1fe428fc967ef7d3107f99e4fcef0758a2bfa5b345bf69bb47bc0af1644b449f2b11b61148a8f79ed583a80365432d78ec4bade3d92070f08ad2ff568c2 SHA512 142f5d2ee8c1beeb6084bb6b48a0bbdcde907f48f514ac7743f0e6898a761696bb7788861fcb5c938cc36f212d444ddcfe874880ac8b4d0d54bc8ec04b166ca0 DIST python-gentoo-patches-3.8.16.tar.xz 28716 BLAKE2B 28ccad9d77a89f80f72dd12eb89d657825e80061eaa069d4c491736bffd87b235f483b9d079b9f383377ea4bc6c19471bb6a4869a37fc0401abe28e2444fd9d2 SHA512 fe94ee2851af5c87c64ea3af5c1a744a53dcb03743f824a7726803daf454f38511894e24fe68be9de4ab59d1798161a3c320748309d04afd1e77906df353a246 DIST python-gentoo-patches-3.9.16.tar.xz 23348 BLAKE2B 26b66e57530d167776d2aee60fd4620fc8e6c229f371616fdaa74aa2f03fd5a50b61653a5f34e0f2659901ba167af7c2aadbb0d2db773ab08bac8b3125c84b77 SHA512 8260369d96a6328ad8498359ecc56f48cb02015547065cdaec28a6bb2293bef420cb12764fae9fdd13f4a6faa60c4c402e804a22cbed7dca031ac1679032f9f6 diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p16-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p16-r1.ebuild new file mode 100644 index 0000000000..3e4ffcf390 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p16-r1.ebuild @@ -0,0 +1,317 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils toolchain-funcs verify-sig + +MY_P="Python-${PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE=" + https://www.python.org/ + https://github.com/python/cpython/ + https://gitweb.gentoo.org/fork/cpython.git/ +" +SRC_URI=" + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE=" + berkdb bluetooth build examples gdbm hardened +ncurses +readline + +sqlite +ssl tk valgrind wininst +xml +" +RESTRICT="test" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND=" + app-arch/bzip2:= + dev-libs/libffi:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + berkdb? ( || ( + sys-libs/db:5.3 + sys-libs/db:4.8 + ) ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( dev-libs/openssl:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= ) +" +# bluetooth requires headers from bluez +DEPEND=" + ${RDEPEND} + bluetooth? ( net-wireless/bluez ) + valgrind? ( dev-util/valgrind ) +" +BDEPEND=" + app-alternatives/awk + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-python ) +" +RDEPEND+=" + !build? ( app-misc/mime-types ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc + +QA_PKGCONFIG_VERSION=${PYVER} + +pkg_setup() { + if use berkdb; then + ewarn "'bsddb' module is out-of-date and no longer maintained inside" + ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally" + ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module" + ewarn "is provided by dev-python/bsddb3." + fi +} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -r Modules/expat || die + rm -r Modules/_ctypes/libffi* || die + rm -r Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + Lib/distutils/command/install.py \ + Lib/distutils/sysconfig.py \ + Lib/site.py \ + Lib/sysconfig.py \ + Lib/test/test_site.py \ + Makefile.pre.in \ + Modules/Setup.dist \ + Modules/getpath.c \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + if ! use wininst; then + rm Lib/distutils/command/wininst*.exe || die + fi + + eautoreconf +} + +src_configure() { + # dbm module can be linked against berkdb or gdbm. + # Defaults to gdbm when both are enabled, #204343. + local disable + use berkdb || use gdbm || disable+=" dbm" + use berkdb || disable+=" _bsddb" + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + append-flags -fwrapv + + filter-flags -malign-double + + if tc-is-cross-compiler; then + # Force some tests that try to poke fs paths. + export ac_cv_file__dev_ptc=no + export ac_cv_file__dev_ptmx=yes + fi + + # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile. + tc-export CXX + # The configure script fails to use pkg-config correctly. + # http://bugs.python.org/issue15506 + export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) + + local dbmliborder= + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + if use berkdb; then + dbmliborder+="${dbmliborder:+:}bdb" + fi + + local myeconfargs=( + # The check is broken on clang, and gives false positive: + # https://bugs.gentoo.org/596798 + # (upstream dropped this flag in 3.2a4 anyway) + ac_cv_opt_olimit_ok=no + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --with-fpectl + --enable-shared + --enable-ipv6 + --with-threads + --enable-unicode=ucs4 + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + + $(use_with valgrind) + ) + + # disable implicit optimization/debugging flags + local -x OPT= + econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi + + # install epython.py as part of stdlib + echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + # Avoid invoking pgen for cross-compiles. + touch Include/graminit.h Python/graminit.c || die + + emake + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests=( distutils gdb ) + + for test in "${skipped_tests[@]}"; do + mv Lib/test/test_${test}.py "${T}"/ || die + done + + # bug 660358 + local -x COLUMNS=80 + + # Daylight saving time problem + # https://bugs.python.org/issue22067 + # https://bugs.gentoo.org/610628 + local -x TZ=UTC + + # Rerun failed tests in verbose mode (regrtest -w). + emake test EXTRATESTOPTS="-w" < /dev/tty + + for test in "${skipped_tests[@]}"; do + mv "${T}/test_${test}.py" Lib/test/ || die + done +} + +src_install() { + local libdir=${ED}/usr/$(get_libdir)/python${PYVER} + + emake DESTDIR="${D}" altinstall + + sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + # Fix collisions between different slots of Python. + mv "${ED}/usr/bin/2to3" "${ED}/usr/bin/2to3-${PYVER}" || die + mv "${ED}/usr/bin/pydoc" "${ED}/usr/bin/pydoc${PYVER}" || die + mv "${ED}/usr/bin/idle" "${ED}/usr/bin/idle${PYVER}" || die + rm "${ED}/usr/bin/smtpd.py" || die + + if ! use berkdb; then + rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die + fi + if ! use sqlite; then + rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + fi + if ! use tk; then + rm -r "${ED}/usr/bin/idle${PYVER}" || die + rm -r "${libdir}/"{idlelib,lib-tk} || die + fi + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + dodoc -r Tools + fi + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # python2* is no longer wrapped, so just symlink it + local pymajor=${PYVER%.*} + dosym "python${PYVER}" "/usr/bin/python${pymajor}" + dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha4.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha4.ebuild new file mode 100644 index 0000000000..93317e0a72 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha4.ebuild @@ -0,0 +1,504 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils +inherit prefix python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_alpha/a} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE=" + https://www.python.org/ + https://github.com/python/cpython/ +" +SRC_URI=" + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE=" + bluetooth build +ensurepip examples gdbm hardened libedit lto + +ncurses pgo +readline +sqlite +ssl test tk valgrind +" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND=" + app-arch/bzip2:= + app-arch/xz-utils:= + app-crypt/libb2 + >=dev-libs/expat-2.1:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + ensurepip? ( dev-python/ensurepip-wheels ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( + !libedit? ( >=sys-libs/readline-4.1:= ) + libedit? ( dev-libs/libedit:= ) + ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + !! /dev/null || die + # We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating + # libdir correctly for cross. + PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \ + ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}" + + # Avoid as many dependencies as possible for the cross build. + cat >> Makefile <<-EOF || die + MODULE_NIS_STATE=disabled + MODULE__DBM_STATE=disabled + MODULE__GDBM_STATE=disabled + MODULE__DBM_STATE=disabled + MODULE__SQLITE3_STATE=disabled + MODULE__HASHLIB_STATE=disabled + MODULE__SSL_STATE=disabled + MODULE__CURSES_STATE=disabled + MODULE__CURSES_PANEL_STATE=disabled + MODULE_READLINE_STATE=disabled + MODULE__TKINTER_STATE=disabled + MODULE_PYEXPAT_STATE=disabled + MODULE_ZLIB_STATE=disabled + EOF + + # Unfortunately, we do have to build this immediately, and + # not in src_compile, because CHOST configure for Python + # will check the existence of the --with-build-python value + # immediately. + PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake + popd &> /dev/null || die + fi + + # pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get + # propagated to sysconfig for built extensions + local -x CFLAGS_NODIST=${CFLAGS} + local -x LDFLAGS_NODIST=${LDFLAGS} + local -x CFLAGS= LDFLAGS= + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + + hprefixify setup.py + econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi + + # force-disable modules we don't want built + local disable_modules=( NIS ) + use gdbm || disable_modules+=( _GDBM _DBM ) + use sqlite || disable_modules+=( _SQLITE3 ) + use ssl || disable_modules+=( _HASHLIB _SSL ) + use ncurses || disable_modules+=( _CURSES _CURSES_PANEL ) + use readline || disable_modules+=( READLINE ) + use tk || disable_modules+=( _TKINTER ) + + local mod + for mod in "${disable_modules[@]}"; do + echo "MODULE_${mod}_STATE=disabled" + done >> Makefile || die + + # install epython.py as part of stdlib + echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + export PYTHONSTRICTEXTENSIONBUILD=1 + + # Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't + # end up writing bytecode & violating sandbox. + # bug #831897 + local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE} + + if use pgo ; then + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + addpredict "/usr/lib/python${PYVER}/site-packages" + fi + + # also need to clear the flags explicitly here or they end up + # in _sysconfigdata* + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Restore saved value from above. + local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE} + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # this just happens to skip test_support.test_freeze that is broken + # without bundled expat + # TODO: get a proper skip for it upstream + local -x LOGNAME=buildbot + + local test_opts=( + -u-network + -j "$(makeopts_jobs)" + + # fails + -x test_gdb + ) + + if use sparc ; then + # bug #788022 + test_opts+=( + -x test_multiprocessing_fork + -x test_multiprocessing_forkserver + ) + fi + + # workaround docutils breaking tests + cat > Lib/docutils.py <<-EOF || die + raise ImportError("Thou shalt not import!") + EOF + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + # workaround https://bugs.gentoo.org/775416 + addwrite "/usr/lib/python${PYVER}/site-packages" + + nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local ret=${?} + + rm Lib/docutils.py || die + + [[ ${ret} -eq 0 ]] || die "emake test failed" +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + # the Makefile rules are broken + # https://github.com/python/cpython/issues/100221 + mkdir -p "${libdir}"/lib-dynload || die + + # -j1 hack for now for bug #843458 + emake -j1 DESTDIR="${D}" altinstall + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + rm -r "${libdir}"/ensurepip/_bundled || die + if ! use ensurepip; then + rm -r "${libdir}"/ensurepip || die + fi + if ! use sqlite; then + rm -r "${libdir}/"sqlite3 || die + fi + if ! use tk; then + rm -r "${ED}/usr/bin/idle${PYVER}" || die + rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + fi + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$( + printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | + emake --no-print-directory -s -f - 2>/dev/null + ) + newins Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local EPYTHON=python${PYVER} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die + fi +} + +pkg_postinst() { + local v + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 3.11.0_beta4-r2; then + ewarn "Python 3.11.0b4 has changed its module ABI. The .pyc files" + ewarn "installed previously are no longer valid and will be regenerated" + ewarn "(or ignored) on the next import. This may cause sandbox failures" + ewarn "when installing some packages and checksum mismatches when removing" + ewarn "old versions. To actively prevent this, rebuild all packages" + ewarn "installing Python 3.11 modules, e.g. using:" + ewarn + ewarn " emerge -1v /usr/lib/python3.11/site-packages" + fi + done +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16-r2.ebuild index 086407df87..57fdc6566d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16-r2.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 EAPI="7" @@ -43,7 +43,6 @@ RESTRICT="!test? ( test )" RDEPEND=" app-arch/bzip2:= app-arch/xz-utils:= - dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16-r3.ebuild new file mode 100644 index 0000000000..3f281df2bb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16-r3.ebuild @@ -0,0 +1,422 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic multiprocessing pax-utils +inherit prefix python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_rc/rc} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE=" + https://www.python.org/ + https://github.com/python/cpython/ +" +SRC_URI=" + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE=" + bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo + +readline +sqlite +ssl test tk valgrind wininst +xml +" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND=" + app-arch/bzip2:= + app-arch/xz-utils:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + ensurepip? ( dev-python/ensurepip-wheels ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= ) +" +# bluetooth requires headers from bluez +DEPEND=" + ${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + valgrind? ( dev-util/valgrind ) +" +# autoconf-archive needed to eautoreconf +BDEPEND=" + sys-devel/autoconf-archive + app-alternatives/awk + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-python ) +" +RDEPEND+=" + !build? ( app-misc/mime-types ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc + +QA_PKGCONFIG_VERSION=${PYVER} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +src_prepare() { + # Ensure that internal copies of expat and libffi are not used. + rm -r Modules/expat || die + rm -r Modules/_ctypes/libffi* || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + # https://bugs.gentoo.org/850151 + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die + + # force the correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs) + sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + + if ! use wininst; then + rm Lib/distutils/command/wininst*.exe || die + fi + + eautoreconf +} + +src_configure() { + # disable automagic bluetooth headers detection + if ! use bluetooth; then + local -x ac_cv_header_bluetooth_bluetooth_h=no + fi + local disable + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + append-flags -fwrapv + + filter-flags -malign-double + + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + # PKG_CONFIG needed for cross. + tc-export CXX PKG_CONFIG + + local dbmliborder= + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --enable-shared + --enable-ipv6 + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip + + $(use_with valgrind) + ) + + # disable implicit optimization/debugging flags + local -x OPT= + + if tc-is-cross-compiler ; then + # Hack to workaround get_libdir not being able to handle CBUILD, bug #794181 + local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi) + + # pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get + # propagated to sysconfig for built extensions + local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD} + local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD} + local -x CFLAGS= LDFLAGS= + + # We need to build our own Python on CBUILD first, and feed it in. + # bug #847910 and bug #864911. + local myeconfargs_cbuild=( + "${myeconfargs[@]}" + + --libdir="${cbuild_libdir:2}" + + # As minimal as possible for the mini CBUILD Python + # we build just for cross. + --without-lto + --disable-optimizations + ) + + # Point the imminent CHOST build to the Python we just + # built for CBUILD. + export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}" + + mkdir "${WORKDIR}"/${P}-${CBUILD} || die + pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die + # We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating + # libdir correctly for cross. + PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \ + ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}" + + # Avoid as many dependencies as possible for the cross build. + cat >> Makefile <<-EOF || die + MODULE_NIS=disabled + MODULE__DBM=disabled + MODULE__GDBM=disabled + MODULE__DBM=disabled + MODULE__SQLITE3=disabled + MODULE__HASHLIB=disabled + MODULE__SSL=disabled + MODULE__CURSES=disabled + MODULE__CURSES_PANEL=disabled + MODULE_READLINE=disabled + MODULE__TKINTER=disabled + MODULE_PYEXPAT=disabled + MODULE_ZLIB=disabled + EOF + + # Unfortunately, we do have to build this immediately, and + # not in src_compile, because CHOST configure for Python + # will check the existence of the Python it was pointed to + # immediately. + PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake + popd &> /dev/null || die + fi + + # pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get + # propagated to sysconfig for built extensions + local -x CFLAGS_NODIST=${CFLAGS} + local -x LDFLAGS_NODIST=${LDFLAGS} + local -x CFLAGS= LDFLAGS= + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + + hprefixify setup.py + econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi + + # install epython.py as part of stdlib + echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + # Prevent using distutils bundled by setuptools. + # https://bugs.gentoo.org/823728 + export SETUPTOOLS_USE_DISTUTILS=stdlib + + # also need to clear the flags explicitly here or they end up + # in _sysconfigdata* + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + local test_opts=( + -u-network + -j "$(makeopts_jobs)" + + # fails + -x test_gdb + ) + + if use sparc ; then + # bug #788022 + test_opts+=( + -x test_multiprocessing_fork + -x test_multiprocessing_forkserver + ) + fi + + # workaround docutils breaking tests + cat > Lib/docutils.py <<-EOF || die + raise ImportError("Thou shalt not import!") + EOF + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local ret=${?} + + rm Lib/docutils.py || die + + [[ ${ret} -eq 0 ]] || die "emake test failed" +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + rm -r "${libdir}"/ensurepip/_bundled || die + if ! use ensurepip; then + rm -r "${libdir}"/ensurepip || die + fi + if ! use sqlite; then + rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + fi + if ! use tk; then + rm -r "${ED}/usr/bin/idle${PYVER}" || die + rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + fi + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$( + printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | + emake --no-print-directory -s -f - 2>/dev/null + ) + newins Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local EPYTHON=python${PYVER} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die + fi +} From e0bedb1e476f808601478d7e9f20c5fd636f3885 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:49 +0000 Subject: [PATCH 19/76] dev-libs/boost: Sync with Gentoo It's from Gentoo commit 07c078c95908ea51c67b761daec1c617c2e775a6. --- .../portage-stable/dev-libs/boost/boost-1.80.0-r1.ebuild | 4 ++-- .../portage-stable/dev-libs/boost/boost-1.81.0-r1.ebuild | 6 +++--- .../portage-stable/dev-libs/boost/boost-1.81.0.ebuild | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.80.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.80.0-r1.ebuild index c59b9cff63..89992f5452 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.80.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.80.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0-r1.ebuild index 4879ee3c6c..a2dedb8128 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}_${MY_PV}" LICENSE="Boost-1.0" SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # the tests will never fail because these are not intended as sanity diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0.ebuild index 3b6a40caf5..59b674d933 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal From 1d1426fb42b19f9a4cde4cfa080d5272e8cfa850 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:51 +0000 Subject: [PATCH 20/76] dev-libs/elfutils: Sync with Gentoo It's from Gentoo commit ead5f36b5dca164c24d1422a341a9e7226b38348. --- .../portage-stable/dev-libs/elfutils/elfutils-0.188.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.188.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.188.ebuild index 77b5fbb7fb..b47d779db7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.188.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.188.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2022 Gentoo Authors +# Copyright 2003-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -101,6 +101,10 @@ multilib_src_configure() { $(use_with zstd) ) + # Needed because sets alignment macro + is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address ) + is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } From f261a4c39aa9e3d1219c8ba803b1bdbf4d1af6ba Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:52 +0000 Subject: [PATCH 21/76] dev-libs/glib: Sync with Gentoo It's from Gentoo commit 5dc85258363c774c504d046e3f0f329759d98e64. --- .../portage-stable/dev-libs/glib/Manifest | 2 +- .../files/glib-2.74.1-gnome-keyring-cpu.patch | 131 ------------------ .../dev-libs/glib/glib-2.74.3-r3.ebuild | 4 +- .../dev-libs/glib/glib-2.74.4.ebuild | 4 +- ...ib-2.74.1-r1.ebuild => glib-2.74.5.ebuild} | 10 +- 5 files changed, 10 insertions(+), 141 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.1-gnome-keyring-cpu.patch rename sdk_container/src/third_party/portage-stable/dev-libs/glib/{glib-2.74.1-r1.ebuild => glib-2.74.5.ebuild} (96%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest index 12c33f3713..d99cd57cc0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest @@ -1,4 +1,4 @@ -DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3 DIST glib-2.74.3-patches-2.tar.xz 23576 BLAKE2B f3746bdf961890d9f4e7ad20b107b83b7ceb8dcc36e288c1d526bac31a0e1dd9d1f13323f512355085c77d186ad66c3f52c1154f34c1d6fd6a5e64a074b2920c SHA512 945c131c27f02044db6154f0a63f458d6317c8a4e841fb392947b16756e25d92adeb2b34d793c9e19441b825d1aee71ae9b08fdcbefa1bc9de1d5af9e903e82c DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6 +DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.1-gnome-keyring-cpu.patch b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.1-gnome-keyring-cpu.patch deleted file mode 100644 index 8cb07a2803..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.74.1-gnome-keyring-cpu.patch +++ /dev/null @@ -1,131 +0,0 @@ -https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3029 -https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3039 (backport PR we've used) -https://bugs.gentoo.org/878995 -https://bugs.gentoo.org/878351 - -From e2f283d7c8c5ab3aeb2f281a27ec7c0f24b86868 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Fri, 28 Oct 2022 11:21:04 -0400 -Subject: [PATCH 1/2] Revert "Handling collision between standard i/o file - descriptors and newly created ones" - -g_unix_open_pipe tries to avoid the standard io fd range -when getting pipe fds. This turns out to be a bad idea because -certain buggy programs rely on it using that range. - -This reverts commit d9ba6150909818beb05573f54f26232063492c5b ---- a/glib/glib-unix.c -+++ b/glib/glib-unix.c -@@ -108,17 +108,6 @@ g_unix_open_pipe (int *fds, - ecode = pipe2 (fds, pipe2_flags); - if (ecode == -1 && errno != ENOSYS) - return g_unix_set_error_from_errno (error, errno); -- /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */ -- else if (fds[0] < 3 || fds[1] < 3) -- { -- int old_fds[2] = { fds[0], fds[1] }; -- gboolean result = g_unix_open_pipe (fds, flags, error); -- close (old_fds[0]); -- close (old_fds[1]); -- -- if (!result) -- g_unix_set_error_from_errno (error, errno); -- } - else if (ecode == 0) - return TRUE; - /* Fall through on -ENOSYS, we must be running on an old kernel */ -@@ -127,19 +116,6 @@ g_unix_open_pipe (int *fds, - ecode = pipe (fds); - if (ecode == -1) - return g_unix_set_error_from_errno (error, errno); -- /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */ -- else if (fds[0] < 3 || fds[1] < 3) -- { -- int old_fds[2] = { fds[0], fds[1] }; -- gboolean result = g_unix_open_pipe (fds, flags, error); -- close (old_fds[0]); -- close (old_fds[1]); -- -- if (!result) -- g_unix_set_error_from_errno (error, errno); -- -- return result; -- } - - if (flags == 0) - return TRUE; -GitLab -From 4526620d8c485f5dfba6ddca33f91670982f82eb Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Mon, 31 Oct 2022 09:17:55 -0400 -Subject: [PATCH 2/2] glib-unix: Add test to make sure g_unix_open_pipe will - intrude standard range - -Now that we know it's a bad idea to avoid the standard io fd range -when getting pipe fds for g_unix_open_pipe, we should test to make sure -we don't inadvertently try to do it again. - -This commit adds that test. ---- a/glib/tests/unix.c -+++ b/glib/tests/unix.c -@@ -24,8 +24,11 @@ - #include "config.h" - - #include "glib-unix.h" -+#include "gstdio.h" -+ - #include - #include -+#include - - static void - test_pipe (void) -@@ -52,6 +55,39 @@ test_pipe (void) - g_assert (g_str_has_prefix (buf, "hello")); - } - -+static void -+test_pipe_stdio_overwrite (void) -+{ -+ GError *error = NULL; -+ int pipefd[2], ret; -+ gboolean res; -+ int stdin_fd; -+ -+ stdin_fd = dup (STDIN_FILENO); -+ g_assert_cmpint (stdin_fd, >, 0); -+ -+ g_close (STDIN_FILENO, &error); -+ g_assert_no_error (error); -+ -+ res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); -+ g_assert_no_error (error); -+ g_assert_true (res); -+ -+ g_assert_cmpint (pipefd[0], ==, STDIN_FILENO); -+ -+ g_close (pipefd[0], &error); -+ g_assert_no_error (error); -+ -+ g_close (pipefd[1], &error); -+ g_assert_no_error (error); -+ -+ ret = dup2 (stdin_fd, STDIN_FILENO); -+ g_assert_cmpint (ret, >=, 0); -+ -+ g_close (stdin_fd, &error); -+ g_assert_no_error (error); -+} -+ - static void - test_error (void) - { -@@ -337,6 +373,7 @@ main (int argc, - g_test_init (&argc, &argv, NULL); - - g_test_add_func ("/glib-unix/pipe", test_pipe); -+ g_test_add_func ("/glib-unix/pipe-stdio-overwrite", test_pipe_stdio_overwrite); - g_test_add_func ("/glib-unix/error", test_error); - g_test_add_func ("/glib-unix/nonblocking", test_nonblocking); - g_test_add_func ("/glib-unix/sighup", test_sighup); -GitLab diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.3-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.3-r3.ebuild index 0247aef492..d97da8c4c9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.3-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.3-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.4.ebuild index 427fce1f5d..893dd43479 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.5.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.5.ebuild index cf1afe7d1d..7924f656d5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg @@ -16,7 +16,7 @@ IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test u RESTRICT="!test? ( test )" #REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" # * elfutils (via libelf) does not build on Windows. gresources are not embedded # within ELF binaries on that platform anyway and inspecting ELF binaries from @@ -30,7 +30,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv RDEPEND=" !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] @@ -68,7 +68,7 @@ MULTILIB_CHOST_TOOLS=( ) PATCHES=( - "${FILESDIR}"/${P}-gnome-keyring-cpu.patch + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch ) pkg_setup() { From 720c750aa3735d0c9ff79c1ccb61e12aa304ec07 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:52 +0000 Subject: [PATCH 22/76] dev-libs/gobject-introspection: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../gobject-introspection/gobject-introspection-1.74.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild index 140af9c36f..592e42c160 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" inherit gnome.org meson python-single-r1 xdg From 2c4f71e2f3f077d3d4762de405013bcf577879ba Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:54 +0000 Subject: [PATCH 23/76] dev-libs/libpcre2: Sync with Gentoo It's from Gentoo commit 8f0de6f7e19517b6653f826d96d6161609b5d861. --- .../dev-libs/libpcre2/libpcre2-10.40-r1.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild index 12a35ecd32..288e14a00e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.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 EAPI=7 @@ -21,8 +21,7 @@ else fi if [[ -n "${PATCH_SET}" ]] ; then - SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET} - https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}" + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PATCH_SET}" fi S="${WORKDIR}/${MY_P}" From bf2c0f3f27c7af7f9b95376ead5b49782c4629d8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:55 +0000 Subject: [PATCH 24/76] dev-libs/libxml2: Sync with Gentoo It's from Gentoo commit 90e12deb36f9e585f350076570e464497b9547eb. --- .../dev-libs/libxml2/libxml2-2.10.3-r1.ebuild | 13 ++++++++++--- .../dev-libs/libxml2/libxml2-9999.ebuild | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild index bc2c968b0d..4b5648cf64 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.3-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Note: Please bump in sync with dev-libs/libxslt -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" -inherit flag-o-matic python-r1 multilib-minimal +inherit flag-o-matic python-r1 multilib-minimal toolchain-funcs XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" XSTS_NAME_1="xmlschema2002-01-16" @@ -102,6 +102,13 @@ multilib_src_configure() { # Filter seemingly problematic CFLAGS (bug #26320) filter-flags -fprefetch-loop-arrays -funroll-loops + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + # Notes: # The meaning of the 'debug' USE flag does not apply to the --with-debug # switch (enabling the libxml2 debug module). See bug #100898. diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild index b8f7fa1688..556f5e7156 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Note: Please bump in sync with dev-libs/libxslt -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" -inherit flag-o-matic python-r1 multilib-minimal +inherit flag-o-matic python-r1 multilib-minimal toolchain-funcs XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" XSTS_NAME_1="xmlschema2002-01-16" @@ -100,6 +100,13 @@ multilib_src_configure() { # Filter seemingly problematic CFLAGS (bug #26320) filter-flags -fprefetch-loop-arrays -funroll-loops + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + # Notes: # The meaning of the 'debug' USE flag does not apply to the --with-debug # switch (enabling the libxml2 debug module). See bug #100898. From a0ebeacd3a5cc13c8b3db30f709dc77bf309c34b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:20:55 +0000 Subject: [PATCH 25/76] dev-libs/libxslt: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild | 4 ++-- .../portage-stable/dev-libs/libxslt/libxslt-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild index 151e80a2ac..917c3e8de7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Note: Please bump this in sync with dev-libs/libxml2. -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit flag-o-matic python-r1 multilib-minimal DESCRIPTION="XSLT libraries and tools" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-9999.ebuild index a4fddfe4f2..e03f14b67d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Note: Please bump this in sync with dev-libs/libxml2. -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-r1 multilib-minimal DESCRIPTION="XSLT libraries and tools" From 484fc6b11f68cfe645880ad22eca93dad1339fa9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:04 +0000 Subject: [PATCH 26/76] dev-python/fasteners: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/dev-python/fasteners/fasteners-0.18.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/fasteners/fasteners-0.18.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/fasteners/fasteners-0.18.ebuild index c5ad8f9a33..aa5af3d138 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/fasteners/fasteners-0.18.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/fasteners/fasteners-0.18.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 DESCRIPTION="Python package that provides useful locks" From 0135c832fb692cb5f06dae830d53042ac12bd6ce Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:04 +0000 Subject: [PATCH 27/76] dev-util/b2: Sync with Gentoo It's from Gentoo commit 48ccc5d52042f9807e468da0003caa5d4ae0c516. --- .../third_party/portage-stable/dev-util/b2/b2-4.9.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.3.ebuild index f1a5c248ac..a61edf4131 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.3.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 EAPI=8 @@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src" LICENSE="Boost-1.0" SLOT="0" -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" IUSE="examples" RESTRICT="test" From 109752f22477e2bbc9d481dfe1f957ef68a6f499 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:04 +0000 Subject: [PATCH 28/76] dev-util/bpftool: Sync with Gentoo It's from Gentoo commit 0ff398c8011c20cc94fc5a5cd2dcb0be859de9fa. --- .../portage-stable/dev-util/bpftool/Manifest | 1 - .../dev-util/bpftool/bpftool-5.19.12.ebuild | 16 ++- .../dev-util/bpftool/bpftool-5.19.8.ebuild | 125 ------------------ .../dev-util/bpftool/bpftool-6.0.12.ebuild | 18 ++- .../files/5.19.12-no-stack-protector.patch | 14 ++ 5 files changed, 35 insertions(+), 139 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.8.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/bpftool/files/5.19.12-no-stack-protector.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest index 1eebe18dd3..a9565ab901 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest @@ -1,6 +1,5 @@ DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714 DIST patch-5.19.12.xz 828424 BLAKE2B fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1 SHA512 40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc -DIST patch-5.19.8.xz 695676 BLAKE2B 3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c SHA512 16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161 DIST patch-6.0.12.xz 635356 BLAKE2B f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa SHA512 d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00 DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.12.ebuild index 3b2b5a406a..fa8315db60 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.12.ebuild @@ -1,10 +1,10 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit estack linux-info optfeature python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{9..10} ) +inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs MY_PV="${PV/_/-}" MY_PV="${MY_PV/-pre/-git}" @@ -27,7 +27,7 @@ S="${S_K}/tools/bpf/bpftool" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv ~x86" IUSE="caps" RDEPEND=" @@ -43,6 +43,7 @@ DEPEND=" BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} ${PYTHON_DEPS} + app-arch/tar dev-python/docutils " @@ -56,10 +57,9 @@ src_unpack() { tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib" ) - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). + # We expect the tar implementation to support the -j and --wildcards option echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ + gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ "${paths[@]/#/linux-${LINUX_VER}/}" || die if [[ -n ${LINUX_PATCH} ]] ; then @@ -92,6 +92,7 @@ src_prepare() { # Used `git format-patch 00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00` # bug #868123 eapply "${WORKDIR}"/perf-5.19-binutils-2.39-patches + eapply "${FILESDIR}"/${PV}-no-stack-protector.patch popd || die # dev-python/docutils installs rst2man.py, not rst2man @@ -106,6 +107,7 @@ bpftool_make() { HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ prefix="${EPREFIX}"/usr \ + bash_compdir="$(get_bashcompdir)" \ feature-libcap="$(usex caps 1 0)" \ "$@" } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.8.ebuild deleted file mode 100644 index 43dec802c6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-5.19.8.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit estack linux-info optfeature python-any-r1 toolchain-funcs - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-pre/-git}" - -DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps" -HOMEPAGE="https://kernel.org/" - -LINUX_V="${PV:0:1}.x" -LINUX_VER=$(ver_cut 1-2) -LINUX_PATCH=patch-${PV}.xz -SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" - -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/bpf/bpftool" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~riscv ~x86" -IUSE="caps" - -RDEPEND=" - sys-libs/binutils-libs:= - sys-libs/zlib:= - virtual/libelf:= - caps? ( sys-libs/libcap:= ) -" -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-5.8 -" -BDEPEND=" - ${LINUX_PATCH+dev-util/patchutils} - ${PYTHON_DEPS} - dev-python/docutils -" - -CONFIG_CHECK="~DEBUG_INFO_BTF" - -# src_unpack and src_prepare are copied from dev-util/perf since -# it's building from the same tarball, please keep it in sync with perf -src_unpack() { - local paths=( - tools/bpf kernel/bpf - tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib" - ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ - "${paths[@]/#/linux-${LINUX_VER}/}" || die - - if [[ -n ${LINUX_PATCH} ]] ; then - eshopts_push -o noglob - ebegin "Filtering partial source patch" - filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \ - > ${P}.patch - eend $? || die "filterdiff failed" - eshopts_pop - fi - - local a - for a in ${A}; do - [[ ${a} == ${LINUX_SOURCES} ]] && continue - [[ ${a} == ${LINUX_PATCH} ]] && continue - unpack ${a} - done -} - -src_prepare() { - default - - if [[ -n ${LINUX_PATCH} ]] ; then - pushd "${S_K}" >/dev/null || die - eapply "${WORKDIR}"/${P}.patch - popd || die - fi - - pushd "${S_K}" >/dev/null || die - # Used `git format-patch 00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00` - # bug #868123 - eapply "${WORKDIR}"/perf-5.19-binutils-2.39-patches - popd || die - - # dev-python/docutils installs rst2man.py, not rst2man - sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die -} - -bpftool_make() { - local arch=$(tc-arch-kernel) - tc-export AR CC LD - - emake V=1 VF=1 \ - HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ - EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ - prefix="${EPREFIX}"/usr \ - feature-libcap="$(usex caps 1 0)" \ - "$@" -} - -src_compile() { - bpftool_make - bpftool_make -C Documentation -} - -src_install() { - bpftool_make DESTDIR="${D}" install - bpftool_make mandir="${ED}"/usr/share/man -C Documentation install -} - -pkg_postinst() { - optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF] -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.0.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.0.12.ebuild index 6833c60b6e..4f68a43259 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.0.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.0.12.ebuild @@ -1,10 +1,10 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit estack linux-info optfeature python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{9..10} ) +inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs MY_PV="${PV/_/-}" MY_PV="${MY_PV/-pre/-git}" @@ -41,6 +41,7 @@ DEPEND=" BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} ${PYTHON_DEPS} + app-arch/tar dev-python/docutils " @@ -54,10 +55,9 @@ src_unpack() { tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib" ) - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). + # We expect the tar implementation to support the -j and --wildcards option echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ + gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ "${paths[@]/#/linux-${LINUX_VER}/}" || die if [[ -n ${LINUX_PATCH} ]] ; then @@ -86,6 +86,11 @@ src_prepare() { popd || die fi + pushd "${S_K}" >/dev/null || die + # bug #890638 + eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch + popd || die + # dev-python/docutils installs rst2man.py, not rst2man sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die } @@ -98,6 +103,7 @@ bpftool_make() { HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ prefix="${EPREFIX}"/usr \ + bash_compdir="$(get_bashcompdir)" \ feature-libcap="$(usex caps 1 0)" \ "$@" } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/files/5.19.12-no-stack-protector.patch b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/files/5.19.12-no-stack-protector.patch new file mode 100644 index 0000000000..c9ae115ac2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/files/5.19.12-no-stack-protector.patch @@ -0,0 +1,14 @@ + +https://bugs.gentoo.org/890638 + +--- a/tools/bpf/bpftool/Makefile 2022-12-11 23:15:18.000000000 +0100 ++++ b/tools/bpf/bpftool/Makefile 2023-01-13 10:32:09.615048492 +0100 +@@ -187,7 +187,7 @@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUT + -I$(or $(OUTPUT),.) \ + -I$(srctree)/tools/include/uapi/ \ + -I$(LIBBPF_BOOTSTRAP_INCLUDE) \ +- -g -O2 -Wall -target bpf -c $< -o $@ ++ -g -O2 -Wall -fno-stack-protector -target bpf -c $< -o $@ + $(Q)$(LLVM_STRIP) -g $@ + + $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP) From 07bb5c2d7f3fd7aefbfc8bb35f7c2e508050c450 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:04 +0000 Subject: [PATCH 29/76] dev-util/catalyst: Sync with Gentoo It's from Gentoo commit ae2e3cc2e1120b630620c1634e01b5d83b11da81. --- .../third_party/portage-stable/dev-util/catalyst/metadata.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/metadata.xml index 5b1e3035ac..d8a6b705dc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/metadata.xml @@ -9,4 +9,8 @@ Pulls in the depends for building iso images Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar + + proj/catalyst + gentoo/catalyst + From 3ce0aa93ee3d524f82e95b03ec3332c9e2b34b52 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:05 +0000 Subject: [PATCH 30/76] dev-util/cmake: Sync with Gentoo It's from Gentoo commit 1e0c6f9332423bd02de6f6e6408f84251b7c1d6a. --- .../portage-stable/dev-util/cmake/Manifest | 4 + .../dev-util/cmake/cmake-3.25.2.ebuild | 293 ++++++++++++++++++ 2 files changed, 297 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest index d2693717d5..c0665edbe0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest @@ -9,3 +9,7 @@ DIST cmake-3.25.1-SHA-256.txt 1646 BLAKE2B b5ebf93e481b2bf63c5448875983f0b4d13f4 DIST cmake-3.25.1-SHA-256.txt.asc 833 BLAKE2B 3dce05d9ad5852165418726fc16de4fcc6c66aa379ce926a68c10515dcd87ed40b60ce345952fc2c83f342b5ebb0f02134af6c07b58e9dcf7e1757ad6294d8b5 SHA512 70ec7f1cef52d76ab6732556b663509de780648a2009608632a7df0de86c1d8b91fab874233413216a486fa97648d95de1556f89f48cea936408b609380c5aa4 DIST cmake-3.25.1-docs.tar.xz 499680 BLAKE2B 0baac457fbde68046080a906093be96c6fe3d7a4b592125237258768eeb0f9c80d3e1e867e2850fe3ebd27a1284d2f47245ca73b8f5b6eb4c046f2afdab78e56 SHA512 02e1bf84be15a7c796a9a7535ee286ca3cddc478707daa1be076be44285f762a0c5eb620b34815e6713b7262a534d7c7fb48e53896c4706645792397f8da83e3 DIST cmake-3.25.1.tar.gz 10561054 BLAKE2B 3aaf546ebc935caaaf6d15c61f99184964902a50004222ba29e17714488b219f8d8754008f2b2d701dd7befe8c0f4cd0edad92fcabb8ad37b981f31b2d1e37a2 SHA512 ec4203cac569e3c340bf6535d193d9ccff9c4e4d59a7a7ae5b9156172f647d9f9212bdc37b3c12cbd676b1351b9a64364c563aaa968a2f41e0f402410ed78d57 +DIST cmake-3.25.2-SHA-256.txt 1646 BLAKE2B 10289acf1a74e45ad1109bb0759ce82024553947ff60c8358854f26d276e89155df9b44561adee4b838d95fb2fcb54b4d2ca1e957b35a90ee80ea56dc63d94be SHA512 75d6a0c4c9350ad466559f44f56f2d18308cdfbaba24da3c86950c9bfb4861f9486f031b41206de83019850944081f304953dbd04b55501ea7b3912aabfb1e00 +DIST cmake-3.25.2-SHA-256.txt.asc 833 BLAKE2B 823c1132836529c3ca1c9060f504ad9904169621e3284c489b92f6334454ffa82791d336c78a27e705eca686e63131aed249c44e61b5f7fb915e80cca0155edc SHA512 16d5f8e0071db7f29b2f502b8a26e71e73519980555f64a548f1b3d5e917ec377cdfa49a4750dffde952e6b818dd37d000992bf67b553902b2117809f02b9486 +DIST cmake-3.25.2-docs.tar.xz 500144 BLAKE2B 9f45daf51c3acddce8e273649cd7445d00324883f2feccc98632a35d2ba72e7f6fd286f65bc362969f41d13cd5f34881aac8a229c9f6533caf0d86e1092075a8 SHA512 191daffb9a244fac79700bb0d21b3d65c7b94685dafd589122d37017660d13768e3e3257170bbfe46871efc59da6e7e2fcad0ce860cf87f1dc149c80df73cf91 +DIST cmake-3.25.2.tar.gz 10561266 BLAKE2B ca093cf0b2a0254494965c8b46ab188024b6d745cd56461451f4fa023fbb4f2cca7077877f1698c082d8a3b52c898d6f793657d8da3879f19f7b24139cbab7f0 SHA512 20146d06a1722c36249192944a58e4780aad334d2bc5ce2a3d8c4f24656630c5b71ca0ae7ed53587e3d46f488bd773452fa60c3fc7045fe54db2dbc6ffd86390 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild new file mode 100644 index 0000000000..bcb269c0b9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild @@ -0,0 +1,293 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +: ${CMAKE_DOCS_PREBUILT:=1} + +CMAKE_DOCS_PREBUILT_DEV=sam +CMAKE_DOCS_VERSION=$(ver_cut 1-3) +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# See bug #784815 +CMAKE_DOCS_USEFLAG="+doc" + +# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja +# ... but seems fine as of 3.22.3? +# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. +CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_REMOVE_MODULES_LIST=( none ) +inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ + toolchain-funcs virtualx xdg-utils + +MY_P="${P/_/-}" + +DESCRIPTION="Cross platform Make" +HOMEPAGE="https://cmake.org/" +if [[ ${PV} == 9999 ]] ; then + CMAKE_DOCS_PREBUILT=0 + + EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" + inherit git-r3 +else + SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + + if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" + fi + + if [[ ${PV} != *_rc* ]] ; then + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc + inherit verify-sig + + SRC_URI+=" verify-sig? ( + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc + )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" + fi +fi + +[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" + +S="${WORKDIR}/${MY_P}" + +LICENSE="CMake" +SLOT="0" +IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/libarchive-3.3.3:= + app-crypt/rhash + >=dev-libs/expat-2.0.1 + >=dev-libs/jsoncpp-1.9.2-r2:0= + >=dev-libs/libuv-1.10.0:= + >=net-misc/curl-7.21.5[ssl] + sys-libs/zlib + virtual/pkgconfig + emacs? ( >=app-editors/emacs-23.1:* ) + ncurses? ( sys-libs/ncurses:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND}" +BDEPEND+=" + doc? ( + dev-python/requests + dev-python/sphinx + ) + test? ( app-arch/libarchive[zstd] ) +" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + # Prefix + "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch + "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch + "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch + + # Handle gentoo packaging in find modules + "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch + # Next patch needs to be reworked + #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch + + # Respect python eclasses + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch + + "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 + + # upstream fixes (can usually be removed with a version bump) +) + +cmake_src_bootstrap() { + # disable running of cmake in bootstrap command + sed -i \ + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ + bootstrap || die "sed failed" + + # execinfo.h on Solaris isn't quite what it is on Darwin + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/execinfo\.h/blablabla.h/' \ + Source/kwsys/CMakeLists.txt || die + fi + + # bootstrap script isn't exactly /bin/sh compatible + tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ + --prefix="${T}/cmakestrap/" \ + --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ + || die "Bootstrap failed" +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then + default + else + cd "${DISTDIR}" || die + + # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature + verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc} + verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz + + cd "${WORKDIR}" || die + + default + fi +} + +src_prepare() { + cmake_src_prepare + + if [[ ${CHOST} == *-darwin* ]] ; then + # Disable Xcode hooks, bug #652134 + sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ + Source/CMakeLists.txt || die + sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ + -e '/cmGlobalXCodeGenerator.h/d' \ + Source/cmake.cxx || die + + # Disable isysroot usage with GCC, we've properly instructed + # where things are via GCC configuration and ldwrapper + sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ + Modules/Platform/Apple-GNU-*.cmake || die + # Disable isysroot usage with clang as well + sed -i -e '/_SYSROOT_FLAG/d' \ + Modules/Platform/Apple-Clang.cmake || die + # Don't set a POSIX standard, system headers don't like that, #757426 + sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmLoadCommandCommand.cxx \ + Source/cmStandardLexer.h \ + Source/cmSystemTools.cxx \ + Source/cmTimestamp.cxx + sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmStandardLexer.h + fi + + # Add gcc libs to the default link paths + sed -i \ + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" + + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + # ODR warnings, bug #858335 + # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 + filter-lto + + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + -DSPHINX_MAN=$(usex doc) + -DSPHINX_HTML=$(usex doc) + -DBUILD_CursesDialog="$(usex ncurses)" + -DBUILD_TESTING=$(usex test) + ) + use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use emacs && elisp-compile Auxiliary/cmake-mode.el +} + +src_test() { + # Fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + pushd "${BUILD_DIR}" > /dev/null || die + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # BundleUtilities: bundle creation broken + # CMakeOnly.AllFindModules: pthread issues + # CTest.updatecvs: which fails to commit as root + # Fortran: requires fortran + # RunCMake.CompilerLauncher: also requires fortran + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because + # debugedit binary is not in the expected location + # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because + # it can't find a deb package that owns libc + # TestUpload, which requires network access + # RunCMake.CMP0125, known failure reported upstream (bug #829414) + local myctestargs=( + --output-on-failure + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ + ) + + virtx cmake_src_test +} + +src_install() { + cmake_src_install + + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] + fi + + if use emacs; then + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + insinto /usr/share/vim/vimfiles/syntax + doins Auxiliary/vim/syntax/cmake.vim + + insinto /usr/share/vim/vimfiles/indent + doins Auxiliary/vim/indent/cmake.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${PN}.vim" + + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} +} + +pkg_postinst() { + use emacs && elisp-site-regen + + if use qt5; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen + + if use qt5; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} From 3d80f8e63c4d8337ead47cd09c0344962754250f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:08 +0000 Subject: [PATCH 31/76] dev-util/gdbus-codegen: Sync with Gentoo It's from Gentoo commit f39e97dc5ed32762b271838ce1e73e860b5e435d. --- .../portage-stable/dev-util/gdbus-codegen/Manifest | 2 +- .../dev-util/gdbus-codegen/gdbus-codegen-2.74.3.ebuild | 4 ++-- .../dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild | 4 ++-- ...us-codegen-2.74.1.ebuild => gdbus-codegen-2.74.5.ebuild} | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/{gdbus-codegen-2.74.1.ebuild => gdbus-codegen-2.74.5.ebuild} (90%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest index ea96612ace..b832bd2a68 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest @@ -1,3 +1,3 @@ -DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6 +DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.3.ebuild index 99d18cefba..d4ca839d30 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 GNOME_ORG_MODULE="glib" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild index 141a8bdd0b..489fd545c8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 GNOME_ORG_MODULE="glib" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.5.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.5.ebuild index 99d18cefba..787dfc5d3d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 GNOME_ORG_MODULE="glib" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 @@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" From d44fbb8276155355e22c996e5861e0cd94ad8760 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:08 +0000 Subject: [PATCH 32/76] dev-util/glib-utils: Sync with Gentoo It's from Gentoo commit a0c3067e5ac8f9ae5ccf0882566a2921ea58d208. --- .../third_party/portage-stable/dev-util/glib-utils/Manifest | 2 +- .../dev-util/glib-utils/glib-utils-2.74.3.ebuild | 4 ++-- .../dev-util/glib-utils/glib-utils-2.74.4.ebuild | 4 ++-- .../{glib-utils-2.74.1.ebuild => glib-utils-2.74.5.ebuild} | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-util/glib-utils/{glib-utils-2.74.1.ebuild => glib-utils-2.74.5.ebuild} (87%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest index ea96612ace..b832bd2a68 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest @@ -1,3 +1,3 @@ -DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6 +DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.3.ebuild index fb40867171..d94a24e0b1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) GNOME_ORG_MODULE="glib" inherit gnome.org python-single-r1 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.4.ebuild index 2432be17c1..0ad7e86cf1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) GNOME_ORG_MODULE="glib" inherit gnome.org python-single-r1 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.5.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.5.ebuild index fb40867171..33bfee268b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) GNOME_ORG_MODULE="glib" inherit gnome.org python-single-r1 @@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+" SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature REQUIRED_USE="${PYTHON_REQUIRED_USE}" -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 ~x86-winnt" +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 ~x86-winnt" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" From 3cdf6270a8f745c290a9a24bd583715a8341b9a0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:10 +0000 Subject: [PATCH 33/76] dev-util/meson: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/dev-util/meson/meson-0.63.3.ebuild | 4 ++-- .../portage-stable/dev-util/meson/meson-0.64.1.ebuild | 6 +++--- .../portage-stable/dev-util/meson/meson-1.0.0.ebuild | 4 ++-- .../portage-stable/dev-util/meson/meson-9999.ebuild | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.3.ebuild index 8c8f381c95..2be01c9f37 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.63.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 2016-2022 Gentoo Authors +# Copyright 2016-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_PEP517=setuptools if [[ ${PV} = *9999* ]]; then diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.1.ebuild index 89a3cad363..041c8396d9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.64.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2016-2022 Gentoo Authors +# Copyright 2016-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_PEP517=setuptools if [[ ${PV} = *9999* ]]; then @@ -15,7 +15,7 @@ else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" if [[ ${PV} != *_rc* ]] ; 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 fi diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.0.0.ebuild index 7eaa764dfc..8140364c2c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.0.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 2016-2022 Gentoo Authors +# Copyright 2016-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_PEP517=setuptools if [[ ${PV} = *9999* ]]; then diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild index 7eaa764dfc..8140364c2c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 2016-2022 Gentoo Authors +# Copyright 2016-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_PEP517=setuptools if [[ ${PV} = *9999* ]]; then From 915f80b4c102017687ef64161ba2fb2a7d4d7088 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:10 +0000 Subject: [PATCH 34/76] dev-util/meson-format-array: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../dev-util/meson-format-array/meson-format-array-0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild index 208d82af4e..af41e19b2c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild @@ -1,8 +1,8 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-r1 From 80c4890225b3e10410118108557df6a862732585 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:10 +0000 Subject: [PATCH 35/76] dev-util/ninja: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild | 4 ++-- .../portage-stable/dev-util/ninja/ninja-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild index 477e2d2504..2c9e4f94ea 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 2012-2022 Gentoo Authors +# Copyright 2012-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild index 49a69753e9..acb2a409a8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 2012-2022 Gentoo Authors +# Copyright 2012-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs From c435cb1145758f590781be33854350c3a5d508cb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:10 +0000 Subject: [PATCH 36/76] dev-util/pahole: Sync with Gentoo It's from Gentoo commit 8447b2c20881b1d6b1fe417f16c82e39e24c1ac5. --- .../portage-stable/dev-util/pahole/Manifest | 1 + .../dev-util/pahole/pahole-1.23.ebuild | 4 +- .../dev-util/pahole/pahole-1.24.ebuild | 4 +- .../pahole/pahole-1.24_p20221024.ebuild | 65 +++++++++++++++++++ .../dev-util/pahole/pahole-9999.ebuild | 45 +++++++++---- 5 files changed, 103 insertions(+), 16 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24_p20221024.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest index b232c9e09f..28594cf7dc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/Manifest @@ -1,2 +1,3 @@ DIST dwarves-1.23.tar.xz 815076 BLAKE2B 2d89ac2d8cacb70a322b1c946356c0b18a2276f7a549efc2cf530c087dd718c7d01f5bcf8b9208965e066770064b6d8db7a9f6ab9a3f3a4612f6fcc8d146c1e8 SHA512 5255930d6898ce35a41e3e553363964663d2b686d12732ff6140fa1d06fcc3806adf28e24ec35ab0712eec0562c52c3943afe9ecce468b0053b852ffeb04c3dc DIST dwarves-1.24.tar.xz 875744 BLAKE2B 6766b5a5ecbf64013227e7cd459af662fc213f230b5b1279354fcaaccebfa3d74f9a2254542dc4f3f1bb4a5def1d4c77e2445fa8b531fa8b9e331cdfc23155fe SHA512 3cdca183cf68ec46fd9a0301ae4a8a30b23a8139c65ffba64ae11f85f9e942f7341dca6f88a4a3b49f32bfd880927193a80fa011726e4a33d3e5a1a146326c06 +DIST pahole-1.24_p20221024-patches.tar.xz 22088 BLAKE2B b39458400411dd7da0f568257f42164952e170b952e4893a92d769e17ce4cf0de88b727808a38195438fe10e5537f245bf101f647f383b6df7642c5446fa5d45 SHA512 93f160f01023c5402535a34d59005f0a3e056662a2764722480d71b6e522f3bfef0d642084467d1fbea96e23386b4cbb708243713d59eb84f4f767c1ac5ab3f5 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.23.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.23.ebuild index 0787ab642d..252a789e95 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.23.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.23.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit multilib cmake python-single-r1 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24.ebuild index 8a8a28a9f3..76122054b9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24_p20221024.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24_p20221024.ebuild new file mode 100644 index 0000000000..5d98a67216 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-1.24_p20221024.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit cmake python-single-r1 + +MY_PN=dwarves +MY_P=${MY_PN}-${PV} + +DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" +HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git" + inherit git-r3 +elif [[ ${PV} == *_p* ]] ; then + # Snapshots + #SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz" + + # Patch rollups from git format-patch. Sometimes there are important + # fixes in git which haven't been released (and no release in sight). + # Patch rollups are a bit better for understanding where changes have + # come from for users. + SRC_URI=" + http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz + " + S="${WORKDIR}"/${MY_P%%_p*} +else + SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz" + S="${WORKDIR}"/${MY_P} +fi + +LICENSE="GPL-2" # only +SLOT="0" +IUSE="debug" +if [[ ${PV} != 9999 ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +fi +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + >=dev-libs/elfutils-0.178 + sys-libs/zlib" +DEPEND="${RDEPEND}" + +DOCS=( README README.ctracer NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.10-python-import.patch +) + +src_prepare() { + [[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches ) + + cmake_src_prepare + python_fix_shebang ostra/ostra-cg ostra/python/ostra.py +} + +src_configure() { + local mycmakeargs=( "-D__LIB=$(get_libdir)" ) + cmake_src_configure +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild index d93d2d7a75..5d98a67216 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pahole/pahole-9999.ebuild @@ -1,19 +1,44 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake python-single-r1 git-r3 +PYTHON_COMPAT=( python3_{9..11} ) +inherit cmake python-single-r1 + +MY_PN=dwarves +MY_P=${MY_PN}-${PV} DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities" HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/pahole/pahole.git" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git" + inherit git-r3 +elif [[ ${PV} == *_p* ]] ; then + # Snapshots + #SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz" + + # Patch rollups from git format-patch. Sometimes there are important + # fixes in git which haven't been released (and no release in sight). + # Patch rollups are a bit better for understanding where changes have + # come from for users. + SRC_URI=" + http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz + " + S="${WORKDIR}"/${MY_P%%_p*} +else + SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz" + S="${WORKDIR}"/${MY_P} +fi LICENSE="GPL-2" # only SLOT="0" -KEYWORDS="" IUSE="debug" +if [[ ${PV} != 9999 ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +fi REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} @@ -28,6 +53,8 @@ PATCHES=( ) src_prepare() { + [[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches ) + cmake_src_prepare python_fix_shebang ostra/ostra-cg ostra/python/ostra.py } @@ -36,9 +63,3 @@ src_configure() { local mycmakeargs=( "-D__LIB=$(get_libdir)" ) cmake_src_configure } - -src_test() { :; } - -src_install() { - cmake_src_install -} From f93ad3c6a2fb174bbb3f30b8c7c843fc188e7545 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:10 +0000 Subject: [PATCH 37/76] dev-util/patchelf: Sync with Gentoo It's from Gentoo commit 6bf73fc7d68e46a845c5846f5a1a5b83f4380562. --- .../portage-stable/dev-util/patchelf/Manifest | 1 + .../dev-util/patchelf/patchelf-0.17.2.ebuild | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.17.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/Manifest index 8fc506850e..f131c7b765 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/Manifest @@ -1 +1,2 @@ DIST patchelf-0.17.0.tar.gz 143684 BLAKE2B ef32baae1d1e07c77442878977693849e2dd3d5c1c1b8d53eb54ee7b1b78eb77ebcf87cbd7caa683f0043e6d7b90ca2593968e9c95b0902e45c4634823be196b SHA512 0db2294cc16a919a84a1bb71194b3ed7a87bb669f684e4cc0943b33899d69690097c59d5c9f8e631bc1b4136db7f10f7cb0fbb1c96912aee567a0fd7dc9c9588 +DIST patchelf-0.17.2.tar.gz 143954 BLAKE2B 7ed684c63955a0b9cfe293fb966f7f08a90c76e8efb2b493eaf3705c57767b31b31e48ab59f39ff1d91b7a4501e6d203e32a40040625a44a7d44113b1320530c SHA512 e5545416d32248d023759457d0a5cd4841d69f39366eb0aa9cfd8a43d2ce372c6e05995bf60ba62bd85c6d98fdece2dbd1e20872e338ef5ac75f11b82ae091b3 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.17.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.17.2.ebuild new file mode 100644 index 0000000000..ef24854c86 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.17.2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables" +HOMEPAGE="https://github.com/NixOS/patchelf" +SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux" +LICENSE="GPL-3" + +src_prepare() { + default + rm src/elf.h || die + + sed -i \ + -e 's:-Werror::g' \ + configure.ac || die + + eautoreconf +} From 9ad6f301929d637e0c1c885b6d77e08d5138980a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:13 +0000 Subject: [PATCH 38/76] dev-util/perf: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../third_party/portage-stable/dev-util/perf/metadata.xml | 4 ---- .../portage-stable/dev-util/perf/perf-5.19.ebuild | 4 ++-- .../portage-stable/dev-util/perf/perf-6.0.ebuild | 7 ++++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml index 5ebbfb8b49..a363827ff1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/metadata.xml @@ -13,10 +13,6 @@ amadio@gentoo.org Guilherme Amadio - - zlogene@gentoo.org - Mikle Kolyada - Enable dev-util/babeltrace support Enable builtin clang and LLVM support diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild index a1b75fd9e5..69d09a7dfb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info DESCRIPTION="Userland tools for Linux Performance Counters" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0.ebuild index 7436087635..8835f1febd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info DESCRIPTION="Userland tools for Linux Performance Counters" @@ -152,7 +152,8 @@ src_prepare() { "${S}"/Makefile.perf || die # A few places still use -Werror w/out $(WERROR) protection. sed -i -e 's@-Werror@@' \ - "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die + "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile \ + "${S_K}"/tools/lib/perf/Makefile || die # Avoid the call to make kernelversion sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die From 77dd6ab95a0023661e048212476c86148174b661 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:13 +0000 Subject: [PATCH 39/76] dev-util/pkgconf: Sync with Gentoo It's from Gentoo commit d30761d3c18593bbee87fd2f56fad7e5893042d0. --- .../portage-stable/dev-util/pkgconf/Manifest | 3 +- .../dev-util/pkgconf/pkgconf-1.8.1.ebuild | 73 +++++++++++++++++++ ...conf-1.9.3.ebuild => pkgconf-1.9.4.ebuild} | 2 +- 3 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild rename sdk_container/src/third_party/portage-stable/dev-util/pkgconf/{pkgconf-1.9.3.ebuild => pkgconf-1.9.4.ebuild} (97%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest index 866cfc71e4..2c24c060f0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest @@ -1,2 +1,3 @@ DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28 -DIST pkgconf-1.9.3.tar.xz 308612 BLAKE2B 90d48171e24235906c41e97f7a2fa53825724c7500e90e502e5e2e4d668d3be863119e39b83a8e02adcef83a7def42e1c5e3641e77f6194bd81f653776bc95b4 SHA512 f65583f78571e4da161201d6387091562b38893adc31df421b0e6d560a060deb306a0b7ad8b28266253244c935d0a8169f35e04825a7857f21a09527d36f921e +DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc035139599817b1d56d571300d2aa800a719c9477aac4023dfade597ad3cc3b45360babe57498977568ee57077c7bbe SHA512 7a7d5204c1c9bfb6578bda56f299d1fa0300e69a133a65730b10ad77aefbf26fceb74ae77cecda326b3ed5db5736f27fcce94764b3a56d40f4bb99fecdc80bba +DIST pkgconf-1.9.4.tar.xz 309164 BLAKE2B f0a99f9c7aaf571b14aa24b6dae441fb041d794294e560601232c03254e521a49a5724e41c5ada537f7933bb4831b63482896c8569a9502c8c5d841190e1d091 SHA512 079436244f3942161f91c961c96d382a85082079c9843fec5ddd7fb245ba7500a9f7a201b5ef2c70a7a079fe1aacf3a52b73de5402a6f061df87bcdcf0a90755 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild new file mode 100644 index 0000000000..311850a40d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild @@ -0,0 +1,73 @@ +# Copyright 2012-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" +else + SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" +HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" + +LICENSE="ISC" +SLOT="0/3" +IUSE="test" + +# tests require 'kyua' +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/atf + dev-util/kyua + ) +" +RDEPEND=" + !dev-util/pkgconfig +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf$(get_exeext) +) + +src_prepare() { + default + + [[ ${PV} == "9999" ]] && eautoreconf + MULTILIB_CHOST_TOOLS+=( + /usr/bin/pkg-config$(get_exeext) + ) +} + +multilib_src_configure() { + local ECONF_SOURCE="${S}" + local args=( + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + econf "${args[@]}" +} + +multilib_src_test() { + unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH + default +} + +multilib_src_install() { + default + + dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) + dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild index e962927aff..9417bbe7cb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2022 Gentoo Authors +# Copyright 2012-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 From 5b95467ecc3c6d591cd20660bb2147d92fe0ead8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:13 +0000 Subject: [PATCH 40/76] dev-util/re2c: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild index 077c3ee997..9c0ba89970 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9,10} ) inherit python-any-r1 From 14fad78c0532c79e2b11be2852fce82902761286 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:14 +0000 Subject: [PATCH 41/76] dev-vcs/git: Sync with Gentoo It's from Gentoo commit 90c56f7adb0f35c8c5c911639e0fd8eac7c2bc8e. --- .../portage-stable/dev-vcs/git/Manifest | 3 + .../dev-vcs/git/git-2.37.5.ebuild | 2 +- .../dev-vcs/git/git-2.38.3.ebuild | 2 +- .../dev-vcs/git/git-2.39.1.ebuild | 657 ++++++++++++++++++ 4 files changed, 662 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest index 9aaed5b20d..82d1fc147e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest @@ -3,13 +3,16 @@ DIST git-2.37.5.tar.xz 6993136 BLAKE2B b64adf8ce306c5cda65ac7c4d50ab2e14e689a011 DIST git-2.38.2.tar.xz 7090572 BLAKE2B 80c72541c6cd7362ab5c8e92a2b81fbe80f5fcb3fac26680309ab30250a35f3bf3f1d613cc58bd570e52c81739a212969e28af4b7611ec8e08b8f15f5c9c4b8a SHA512 797c1cee61ff07b6f8502b1819d9797282aa82e33d023dffb4d395376b7a621d518017eaf38d05c6e5aba1372f2731985c53fcb46d43168b67b5bc8febedc6bc DIST git-2.38.3.tar.xz 7093908 BLAKE2B d84f4a517304956857c270e5005c677ff2ff92a67c568055a82dae7db66300835fbacbbfc36b7d6f66b709f1257f8e85084961451b4bb3984752f5e706ba87f1 SHA512 d8b94bd99319a1f137451fce83c966f82ee1f8bbcfa8a78dd72fd5d4c37dc83ea27705da553ed714694289542ae400ca942aa49a4507de01d40f9a9ec40fb4e0 DIST git-2.39.0.tar.xz 7157548 BLAKE2B e6715f03d7d867026d00544721a522312c03b65e181d55dda92099bc6bb53ca6546ad70212e3dddb527952b5f609ef49c4edee04a38adcb790914573d350385c SHA512 f072cae7738279b1c0f8202e83a243ff0164b03d3be22895aa875caa265150a5773e1f062724b3eb82bc64b163730b6f451b82fa0c904167a8fa53ced5d3b1df +DIST git-2.39.1.tar.xz 7160744 BLAKE2B 5ebf583232da9f6a937ebba17858b9fa8b550e3d0d981ff5603f77673cce69bf9a3c1c18c61d4c5e6b2f629a8173eaef8a09c913961d175571e4e6b00d2b194d SHA512 b1821a814947f01adf98206a7e9a01da9daa617b1192e8ef6968b05af8d874f028fb26b5f828a9c48f734ef2c276f4d23bdc898ba46fb7aaa96dbe68081037e9 DIST git-htmldocs-2.37.4.tar.xz 1448376 BLAKE2B 2414b2f18e3c75c377400623f9e804b6fd5623724834ce52d2680cc10839466d52a8407cac9ed0c8c5928d65058963fe62e9ae2e31f1b695ea3a6fc18ea1938a SHA512 638feee014498af63ea083540b065778d3e3b7fdec9bb7f6e915bbc524e1525e0c4056f8af7d859376b60fcc936cb0ac1e6f83ff940e09f822dfa11570465db4 DIST git-htmldocs-2.37.5.tar.xz 1449524 BLAKE2B 3e55e4cacd7ed99fd4c5f99746243d1c6e9509e9ba2d4ca125601ac6ab4be9ef0548faabcd812ba25fa27cc05bad0a2312aa7351861612706b79c959c4f386ba SHA512 c8c2701ec52839776ea419eb91cb2b433b3bae144dad46cf936a61cd2468921cc8ca48970684cb59145bf884e4d210b2bf23443d7c1f84a1d17669398a8284a3 DIST git-htmldocs-2.38.2.tar.xz 1479720 BLAKE2B 270454b0692e9ef678ec5ba5a8bbf5b119230981a29928dd256c5851beb5db0db1c12084f091e57bf7cfe011a7c166f5e341be03d98fade7d848cd069fcf6f0e SHA512 9e505f38658384381c22ff7b0502313b2ac842f89d2f8c27d3a03cb0a51fe23f06541fbdd0e5729a056baafc06689fa9faa40f74d8a456d00d5c5c7ef9b39dd0 DIST git-htmldocs-2.38.3.tar.xz 1481060 BLAKE2B 6cd54a13a792dcc9d3d86a7f17914056eb35ed455e2f6a5752982692d8eb899caec2f64d38fbff7721f4a0e816b04a9b0cc12754f4dc2d2b303bddcf17db1bdf SHA512 13b40b091269f45da11fe96fd30f6e5217cbb37e83192f78856b74fbaee09cf6ae157dc14dd01e920930fb57dce320247608dcd273ccbe873b7c8e677b361f49 DIST git-htmldocs-2.39.0.tar.xz 1502900 BLAKE2B efadd29e63176ab0c32c82855c132c5e442152a4e9f0e2ca1a0bd7c3f4b629a5fc0faf35b5ee0d59d05fbce6bab22f93e3bfcc17889a05e076b405ba52bdf03b SHA512 c950c3c932569becb0b0c6f4a7381628d8f9351d83f738af87826f2518af4bd2783019cb3cb9e8ccecf5acc0d2eac9d223e4195becedd2f800d3394aefe493a0 +DIST git-htmldocs-2.39.1.tar.xz 1504172 BLAKE2B 64a73a2b04e99b0bf18ab2153076bcbae9c114a31c9ab998c5e068f0ce6c0f5140e9db79008b1b01688db6a6d53e84fde8b2319eb45394aa6bc2df361be78520 SHA512 9b67b0464acd5651ef5871f724c59c910195cdd7020ecdcadced6e8e1275269ee1ca5808881e67e908114cb4ef27c959320f1e3d718b6699d3761281b6179600 DIST git-manpages-2.37.4.tar.xz 510016 BLAKE2B 03cba56a27039547429eca6a3dfda600d2b1332a6b0da321a1abc8bb311b03e46c389fdbbd7aafc8b5863730e9417ebbd3195ce04408e3f229e646d134a2ac13 SHA512 8cf5ae54ae3e86929f375ea2d229ecda7d8b5c8a7f7fbe790334fcd38069285b58636320b1886030402ac9d46ed324c1d26784fff14077f661c43ef98b5f5ec7 DIST git-manpages-2.37.5.tar.xz 510092 BLAKE2B 8679cf9ccf847eb1fe352492769d9d5e532659ab4ac46bbe5545190ac83274d48e00cd4978cdbc9fe106313ac3826b65b368b9ef1c0f390cf3f3d3d7beb575cd SHA512 5a96dd6e634106601d2c76afe8fef5221be43406d96397d0c9fc2aa422798a5fa2182884fe727fe76ed880355b5c385bfa2ea85c47a3bbf8ed707d9423fb6038 DIST git-manpages-2.38.2.tar.xz 553556 BLAKE2B 781b50a011d1c329fcdf3c01a94fecf5a388a03ca39e71aac07908e02982ed472d27a581184d894acbad441c945457c32dcb359ee0bcf70671af893e10c8bde4 SHA512 3214887045a6b3ff734794d67f17914324de401badae86ca40e16935f81cca183b3d762519922fa03a260dae218acc407896335ae96a17f433a3115e71512fbf DIST git-manpages-2.38.3.tar.xz 553784 BLAKE2B 218a6d2508ccb19510a962e9ae5d7a22541cd9683acb95c3fadc4669f4ff5ec9113a88282b2680f903331f374b84ea174cd9c5a7d7726c3d0c27344c6b19bef1 SHA512 7f3a53ff7c3e13e46d0f46035580058ec5ecc30477d688f065150fe60877664ee50bfa6b744b7d5a686fd7185d03f51276760c083d4d2fbe046d14a1f6be81e6 DIST git-manpages-2.39.0.tar.xz 556972 BLAKE2B abb752d24672b2911f0db95af7c283cccaf1be32275f8766dc4acbf5f33a7e798b7e3bf7b71122aef29deaaf890254e117efeba31dc7e000855fc8155eb8aa84 SHA512 5b50f4c2429db6e7d5bab1bd3863339b38f2b91bb96d3b87358a185b1b769c00ef0e75623f43e189e13c5107a1d5cf7b2a805fcdf1d8360c43d39b39e0d39ef0 +DIST git-manpages-2.39.1.tar.xz 557012 BLAKE2B 1a39a1192443eac0d12da059e0146d286272054192810d12f53f627bd341c3dc50bea2078cccac0d46c5e95502a1d669f072ab387e1662c890e5c38d46ad3f31 SHA512 4f1fdd7abf53dd60478ffc5f926777cd00446a3799ad9a2129814adfe7d3d63e13dd9bcdcea699fd139c9e134cf45857f0585ce2772e4fb93e4930c8f86a08bb diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.5.ebuild index c0e56ad73e..cab6d2be27 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.5.ebuild @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" == *_rc* ]] || \ - 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 LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.38.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.38.3.ebuild index 5996b47b02..6470b5f248 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.38.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.38.3.ebuild @@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" if [[ ${PV} != *_rc* ]] ; 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 fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.1.ebuild new file mode 100644 index 0000000000..64a55f3350 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.1.ebuild @@ -0,0 +1,657 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python3_{9..11} ) + +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd + +PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git" + + inherit git-r3 + # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. + # See https://git-scm.com/docs/gitworkflows#_graduation + # In order of stability: + # 9999-r0: maint + # 9999-r1: master + # 9999-r2: next + # 9999-r3: seen + case ${PVR} in + 9999) EGIT_BRANCH=maint ;; + 9999-r1) EGIT_BRANCH=master ;; + 9999-r2) EGIT_BRANCH=next;; + 9999-r3) EGIT_BRANCH=seen ;; + esac +fi + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER="${MY_PV}" + +DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency" +HOMEPAGE="https://www.git-scm.com/" + +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" + + [[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing' + + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" + SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}" + SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" + + if [[ ${PV} != *_rc* ]] ; 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" + fi +fi + +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test" + +# Common to both DEPEND and RDEPEND +DEPEND=" + dev-libs/openssl:= + sys-libs/zlib + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) + iconv? ( virtual/libiconv ) + pcre? ( dev-libs/libpcre2:= ) + perl? ( dev-lang/perl:=[-build(-)] ) + tk? ( dev-lang/tk:= ) +" +RDEPEND=" + ${DEPEND} + gpg? ( app-crypt/gnupg ) + perl? ( + dev-perl/Error + dev-perl/MailTools + dev-perl/Authen-SASL + >=virtual/perl-libnet-3.110.0-r4[ssl] + cgi? ( + dev-perl/CGI + highlight? ( app-text/highlight ) + ) + cvs? ( + >=dev-vcs/cvsps-2.1:0 + dev-perl/DBI + dev-perl/DBD-SQLite + ) + mediawiki? ( + dev-perl/DateTime-Format-ISO8601 + dev-perl/HTML-Tree + dev-perl/MediaWiki-API + ) + subversion? ( + dev-vcs/subversion[-dso(-),perl] + dev-perl/libwww-perl + dev-perl/TermReadKey + ) + ) + perforce? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-git ) +" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +BDEPEND=" + doc? ( + app-text/asciidoc + app-text/docbook2X + app-text/xmlto + sys-apps/texinfo + ) + gnome-keyring? ( virtual/pkgconfig ) + nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) +" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + BDEPEND+=" app-text/asciidoc" +fi + +SITEFILE="50${PN}-gentoo.el" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + mediawiki? ( perl ) + mediawiki-experimental? ( mediawiki ) + perforce? ( ${PYTHON_REQUIRED_USE} ) + subversion? ( perl ) + webdav? ( curl ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + # Avoid automagic CVS, bug #350330 + "${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch + + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch +) + +pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]" ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned!" + fi + + if use perforce ; then + python-single-r1_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local extlibs myopts + + myopts=( + ASCIIDOC_NO_ROFF=YesPlease + + $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) + + $(usev elibc_musl NO_REGEX=YesPlease) + $(usev !cvs NO_CVS=YesPlease) + $(usev !iconv NO_ICONV=YesPlease) + $(usev !nls NO_GETTEXT=YesPlease) + $(usev !perforce NO_PYTHON=YesPlease) + $(usev !subversion NO_SVN_TESTS=YesPlease) + $(usev !tk NO_TCLTK=YesPlease) + ) + + if use blksha1 ; then + myopts+=( BLK_SHA1=YesPlease ) + fi + + if use curl ; then + use webdav || myopts+=( NO_EXPAT=YesPlease ) + else + myopts+=( NO_CURL=YesPlease ) + fi + + # Broken assumptions because of static build system + myopts+=( + NO_FINK=YesPlease + NO_DARWIN_PORTS=YesPlease + INSTALL=install + TAR=tar + SHELL_PATH="${EPREFIX}/bin/sh" + SANE_TOOL_PATH= + OLD_ICONV= + NO_EXTERNAL_GREP= + ) + + # Can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die + + if use pcre; then + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) + fi + + if [[ ${CHOST} == *-solaris* ]]; then + myopts+=( + NEEDS_LIBICONV=YesPlease + HAVE_CLOCK_MONOTONIC=1 + ) + + if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then + myopts+=( HAVE_GETDELIM=1 ) + fi + fi + + myopts+=( ASCIIDOC8=YesPlease ) + + export MY_MAKEOPTS="${myopts[@]}" + export EXTLIBS="${extlibs[@]}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]] ; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + + cd "${S}" || die + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + + if use doc ; then + pushd "${S}"/Documentation &>/dev/null || die + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + popd &>/dev/null || die + fi + else + git-r3_src_unpack + #cp "${FILESDIR}"/GIT-VERSION-GEN . || die + fi + +} + +src_prepare() { + # Add experimental patches to improve mediawiki support, + # see patches for origin. + if use mediawiki-experimental ; then + PATCHES+=( + "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch + "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch + "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch + ) + fi + + if ! use safe-directory ; then + # This patch neuters the "safe directory" detection. + # bugs #838271, #838223 + PATCHES+=( + "${FILESDIR}"/git-2.37.2-unsafe-directory.patch + ) + fi + + default + + if use prefix ; then + # bug #757309 + eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch + fi + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile || die + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die +} + +git_emake() { + # bug #320647: PYTHON_PATH + local PYTHON_PATH="" + use perforce && PYTHON_PATH="${PYTHON}" + + local mymakeargs=( + ${MY_MAKEOPTS} + + prefix="${EPREFIX}"/usr + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html + perllibdir="$(use perl && perl_get_raw_vendorlib)" + sysconfdir="${EPREFIX}"/etc + + CC="$(tc-getCC)" + CFLAGS="${CFLAGS}" + PKG_CONFIG="$(tc-getPKG_CONFIG)" + + # TODO: --verbose? + GIT_TEST_OPTS="--no-color" + + OPTAR="$(tc-getAR)" + OPTCC="$(tc-getCC)" + OPTCFLAGS="${CFLAGS}" + OPTLDFLAGS="${LDFLAGS}" + + PERL_PATH="${EPREFIX}/usr/bin/perl" + PERL_MM_OPT="" + + PYTHON_PATH="${PYTHON_PATH}" + + V=1 + "$@" + ) + + emake "${mymakeargs[@]}" +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake + + if use perl && use cgi ; then + git_emake gitweb + fi + + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then + git_emake -C contrib/credential/osxkeychain + fi + + pushd Documentation &>/dev/null || die + if [[ ${PV} == *9999 ]] ; then + git_emake man + if use doc ; then + git_emake info html + fi + else + if use doc ; then + git_emake info + fi + fi + popd &>/dev/null || die + + if use gnome-keyring ; then + git_emake -C contrib/credential/libsecret + fi + + pushd contrib/subtree &>/dev/null || die + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 + popd &>/dev/null || die + + git_emake -C contrib/diff-highlight + + if use mediawiki ; then + git_emake -C contrib/mw-to-git + fi +} + +src_test() { + local disabled=( + # We make safe-directory optional + t0033-safe-directory.sh + ) + + local tests_cvs=( + t9200-git-cvsexportcommit.sh + t9400-git-cvsserver-server.sh + t9401-git-cvsserver-crlf.sh + t9402-git-cvsserver-refs.sh + t9600-cvsimport.sh + t9601-cvsimport-vendor-branch.sh + t9602-cvsimport-branches-tags.sh + t9603-cvsimport-patchsets.sh + t9604-cvsimport-timestamps.sh + ) + + local tests_perl=( + t3701-add-interactive.sh + t5502-quickfetch.sh + t5512-ls-remote.sh + t5520-pull.sh + t7106-reset-unborn-branch.sh + t7501-commit.sh + ) + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot=( + t0001-init.sh + t0004-unwritable.sh + t0070-fundamental.sh + t1004-read-tree-m-u-wf.sh + t3700-add.sh + t7300-clean.sh + ) + # t9100 still fails with symlinks in SVN 1.7 + local test_svn=( t9100-git-svn-basic.sh ) + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled+=( t5000-tar-tree.sh ) + fi + + local cvs=0 + use cvs && let cvs=${cvs}+1 + if [[ ${EUID} -eq 0 ]] ; then + if [[ ${cvs} -eq 1 ]] ; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled+=( ${tests_cvs[@]} ) + fi + einfo "Skipping other tests that require being non-root" + disabled+=( ${tests_nonroot[@]} ) + else + if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then + let cvs=${cvs}+1 + fi + + if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then + let cvs=${cvs}+1 + fi + + if [[ ${cvs} -lt 3 ]] ; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled+=( ${tests_cvs[@]} ) + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled+=( ${tests_perl[@]} ) + fi + + einfo "Disabling tests that fail with SVN 1.7" + disabled+=( ${test_svn[@]} ) + + # Reset all previously disabled tests + pushd t &>/dev/null || die + local i + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled[@]} ; do + if [[ -f "${i}" ]] ; then + mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + fi + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die + + # Clean old results first, must always run + nonfatal git_emake clean + popd &>/dev/null || die + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + local rc + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + pushd t &>/dev/null || die + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!" +} + +src_install() { + git_emake DESTDIR="${D}" install + + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then + dobin contrib/credential/osxkeychain/git-credential-osxkeychain + fi + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + local d + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + if use doc ; then + docinto ${d}/html + dodoc Documentation${d}*.html + fi + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + bashcomp_alias git gitk + # Not really a bash-completion file (bug #477920) + # but still needed uncompressed (bug #507480) + insinto /usr/share/${PN} + doins contrib/completion/git-prompt.sh + + #dobin contrib/fast-import/git-p4 # Moved upstream + #dodoc contrib/fast-import/git-p4.txt # Moved upstream + newbin contrib/fast-import/import-tars.perl import-tars + exeinto /usr/libexec/git-core/ + newexe contrib/git-resurrect.sh git-resurrect + + # git-subtree + pushd contrib/subtree &>/dev/null || die + git_emake DESTDIR="${D}" install + if use doc ; then + # Do not move git subtree install-man outside USE=doc! + git_emake DESTDIR="${D}" install-man install-html + fi + newdoc README README.git-subtree + dodoc git-subtree.txt + popd &>/dev/null || die + + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install + fi + + # diff-highlight + dobin contrib/diff-highlight/diff-highlight + newdoc contrib/diff-highlight/README README.diff-highlight + + # git-jump + exeinto /usr/libexec/git-core/ + doexe contrib/git-jump/git-jump + newdoc contrib/git-jump/README git-jump.txt + + # git-contacts + exeinto /usr/libexec/git-core/ + doexe contrib/contacts/git-contacts + dodoc contrib/contacts/git-contacts.txt + + if use gnome-keyring ; then + pushd contrib/credential/libsecret &>/dev/null || die + dobin git-credential-libsecret + popd &>/dev/null || die + fi + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # diff-highlight - done above + # emacs - removed upstream + # examples - these are stuff that is not used in Git anymore actually + # git-jump - done above + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # persistent-https - TODO + # mw-to-git - TODO + # subtree - build seperately + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + local contrib_objects=( + buildsystems + fast-import + hg-to-git + hooks + remotes2config.sh + rerere-train.sh + stats + workdir + ) + local i + for i in "${contrib_objects[@]}" ; do + cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym ../gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + for d in "${ED}"/usr/lib{,64}/perl5/ ; do + if [[ -d "${d}" ]] ; then + find "${d}" -name .packlist -delete || die + fi + done + else + rm -rf "${ED}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + if ! use prefix ; then + newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" + systemd_dounit "${FILESDIR}/git-daemon.socket" + fi + + perl_delete_localpod + + # Remove disabled linguas + # we could remove sources in src_prepare, but install does not + # handle missing locale dir well + rm_loc() { + if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then + rm -r "${ED}/usr/share/locale/${1}" || die + fi + } + plocale_for_each_disabled_locale rm_loc +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." + elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" + elog "Note that the prompt bash code is now in that separate script" + fi + + optfeature_header "Some scripts require additional dependencies:" + optfeature git-quiltimport dev-util/quilt + optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx + + use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." +} From 166d2e4ca78c5b91f2bf31fae90744a61a907870 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:17 +0000 Subject: [PATCH 42/76] eclass/cmake: Sync with Gentoo It's from Gentoo commit b15b4729c68c19f88ee1306e9eeb66d1313223a9. --- .../src/third_party/portage-stable/eclass/cmake.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass b/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass index 094b6d706b..2c5620aded 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass @@ -1,9 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cmake.eclass # @MAINTAINER: # kde@gentoo.org +# base-system@gentoo.org # @AUTHOR: # Tomáš Chvátal # Maciej Mrozowski @@ -96,6 +97,7 @@ fi # By default it uses current working directory (in EAPI-7: ${S}). # @ECLASS_VARIABLE: CMAKE_VERBOSE +# @USER_VARIABLE # @DESCRIPTION: # Set to OFF to disable verbose messages during compilation : ${CMAKE_VERBOSE:=ON} From 8ee30f0e642620d71e71b8c0d8f453c2edfe83ba Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:52 +0000 Subject: [PATCH 43/76] eclass/linux-info: Sync with Gentoo It's from Gentoo commit c5d4de5ed682ac0c70fa87c8cab6b35bed51c979. --- .../portage-stable/eclass/linux-info.eclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/linux-info.eclass b/sdk_container/src/third_party/portage-stable/eclass/linux-info.eclass index 16ef69ebcc..a65d0c441b 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/linux-info.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/linux-info.eclass @@ -805,8 +805,14 @@ check_extra_config() { export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}" return 0 fi - else - require_configured_kernel + elif ! linux_config_exists; then + qeerror "Could not find a neither a usable .config in the kernel source directory" + qeerror "nor a /proc/config.gz file," + qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources." + qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that" + qeerror "it points to the necessary object directory so that it might find .config" + qeerror "or have a properly configured kernel to produce a config.gz file. (CONFIG_IKCONFIG)." + die "Kernel not configured; no .config found in ${KV_OUT_DIR} or /proc/config.gz found" fi ebegin "Checking for suitable kernel configuration options" From 4f93a5b46846f0552c6440feb5ae3dfd3f85b35f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:52 +0000 Subject: [PATCH 44/76] eclass/linux-mod: Sync with Gentoo It's from Gentoo commit 2bd0e2bb9236fe31224a6d8984ce85a38add6849. --- .../third_party/portage-stable/eclass/linux-mod.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass b/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass index d14bbf7d9e..6cf9969b19 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass @@ -408,7 +408,7 @@ generate_modulesd() { for((t=0; t<${module_aliases}; t++)) do - echo "alias $(eval echo \${MODULESD_${currm}_ALIASES[$t]})" \ + echo "alias $(eval echo \${MODULESD_${currm_t}_ALIASES[$t]})" \ >> "${module_config}" done echo '' >> "${module_config}" @@ -434,7 +434,7 @@ generate_modulesd() { fi #----------------------------------------------------------------------- - if [[ $(eval echo \${MODULESD_${currm}_ALIASES[0]}) == guess ]]; then + if [[ $(eval echo \${MODULESD_${currm_t}_ALIASES[0]}) == guess ]]; then # So, let's do some guesswork, eh? if [[ -n ${module_opts} ]]; then echo "# For Example..." >> "${module_config}" @@ -449,7 +449,7 @@ generate_modulesd() { echo "# For Example..." >> "${module_config}" echo "# --------------" >> "${module_config}" for ((t=0; t<${module_examples}; t++)); do - echo "options $(eval echo \${MODULESD_${currm}_EXAMPLES[$t]})" \ + echo "options $(eval echo \${MODULESD_${currm_t}_EXAMPLES[$t]})" \ >> "${module_config}" done echo '' >> "${module_config}" @@ -458,7 +458,7 @@ generate_modulesd() { #----------------------------------------------------------------------- if [[ ${module_additions} -gt 0 ]]; then for ((t=0; t<${module_additions}; t++)); do - echo "$(eval echo \${MODULESD_${currm}_ADDITIONS[$t]})" \ + echo "$(eval echo \${MODULESD_${currm_t}_ADDITIONS[$t]})" \ >> "${module_config}" done echo '' >> "${module_config}" From 05abaac0037e1a55d3c47feca9236ddae7f7b130 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:21:59 +0000 Subject: [PATCH 45/76] eclass/multilib-build: Sync with Gentoo It's from Gentoo commit 9629b99e826606c8068a2cd4ef16455deb1d8c76. --- .../third_party/portage-stable/eclass/multilib-build.eclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/multilib-build.eclass b/sdk_container/src/third_party/portage-stable/eclass/multilib-build.eclass index 40cc426a13..1774ad0574 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/multilib-build.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/multilib-build.eclass @@ -1,4 +1,4 @@ -# Copyright 2013-2022 Gentoo Authors +# Copyright 2013-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib-build.eclass @@ -7,7 +7,6 @@ # @AUTHOR: # Author: Michał Górny # @SUPPORTED_EAPIS: 6 7 8 -# @PROVIDES: multibuild # @BLURB: flags and utility functions for building multilib packages # @DESCRIPTION: # The multilib-build.eclass exports USE flags and utility functions From 751bcee63d7dd6f443a71fea1af87850cdcca194 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:07 +0000 Subject: [PATCH 46/76] eclass/pam: Sync with Gentoo It's from Gentoo commit b3f73e307436c6849c3cee9e4a51bad8262cfc68. --- .../src/third_party/portage-stable/eclass/pam.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/pam.eclass b/sdk_container/src/third_party/portage-stable/eclass/pam.eclass index 9928e746e4..bfd165f9c1 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/pam.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/pam.eclass @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: pam.eclass # @MAINTAINER: -# Mikle Kolyada +# base-system@gentoo.org # @AUTHOR: # Diego Pettenò # @SUPPORTED_EAPIS: 6 7 8 From bc417ef6ac73b0af1ee6f970e4f4309cad19e722 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:24 +0000 Subject: [PATCH 47/76] eclass/toolchain-funcs: Sync with Gentoo It's from Gentoo commit e2f62c4651faf6f7ebd9ffeeb0c891945f87ab3c. --- .../src/third_party/portage-stable/eclass/toolchain-funcs.eclass | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass index 61a29d1b6e..bfcd6819ed 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass @@ -377,7 +377,6 @@ tc-export_build_env() { # @FUNCTION: tc-env_build # @USAGE: [command args] -# @INTERNAL # @DESCRIPTION: # Setup the compile environment to the build tools and then execute the # specified command. We use tc-getBUILD_XX here so that we work with From 58d509c138f89bd6e260a6b679cb3d4730d2c4bb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:36 +0000 Subject: [PATCH 48/76] licenses: Sync with Gentoo It's from Gentoo commit da0574c5b5db9bd2077203048727da6e6b029bec. --- .../third_party/portage-stable/licenses/AGREP | 22 - .../third_party/portage-stable/licenses/BCS | 34 - .../third_party/portage-stable/licenses/CUDPP | 66 -- .../third_party/portage-stable/licenses/MIT | 6 + .../third_party/portage-stable/licenses/MIT-0 | 16 + .../licenses/{NPSL => NPSL-0.92} | 0 .../portage-stable/licenses/NPSL-0.94 | 567 +++++++++++++++++ .../portage-stable/licenses/NPSL-0.95 | 581 ++++++++++++++++++ .../portage-stable/licenses/PSF-2.3 | 259 -------- .../third_party/portage-stable/licenses/PUEL | 153 ----- .../portage-stable/licenses/SmartLabs | 42 -- .../portage-stable/licenses/Spread-1.0 | 68 -- .../portage-stable/licenses/egressor | 75 --- .../licenses/linux-fw-redistributable | 4 + .../portage-stable/licenses/mpeg2enc | 24 - .../portage-stable/licenses/sgb2ns | 23 - .../third_party/portage-stable/licenses/x2x | 33 - 17 files changed, 1174 insertions(+), 799 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/AGREP delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/BCS delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/CUDPP create mode 100644 sdk_container/src/third_party/portage-stable/licenses/MIT-0 rename sdk_container/src/third_party/portage-stable/licenses/{NPSL => NPSL-0.92} (100%) create mode 100644 sdk_container/src/third_party/portage-stable/licenses/NPSL-0.94 create mode 100644 sdk_container/src/third_party/portage-stable/licenses/NPSL-0.95 delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/PSF-2.3 delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/PUEL delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/SmartLabs delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/Spread-1.0 delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/egressor delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/mpeg2enc delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/sgb2ns delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/x2x diff --git a/sdk_container/src/third_party/portage-stable/licenses/AGREP b/sdk_container/src/third_party/portage-stable/licenses/AGREP deleted file mode 100644 index 08d52e227b..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/AGREP +++ /dev/null @@ -1,22 +0,0 @@ -This material was developed by Sun Wu and Udi Manber -at the University of Arizona, Department of Computer Science. -Permission is granted to copy this software, to redistribute it -on a nonprofit basis, and to use it for any purpose, subject to -the following restrictions and understandings. - -1. Any copy made of this software must include this copyright notice -in full. - -2. All materials developed as a consequence of the use of this -software shall duly acknowledge such use, in accordance with the usual -standards of acknowledging credit in academic research. - -3. The authors have made no warranty or representation that the -operation of this software will be error-free or suitable for any -application, and they are under under no obligation to provide any -services, by way of maintenance, update, or otherwise. The software -is an experimental prototype offered on an as-is basis. - -4. Redistribution for profit requires the express, written permission -of the authors. - diff --git a/sdk_container/src/third_party/portage-stable/licenses/BCS b/sdk_container/src/third_party/portage-stable/licenses/BCS deleted file mode 100644 index 5d70e6448c..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/BCS +++ /dev/null @@ -1,34 +0,0 @@ - -This Software Licensing Agreement ("Agreement") is a legal agreement between you and GarageGames.com, Inc. ('GarageGames'). These are the only terms by which GarageGames permits any use of the Software. - -GarageGames Licensing Agreement for Bridge Construction Set Demo. - -1. The Software. -The Software licensed under this Agreement is the computer program entitled -'Bridge Construction Set Demo', which consists of executable files, data files, and documentation. - -2. Grant of License. -GarageGames grants you the nontransferable, nonexclusive right to use the Software in accordance with the terms of this Agreement. - -YOU MAY: (i) load the software into RAM as well as install it on a hard disk or other storage device, and (ii) make one copy for backup purposes. - -YOU MAY NOT: modify, translate, disassemble, reverse engineer, decompile, or create derivative works based upon the Software. - -When you purchase the Software, you will receive the full registered version. You agree not to distribute the registered version to others and to use it only for your own personal use. You acknowledge that distribution of the registered version to others, whether intentional or unintentional, could damage GarageGames both financially and professionally. Any unauthorized distribution of your registered version will result in immediate and automatic termination of your license, and may result in civil and criminal penalties. - -3. Copyright. -The Software is owned by GarageGames and is protected by United States copyright laws and international treaties. GarageGames reserves the exclusive copyright and all other rights, title and interest to distribute the Software, and to use Trademarks in connection with them. “Trademarks” refers to the name of the Software, the Software logo, the name GarageGames, and the GarageGames logo. - - -4. NO WARRANTY. -THE SOFTWARE IS PROVIDED "AS-IS". NO WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, ARE MADE AS TO IT OR ANY MEDIUM IT MAY BE ON. GARAGEGAMES WILL PROVIDE NO REMEDY FOR INDIRECT, CONSEQUENTIAL, PUNITIVE OR INCIDENTAL DAMAGES ARISING FROM IT, INCLUDING SUCH FROM NEGLIGENCE, STRICT LIABILITY, OR BREACH OF WARRANTY OR CONTRACT, EVEN AFTER NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. - -5. Term. -The term of this license grant is perpetual. You may terminate this Agreement at any time by destroying all copies of the Software in your possession. Your license to use the Software will automatically terminate if you breach the terms of this Agreement. - -6. General Provisions. -This Agreement is the sole and entire Agreement relating to the Software, and supercedes all prior understandings, agreements, and documentation relating to the Software. If any provision in this Agreement is held by a court of competent jurisdiction to be invalid, void, or unenforceable, the remaining provisions will continue in full force without being impaired or invalidated in any way. This Agreement will be governed by the laws of the State of Oregon, without regard for its conflict of laws principles. With respect to every matter arising under this Agreement, you consent to the exclusive jurisdiction and venue of the state and federal courts sitting in Lane County, Oregon. This Agreement does not create any agency or partner relationship. Your rights under this Agreement are personal and do not include any right to sublicense the Software. - -BY CLICKING ON 'I AGREE' BELOW, YOU ACKNOWLEDGE THAT YOU HAVE READ THIS -AGREEMENT, UNDERSTAND IT, AND AGREE TO BE BOUND BY ITS TERMS AND CONDITIONS. -IF YOU DO NOT AGREE WITH THIS AGREEMENT, PLEASE CLICK 'CANCEL'. diff --git a/sdk_container/src/third_party/portage-stable/licenses/CUDPP b/sdk_container/src/third_party/portage-stable/licenses/CUDPP deleted file mode 100644 index 75060e003c..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/CUDPP +++ /dev/null @@ -1,66 +0,0 @@ -CUDA Data-Parallel Primitives Library (CUDPP) is the proprietary -property of The Regents of the University of California ("The -Regents") and NVIDIA Corporation ("NVIDIA"). - -Copyright (c) 2007 The Regents of the University of California, Davis -campus and NVIDIA Corporation. All Rights Reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -- Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -- Neither the name of The Regents, NVIDIA, nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -The end-user understands that the program was developed for research -purposes and is advised not to rely exclusively on the program for any -reason. - -THE SOFTWARE PROVIDED IS ON AN "AS IS" BASIS, AND THE REGENTS, NVIDIA -AND CONTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, -UPDATES, ENHANCEMENTS, OR MODIFICATIONS. THE REGENTS, NVIDIA AND -CONTRIBUTORS SPECIFICALLY DISCLAIM ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE REGENTS, NVIDIA OR CONTRIBUTORS BE LIABLE TO ANY -PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, EXEMPLARY OR -CONSEQUENTIAL DAMAGES, INCLUDING BUT NOT LIMITED TO PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES, LOSS OF USE, DATA OR PROFITS, OR -BUSINESS INTERRUPTION, HOWEVER CAUSED AND UNDER ANY THEORY OF -LIABILITY WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE AND ITS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -If you do not agree to these terms, do not download or use the -software. This license may be modified only in a writing signed by -authorized signatory of all parties. For The Regents contact -copyright@ucdavis.edu. - -Relating to funding received by the Regents- - -Acknowledgment: This material is based upon work supported by -the Department of Energy under Award Numbers DE-FG02-04ER25609 and -DE-FC02-06ER25777. - -Disclaimer: This report was prepared as an account of work sponsored -by an agency of the United States Government. Neither the United -States Government nor any agency thereof, nor any of their employees, -makes any warranty, express or implied, or assumes any legal liability -or responsibility for the accuracy, completeness, or usefulness of any -information, apparatus, product, or process disclosed, or represents -that its use would not infringe privately owned rights. Reference -herein to any specific commercial product, process, or service by -trade name, trademark, manufacturer, or otherwise does not necessarily -constitute or imply its endorsement, recommendation, or favoring by -the United States Government or any agency thereof. The views and -opinions of authors expressed herein do not necessarily state or -reflect those of the United States Government or any agency hereof. diff --git a/sdk_container/src/third_party/portage-stable/licenses/MIT b/sdk_container/src/third_party/portage-stable/licenses/MIT index 9c71e2aa7b..18b29e85a1 100644 --- a/sdk_container/src/third_party/portage-stable/licenses/MIT +++ b/sdk_container/src/third_party/portage-stable/licenses/MIT @@ -23,3 +23,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from .] + +--- + +Gentoo license note: We don't distinguish between the "Expat" license +(without the non-advertising clause, i.e. the bracketed paragraph) and +the "X11" license (with the clause), and call both of them "MIT". diff --git a/sdk_container/src/third_party/portage-stable/licenses/MIT-0 b/sdk_container/src/third_party/portage-stable/licenses/MIT-0 new file mode 100644 index 0000000000..0b9a51dfea --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/licenses/MIT-0 @@ -0,0 +1,16 @@ +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/sdk_container/src/third_party/portage-stable/licenses/NPSL b/sdk_container/src/third_party/portage-stable/licenses/NPSL-0.92 similarity index 100% rename from sdk_container/src/third_party/portage-stable/licenses/NPSL rename to sdk_container/src/third_party/portage-stable/licenses/NPSL-0.92 diff --git a/sdk_container/src/third_party/portage-stable/licenses/NPSL-0.94 b/sdk_container/src/third_party/portage-stable/licenses/NPSL-0.94 new file mode 100644 index 0000000000..56140fa8a2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/licenses/NPSL-0.94 @@ -0,0 +1,567 @@ +Nmap Public Source License Version 0.94 +For more information on this license, see https://nmap.org/npsl/ + +0. Preamble + +The intent of this license is to establish freedom to share and change +the software regulated by this license under the open source model. It +also includes a Contributor Agreement and disclaims any warranty on +Covered Software. Companies wishing to use or incorporate Covered +Software within their own products may find that our Nmap OEM product +(https://nmap.org/oem/) better suits their needs. Open source +developers who wish to incorporate parts of Covered Software into free +software with conflicting licenses may write Licensor to request a +waiver of terms. + +If the Nmap Project (directly or through one of its commercial +licensing customers) has granted you additional rights to Nmap or Nmap +OEM, those additional rights take precedence where they conflict with +the terms of this license agreement. + +This License represents the complete agreement concerning subject +matter hereof. It contains the license terms themselves, but not the +reasoning behind them or detailed explanations. For further +information about this License, see https://nmap.org/npsl/ . That page +makes a good faith attempt to explain this License, but it does not +and can not modify its governing terms in any way. + +1. Definitions + +* "Contribution" means any work of authorship, including the original + version of the Work and any modifications or additions to that Work + or Derivative Works thereof, that is intentionally submitted to + Licensor by the copyright owner or by an individual or Legal Entity + authorized to submit on behalf of the copyright owner. For the + purposes of this definition, "submitted" means any form of + electronic, verbal, or written communication sent to the Licensor or + its representatives, including but not limited to communication on + electronic mailing lists, source code control systems, web sites, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a + Contribution." + +* "Contributor" means Licensor and any individual or Legal Entity on + behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +* "Covered Software" means the work of authorship, whether in Source + or Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + +* "Derivative Work" or "Collective Work" means any work, whether in + Source or Object form, that is based on (or derived from) the Work + and for which the editorial revisions, annotations, elaborations, or + other modifications represent, as a whole, an original work of + authorship. It includes software as described in Section 3 of this + License. + +* "Executable" means Covered Software in any form other than Source Code. + +* "Externally Deploy" means to Deploy the Covered Software in any way + that may be accessed or used by anyone other than You, used to + provide any services to anyone other than You, or used in any way to + deliver any content to anyone other than You, whether the Covered + Software is distributed to those parties, made available as an + application intended for use over a computer network, or used to + provide services or otherwise deliver content to anyone other than + You. + +* "GPL" means the GNU General Public License Version 2, as published + by the Free Software Foundation and provided in Exhibit A. + +* "Legal Entity" means the union of the acting entity and all other + entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + +* "License" means this document, including Exhibits. + +* "Licensor" means Nmap Software LLC and its successors and assigns. + +* "Main License Body" means all of the terms of this document, + excluding Exhibits. + +* "You" (or "Your") means an individual or Legal Entity exercising + permissions granted by this License. + +2. General Terms + +Covered Software is licensed to you under the terms of the GPL +(Exhibit A), with all the exceptions, clarifications, and additions +noted in this Main License Body. Where the terms in this Main License +Body conflict in any way with the GPL, the Main License Body terms +shall take precedence. These additional terms mean that You may not +distribute Covered Software or Derivative Works under plain GPL terms +without special permission from Licensor. + +You are not required to accept this License. However, nothing else +grants You permission to use, copy, modify or distribute the software +or its derivative works. These actions are prohibited by law if You do +not accept this License. Therefore, by modifying, copying or +distributing the software (or any work based on the software), You +indicate your acceptance of this License to do so, and all its terms +and conditions. In addition, you agree to the terms of this License by +clicking the Accept button or downloading the software. + +3. Derivative Works + +This License (including the GPL portion) places important restrictions +on derived works. Licensor interprets that term quite broadly. To +avoid any misunderstandings, we consider software to constitute a +"derivative work" of Covered Software for the purposes of this license +if it does any of the following: + +* Integrates source code from Covered Software + +* Reads or includes Covered Software data files, such as nmap-os-db or + nmap-service-probes. + +* Is designed specifically to execute Covered Software and parse the + results (as opposed to typical shell or execution-menu apps, which + will execute anything you tell them to). + +* Includes Covered Software in a proprietary executable installer. The + installers produced by InstallShield are an example of + this. Including Nmap with other software in compressed or archival + form does not trigger this provision, provided appropriate open + source decompression or de-archiving software is widely available + for no charge. For the purposes of this license, an installer is + considered to include Covered Software even if it actually retrieves + a copy of Covered Software from another source during runtime (such + as by downloading it from the Internet). + +* Links (statically or dynamically) to a library which does any of the + above + +* Executes a helper program, module, or script to do any of the above. + This list is not exclusive, but is meant to clarify Licensor's + intentions with some common examples. Distribution of any works + which meet these criteria must be under the terms of this license + (including this Main License Body and GPL), with no additional + conditions or restrictions. They must abide by all restrictions that + the GPL places on derivative or collective works, including the + requirements for distributing their source code and allowing + royalty-free redistribution. + +4. Contributor Agreement (Grant of Copyright and Patent Licenses) + +Each Contributor hereby grants to Licensor a perpetual, worldwide, +non-exclusive, no-charge, royalty-free, irrevocable copyright license +to reproduce, prepare Derivative Works of, publicly display, publicly +perform, sublicense, and distribute the Contribution and such +Derivative Works in Source or Object form. + +Each Contributor hereby grants to You and Licensor a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except +as stated in this section) patent license to make, have made, use, +offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such +Contributor that are necessarily infringed by their Contribution(s) +alone or by combination of their Contribution(s) with the Work to +which such Contribution(s) was submitted. If You institute patent +litigation against any entity (including a cross-claim or counterclaim +in a lawsuit) alleging that the Work or a Contribution incorporated +within the Work constitutes direct or contributory patent +infringement, then any patent licenses granted to You under this +License for that Work shall terminate as of the date such litigation +is filed. + +Contributors may impose different terms on their Contributions by +stating those terms in writing at the time the Contribution is +made. Contributors may withhold all authority from Licensor to +incorporate submissions by conspicuously marking or otherwise +designating them in writing as "Not a Contribution" at the time they +make the work available. + +5. Disclaimer of Warranty and Limitation of Liability + +Unless required by applicable law or agreed to in writing, Licensor +provides the Covered Software (and each Contributor provides its +Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS +OF ANY KIND, either express or implied, including, without limitation, +any warranties or conditions of TITLE, NON-INFRINGEMENT, +MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely +responsible for determining the appropriateness of using or +redistributing the Covered Software and assume any risks associated +with Your exercise of permissions under this License. + +In no event and under no legal theory, whether in tort (including +negligence), contract, or otherwise, unless required by applicable law +(such as deliberate and grossly negligent acts) or agreed to in +writing, shall any Contributor be liable to You for damages, including +any direct, indirect, special, incidental, or consequential damages of +any character arising as a result of this License or out of the use or +inability to use the Covered Software (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or +malfunction, or any and all other commercial damages or losses), even +if such Contributor has been advised of the possibility of such +damages. + +6. External Deployment + +If You Externally Deploy Covered Software, such as hosting a website +designed to execute Nmap scans for users, the system and its +documentation must, if technically feasible, prominently display a +notice stating that the system uses the Nmap Security Scanner to +perform its tasks. If technically feasible, the notice must contain a +hyperlink to https://nmap.org/ or provide that URL in the text. + +7. Trademarks + +This License does not grant permission to use the trade names, +trademarks, service marks, or product names of the Licensor, except as +required for reasonable and customary use in describing the origin of +the Covered Software. + +8. Termination for Patent Action + +This License shall terminate automatically and You may no longer +exercise any of the rights granted to You by this License as of the +date You commence an action, including a cross-claim or counterclaim, +against Licensor or any licensee alleging that the Covered Software +infringes a patent. This termination provision shall not apply for an +action alleging patent infringement by combinations of the Covered +Software with other software or hardware. + +9. Jurisdiction, Venue and Governing Law + +This License is governed by the laws of the State of Washington and +the intellectual property laws of the United States of America, +excluding the jurisdiction's conflict-of-law provisions. Any +litigation or other dispute resolution between You and Licensor +relating to this License shall take place in the Northern District of +California, and You and Licensor hereby consent to the personal +jurisdiction of, and venue in, the state and federal courts within +that District with respect to this License. The application of the +United Nations Convention on Contracts for the International Sale of +Goods is expressly excluded. + +10. Npcap and the Official Nmap Windows Builds + +The official Windows Nmap builds includes the Npcap driver and library +(https://npcap.com) for packet capture and transmission on +Windows. That software is under its own separate license terms rather +than this license. Therefore anyone wishing to use or redistribute +both pieces of software must comply with both licenses. Since Npcap +does not allow for redistribution without special permission, the +official Nmap Windows builds which include Npcap may not be +redistributed without special permission. Such permission can be +requested by email to sales@nmap.com. + +11. Permission to link with OpenSSL + +Licensor grants permission to link Covered Software with any version +of the OpenSSL library from OpenSSL.Org, and distribute linked +combinations including the two (assuming such distribution is +otherwise allowed by this agreement). You must obey this License in +all respects for all code used other than OpenSSL. + +12. Waiver; Construction + +Failure by Licensor or any Contributor to enforce any provision of +this License will not be deemed a waiver of future enforcement of that +or any other provision. Any law or regulation which provides that the +language of a contract shall be construed against the drafter will not +apply to this License. + +13. Enforceability + +If any provision of this License is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this License, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable. + +Exhibit A. The GNU General Public License Version 2 +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. +Preamble + +The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + +We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, +we want its recipients to know that what they have is not the +original, so that any problems introduced by others will not reflect +on the original authors' reputations. + +Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at +all. + +The precise terms and conditions for copying, distribution and +modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a +notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the Program +(independent of having been made by running the Program). Whether that +is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously +and appropriately publish on each copy an appropriate copyright notice +and disclaimer of warranty; keep intact all the notices that refer to +this License and to the absence of any warranty; and give any other +recipients of the Program a copy of this License along with the +Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a +fee. + +2. You may modify your copy or copies of the Program or any portion of +it, thus forming a work based on the Program, and copy and distribute +such modifications or work under the terms of Section 1 above, +provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices +stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in +whole or in part contains or is derived from the Program or any part +thereof, to be licensed as a whole at no charge to all third parties +under the terms of this License. + +c) If the modified program normally reads commands interactively when +run, you must cause it, when started running for such interactive use +in the most ordinary way, to print or display an announcement +including an appropriate copyright notice and a notice that there is +no warranty (or else, saying that you provide a warranty) and that +users may redistribute the program under these conditions, and telling +the user how to view a copy of this License. (Exception: if the +Program itself is interactive but does not normally print such an +announcement, your work based on the Program is not required to print +an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable +source code, which must be distributed under the terms of Sections 1 +and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, +to give any third party, for a charge no more than your cost of +physically performing source distribution, a complete machine-readable +copy of the corresponding source code, to be distributed under the +terms of Sections 1 and 2 above on a medium customarily used for +software interchange; or, + +c) Accompany it with the information you received as to the offer to +distribute corresponding source code. (This alternative is allowed +only for noncommercial distribution and only if you received the +program in object code or executable form with such an offer, in +accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt otherwise +to copy, modify, sublicense or distribute the Program is void, and +will automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this +License will not have their licenses terminated so long as such +parties remain in full compliance. + +5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted +herein. You are not responsible for enforcing compliance by third +parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new +versions of the General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Program does not specify a +version number of this License, you may choose any version ever +published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the +author to ask for permission. For software which is copyrighted by the +Free Software Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be guided by the +two goals of preserving the free status of all derivatives of our free +software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE +LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS +AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF +ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + +END OF TERMS AND CONDITIONS + +[For brevity, we've cut out the GPL's final section on "How to Apply +These Terms to Your New Program", but you can find that at +https://www.gnu.org/licenses/gpl-2.0.html#SEC4 ] diff --git a/sdk_container/src/third_party/portage-stable/licenses/NPSL-0.95 b/sdk_container/src/third_party/portage-stable/licenses/NPSL-0.95 new file mode 100644 index 0000000000..3a375ebd7e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/licenses/NPSL-0.95 @@ -0,0 +1,581 @@ +Nmap Public Source License Version 0.95 +For more information on this license, see https://nmap.org/npsl/ + +0. Preamble + +The intent of this license is to establish freedom to share and change +the software regulated by this license under the open source model. It +also includes a Contributor Agreement and disclaims any warranty on +Covered Software. Companies wishing to use or incorporate Covered +Software within their own products may find that our Nmap OEM product +(https://nmap.org/oem/) better suits their needs. Open source +developers who wish to incorporate parts of Covered Software into free +software with conflicting licenses may write Licensor to request a +waiver of terms. + +If the Nmap Project (directly or through one of its commercial +licensing customers) has granted you additional rights to Nmap or Nmap +OEM, those additional rights take precedence where they conflict with +the terms of this license agreement. + +This License represents the complete agreement concerning subject +matter hereof. It contains the license terms themselves, but not the +reasoning behind them or detailed explanations. For further +information about this License, see https://nmap.org/npsl/ . That page +makes a good faith attempt to explain this License, but it does not +and can not modify its governing terms in any way. + +1. Definitions + +* "Contribution" means any work of authorship, including the original + version of the Work and any modifications or additions to that Work + or Derivative Works thereof, that is intentionally submitted to + Licensor by the copyright owner or by an individual or Legal Entity + authorized to submit on behalf of the copyright owner. For the + purposes of this definition, "submitted" means any form of + electronic, verbal, or written communication sent to the Licensor or + its representatives, including but not limited to communication on + electronic mailing lists, source code control systems, web sites, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a + Contribution." + +* "Contributor" means Licensor and any individual or Legal Entity on + behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +* "Covered Software" means the work of authorship, whether in Source + or Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + +* "Derivative Work" or "Collective Work" means any work, whether in + Source or Object form, that is based on (or derived from) the Work + and for which the editorial revisions, annotations, elaborations, or + other modifications represent, as a whole, an original work of + authorship. It includes software as described in Section 3 of this + License. + +* "Executable" means Covered Software in any form other than Source Code. + +* "Externally Deploy" means to Deploy the Covered Software in any way + that may be accessed or used by anyone other than You, used to + provide any services to anyone other than You, or used in any way to + deliver any content to anyone other than You, whether the Covered + Software is distributed to those parties, made available as an + application intended for use over a computer network, or used to + provide services or otherwise deliver content to anyone other than + You. + +* "GPL" means the GNU General Public License Version 2, as published + by the Free Software Foundation and provided in Exhibit A. + +* "Legal Entity" means the union of the acting entity and all other + entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + +* "License" means this document, including Exhibits. + +* "Licensor" means Nmap Software LLC and its successors and assigns. + +* "Main License Body" means all of the terms of this document, + excluding Exhibits. + +* "You" (or "Your") means an individual or Legal Entity exercising + permissions granted by this License. + +2. General Terms + +Covered Software is licensed to you under the terms of the GPL +(Exhibit A), with all the exceptions, clarifications, and additions +noted in this Main License Body. Where the terms in this Main License +Body conflict in any way with the GPL, the Main License Body terms +shall take precedence. These additional terms mean that You may not +distribute Covered Software or Derivative Works under plain GPL terms +without special permission from Licensor. + +You are not required to accept this License. However, nothing else +grants You permission to use, copy, modify or distribute the software +or its derivative works. These actions are prohibited by law if You do +not accept this License. Therefore, by modifying, copying or +distributing the software (or any work based on the software), You +indicate your acceptance of this License to do so, and all its terms +and conditions. In addition, you agree to the terms of this License by +clicking the Accept button or downloading the software. + +3. Derivative Works + +This License (including the GPL portion) places important restrictions +on derived works. Licensor interprets that term quite broadly. To +avoid any misunderstandings, we consider software to constitute a +"derivative work" of Covered Software for the purposes of this license +if it does any of the following: + +* Integrates source code from Covered Software + +* Reads or includes Covered Software data files, such as nmap-os-db or + nmap-service-probes. + +* Is designed specifically to execute Covered Software and parse the + results (as opposed to typical shell or execution-menu apps, which + will execute anything you tell them to). + +* Includes Covered Software in a proprietary executable installer. The + installers produced by InstallShield are an example of + this. Including Nmap with other software in compressed or archival + form does not trigger this provision, provided appropriate open + source decompression or de-archiving software is widely available + for no charge. For the purposes of this license, an installer is + considered to include Covered Software even if it actually retrieves + a copy of Covered Software from another source during runtime (such + as by downloading it from the Internet). + +* Links (statically or dynamically) to a library which does any of the + above + +* Executes a helper program, module, or script to do any of the above. + +This list is not exclusive, but is meant to clarify Licensor's +intentions with some common examples. Distribution of any works which +meet these criteria (and that also choose to accept this license to +benefit from the rights granted herein) must be under the terms of +this license (including this Main License Body and GPL), with no +additional conditions or restrictions. They must abide by all +restrictions that the GPL places on derivative or collective works, +including the requirements for distributing their source code and +allowing royalty-free redistribution. + +Licensor does not purport to control through this license any software +which does not require the rights granted herein (such as rights to +redistribute and/or incorporate Covered Software executables and +source code). In particular, many software packages include the +ability to parse Covered Software results provided by an end user or +to execute Covered Software that end user may have already installed +on their system. To the extent that copyright doctrines such as fair +use allow their practices without the need to exercise any rights +granted by this license, vendors and distributors of such software are +not bound by our definition of derivative works or any other clauses +in this license. + +4. Contributor Agreement (Grant of Copyright and Patent Licenses) + +Each Contributor hereby grants to Licensor a perpetual, worldwide, +non-exclusive, no-charge, royalty-free, irrevocable copyright license +to reproduce, prepare Derivative Works of, publicly display, publicly +perform, sublicense, and distribute the Contribution and such +Derivative Works in Source or Object form. + +Each Contributor hereby grants to You and Licensor a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except +as stated in this section) patent license to make, have made, use, +offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such +Contributor that are necessarily infringed by their Contribution(s) +alone or by combination of their Contribution(s) with the Work to +which such Contribution(s) was submitted. If You institute patent +litigation against any entity (including a cross-claim or counterclaim +in a lawsuit) alleging that the Work or a Contribution incorporated +within the Work constitutes direct or contributory patent +infringement, then any patent licenses granted to You under this +License for that Work shall terminate as of the date such litigation +is filed. + +Contributors may impose different terms on their Contributions by +stating those terms in writing at the time the Contribution is +made. Contributors may withhold all authority from Licensor to +incorporate submissions by conspicuously marking or otherwise +designating them in writing as "Not a Contribution" at the time they +make the work available. + +5. Disclaimer of Warranty and Limitation of Liability + +Unless required by applicable law or agreed to in writing, Licensor +provides the Covered Software (and each Contributor provides its +Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS +OF ANY KIND, either express or implied, including, without limitation, +any warranties or conditions of TITLE, NON-INFRINGEMENT, +MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely +responsible for determining the appropriateness of using or +redistributing the Covered Software and assume any risks associated +with Your exercise of permissions under this License. + +In no event and under no legal theory, whether in tort (including +negligence), contract, or otherwise, unless required by applicable law +(such as deliberate and grossly negligent acts) or agreed to in +writing, shall any Contributor be liable to You for damages, including +any direct, indirect, special, incidental, or consequential damages of +any character arising as a result of this License or out of the use or +inability to use the Covered Software (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or +malfunction, or any and all other commercial damages or losses), even +if such Contributor has been advised of the possibility of such +damages. + +6. External Deployment + +If You Externally Deploy Covered Software, such as hosting a website +designed to execute Nmap scans for users, the system and its +documentation must, if technically feasible, prominently display a +notice stating that the system uses the Nmap Security Scanner to +perform its tasks. If technically feasible, the notice must contain a +hyperlink to https://nmap.org/ or provide that URL in the text. + +7. Trademarks + +This License does not grant permission to use the trade names, +trademarks, service marks, or product names of the Licensor, except as +required for reasonable and customary use in describing the origin of +the Covered Software. + +8. Termination for Patent Action + +This License shall terminate automatically and You may no longer +exercise any of the rights granted to You by this License as of the +date You commence an action, including a cross-claim or counterclaim, +against Licensor or any licensee alleging that the Covered Software +infringes a patent. This termination provision shall not apply for an +action alleging patent infringement by combinations of the Covered +Software with other software or hardware. + +9. Jurisdiction, Venue and Governing Law + +This License is governed by the laws of the State of Washington and +the intellectual property laws of the United States of America, +excluding the jurisdiction's conflict-of-law provisions. Any +litigation or other dispute resolution between You and Licensor +relating to this License shall take place in the Northern District of +California, and You and Licensor hereby consent to the personal +jurisdiction of, and venue in, the state and federal courts within +that District with respect to this License. The application of the +United Nations Convention on Contracts for the International Sale of +Goods is expressly excluded. + +10. Npcap and the Official Nmap Windows Builds + +The official Windows Nmap builds includes the Npcap driver and library +(https://npcap.com) for packet capture and transmission on +Windows. That software is under its own separate license terms rather +than this license. Therefore anyone wishing to use or redistribute +both pieces of software must comply with both licenses. Since Npcap +does not allow for redistribution without special permission, the +official Nmap Windows builds which include Npcap may not be +redistributed without special permission. Such permission can be +requested by email to sales@nmap.com. + +11. Permission to link with OpenSSL + +Licensor grants permission to link Covered Software with any version +of the OpenSSL library from OpenSSL.Org, and distribute linked +combinations including the two (assuming such distribution is +otherwise allowed by this agreement). You must obey this License in +all respects for all code used other than OpenSSL. + +12. Waiver; Construction + +Failure by Licensor or any Contributor to enforce any provision of +this License will not be deemed a waiver of future enforcement of that +or any other provision. Any law or regulation which provides that the +language of a contract shall be construed against the drafter will not +apply to this License. + +13. Enforceability + +If any provision of this License is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this License, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable. + +Exhibit A. The GNU General Public License Version 2 +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. +Preamble + +The licenses for most software are designed to take away your freedom +to share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + +We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, +we want its recipients to know that what they have is not the +original, so that any problems introduced by others will not reflect +on the original authors' reputations. + +Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at +all. + +The precise terms and conditions for copying, distribution and +modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a +notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the Program +(independent of having been made by running the Program). Whether that +is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously +and appropriately publish on each copy an appropriate copyright notice +and disclaimer of warranty; keep intact all the notices that refer to +this License and to the absence of any warranty; and give any other +recipients of the Program a copy of this License along with the +Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a +fee. + +2. You may modify your copy or copies of the Program or any portion of +it, thus forming a work based on the Program, and copy and distribute +such modifications or work under the terms of Section 1 above, +provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices +stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in +whole or in part contains or is derived from the Program or any part +thereof, to be licensed as a whole at no charge to all third parties +under the terms of this License. + +c) If the modified program normally reads commands interactively when +run, you must cause it, when started running for such interactive use +in the most ordinary way, to print or display an announcement +including an appropriate copyright notice and a notice that there is +no warranty (or else, saying that you provide a warranty) and that +users may redistribute the program under these conditions, and telling +the user how to view a copy of this License. (Exception: if the +Program itself is interactive but does not normally print such an +announcement, your work based on the Program is not required to print +an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable +source code, which must be distributed under the terms of Sections 1 +and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, +to give any third party, for a charge no more than your cost of +physically performing source distribution, a complete machine-readable +copy of the corresponding source code, to be distributed under the +terms of Sections 1 and 2 above on a medium customarily used for +software interchange; or, + +c) Accompany it with the information you received as to the offer to +distribute corresponding source code. (This alternative is allowed +only for noncommercial distribution and only if you received the +program in object code or executable form with such an offer, in +accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt otherwise +to copy, modify, sublicense or distribute the Program is void, and +will automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this +License will not have their licenses terminated so long as such +parties remain in full compliance. + +5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted +herein. You are not responsible for enforcing compliance by third +parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new +versions of the General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Program does not specify a +version number of this License, you may choose any version ever +published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the +author to ask for permission. For software which is copyrighted by the +Free Software Foundation, write to the Free Software Foundation; we +sometimes make exceptions for this. Our decision will be guided by the +two goals of preserving the free status of all derivatives of our free +software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE +LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS +AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF +ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + +END OF TERMS AND CONDITIONS + +[For brevity, we've cut out the GPL's final section on "How to Apply +These Terms to Your New Program", but you can find that at +https://www.gnu.org/licenses/gpl-2.0.html#SEC4 ] diff --git a/sdk_container/src/third_party/portage-stable/licenses/PSF-2.3 b/sdk_container/src/third_party/portage-stable/licenses/PSF-2.3 deleted file mode 100644 index c5b5923c55..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/PSF-2.3 +++ /dev/null @@ -1,259 +0,0 @@ -A. HISTORY OF THE SOFTWARE -========================== - -Python was created in the early 1990s by Guido van Rossum at Stichting -Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands -as a successor of a language called ABC. Guido remains Python's -principal author, although it includes many contributions from others. - -In 1995, Guido continued his work on Python at the Corporation for -National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) -in Reston, Virginia where he released several versions of the -software. - -In May 2000, Guido and the Python core development team moved to -BeOpen.com to form the BeOpen PythonLabs team. In October of the same -year, the PythonLabs team moved to Digital Creations (now Zope -Corporation, see http://www.zope.com). In 2001, the Python Software -Foundation (PSF, see http://www.python.org/psf/) was formed, a -non-profit organization created specifically to own Python-related -Intellectual Property. Zope Corporation is a sponsoring member of -the PSF. - -All Python releases are Open Source (see http://www.opensource.org for -the Open Source Definition). Historically, most, but not all, Python -releases have also been GPL-compatible; the table below summarizes -the various releases. - - Release Derived Year Owner GPL- - from compatible? (1) - - 0.9.0 thru 1.2 1991-1995 CWI yes - 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes - 1.6 1.5.2 2000 CNRI no - 2.0 1.6 2000 BeOpen.com no - 1.6.1 1.6 2001 CNRI yes (2) - 2.1 2.0+1.6.1 2001 PSF no - 2.0.1 2.0+1.6.1 2001 PSF yes - 2.1.1 2.1+2.0.1 2001 PSF yes - 2.2 2.1.1 2001 PSF yes - 2.1.2 2.1.1 2002 PSF yes - 2.1.3 2.1.2 2002 PSF yes - 2.2.1 2.2 2002 PSF yes - 2.2.2 2.2.1 2002 PSF yes - 2.2.3 2.2.2 2003 PSF yes - 2.3 2.2.2 2002-2003 PSF yes - -Footnotes: - -(1) GPL-compatible doesn't mean that we're distributing Python under - the GPL. All Python licenses, unlike the GPL, let you distribute - a modified version without making your changes open source. The - GPL-compatible licenses make it possible to combine Python with - other software that is released under the GPL; the others don't. - -(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, - because its license has a choice of law clause. According to - CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 - is "not incompatible" with the GPL. - -Thanks to the many outside volunteers who have worked under Guido's -direction to make these releases possible. - - -B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON -=============================================================== - -PSF LICENSE AGREEMENT FOR PYTHON 2.3 ------------------------------------- - -1. This LICENSE AGREEMENT is between the Python Software Foundation -("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using Python 2.3 software in source or binary form and its -associated documentation. - -2. Subject to the terms and conditions of this License Agreement, PSF -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 2.3 -alone or in any derivative version, provided, however, that PSF's -License Agreement and PSF's notice of copyright, i.e., "Copyright (c) -2001, 2002, 2003 Python Software Foundation; All Rights Reserved" are -retained in Python 2.3 alone or in any derivative version prepared by -Licensee. - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 2.3 or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 2.3. - -4. PSF is making Python 2.3 available to Licensee on an "AS IS" -basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. Nothing in this License Agreement shall be deemed to create any -relationship of agency, partnership, or joint venture between PSF and -Licensee. This License Agreement does not grant permission to use PSF -trademarks or trade name in a trademark sense to endorse or promote -products or services of Licensee, or any third party. - -8. By copying, installing or otherwise using Python 2.3, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. - - -BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 -------------------------------------------- - -BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 - -1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an -office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the -Individual or Organization ("Licensee") accessing and otherwise using -this software in source or binary form and its associated -documentation ("the Software"). - -2. Subject to the terms and conditions of this BeOpen Python License -Agreement, BeOpen hereby grants Licensee a non-exclusive, -royalty-free, world-wide license to reproduce, analyze, test, perform -and/or display publicly, prepare derivative works, distribute, and -otherwise use the Software alone or in any derivative version, -provided, however, that the BeOpen Python License is retained in the -Software, alone or in any derivative version prepared by Licensee. - -3. BeOpen is making the Software available to Licensee on an "AS IS" -basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE -SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS -AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY -DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -5. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -6. This License Agreement shall be governed by and interpreted in all -respects by the law of the State of California, excluding conflict of -law provisions. Nothing in this License Agreement shall be deemed to -create any relationship of agency, partnership, or joint venture -between BeOpen and Licensee. This License Agreement does not grant -permission to use BeOpen trademarks or trade names in a trademark -sense to endorse or promote products or services of Licensee, or any -third party. As an exception, the "BeOpen Python" logos available at -http://www.pythonlabs.com/logos.html may be used according to the -permissions granted on that web page. - -7. By copying, installing or otherwise using the software, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. - - -CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 ---------------------------------------- - -1. This LICENSE AGREEMENT is between the Corporation for National -Research Initiatives, having an office at 1895 Preston White Drive, -Reston, VA 20191 ("CNRI"), and the Individual or Organization -("Licensee") accessing and otherwise using Python 1.6.1 software in -source or binary form and its associated documentation. - -2. Subject to the terms and conditions of this License Agreement, CNRI -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 1.6.1 -alone or in any derivative version, provided, however, that CNRI's -License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) -1995-2001 Corporation for National Research Initiatives; All Rights -Reserved" are retained in Python 1.6.1 alone or in any derivative -version prepared by Licensee. Alternately, in lieu of CNRI's License -Agreement, Licensee may substitute the following text (omitting the -quotes): "Python 1.6.1 is made available subject to the terms and -conditions in CNRI's License Agreement. This Agreement together with -Python 1.6.1 may be located on the Internet using the following -unique, persistent identifier (known as a handle): 1895.22/1013. This -Agreement may also be obtained from a proxy server on the Internet -using the following URL: http://hdl.handle.net/1895.22/1013". - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 1.6.1 or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 1.6.1. - -4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" -basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. This License Agreement shall be governed by the federal -intellectual property law of the United States, including without -limitation the federal copyright law, and, to the extent such -U.S. federal law does not apply, by the law of the Commonwealth of -Virginia, excluding Virginia's conflict of law provisions. -Notwithstanding the foregoing, with regard to derivative works based -on Python 1.6.1 that incorporate non-separable material that was -previously distributed under the GNU General Public License (GPL), the -law of the Commonwealth of Virginia shall govern this License -Agreement only as to issues arising under or with respect to -Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this -License Agreement shall be deemed to create any relationship of -agency, partnership, or joint venture between CNRI and Licensee. This -License Agreement does not grant permission to use CNRI trademarks or -trade name in a trademark sense to endorse or promote products or -services of Licensee, or any third party. - -8. By clicking on the "ACCEPT" button where indicated, or by copying, -installing or otherwise using Python 1.6.1, Licensee agrees to be -bound by the terms and conditions of this License Agreement. - - ACCEPT - - -CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 --------------------------------------------------- - -Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, -The Netherlands. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Stichting Mathematisch -Centrum or CWI not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior -permission. - -STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE -FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/sdk_container/src/third_party/portage-stable/licenses/PUEL b/sdk_container/src/third_party/portage-stable/licenses/PUEL deleted file mode 100644 index 73e62f9615..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/PUEL +++ /dev/null @@ -1,153 +0,0 @@ -VirtualBox Personal Use and Evaluation License (PUEL) - -License version 8, April 19, 2010 - -ORACLE CORPORATION ("ORACLE") IS WILLING TO LICENSE THE PRODUCT (AS -DEFINED IN 1 BELOW) TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL -OF THE TERMS CONTAINED IN THIS VIRTUALBOX PERSONAL USE AND EVALUATION -LICENSE AGREEMENT ("AGREEMENT"). PLEASE READ THE AGREEMENT CAREFULLY. BY -DOWNLOADING OR INSTALLING THIS PRODUCT, YOU ACCEPT THE FULL TERMS OF -THIS AGREEMENT. - -IF YOU ARE AGREEING TO THIS LICENSE ON BEHALF OF AN ENTITY OTHER THAN -AN INDIVIDUAL PERSON, YOU REPRESENT THAT YOU ARE BINDING AND HAVE THE -RIGHT TO BIND THE ENTITY TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. - -1 SUBJECT OF AGREEMENT. "Product", as referred to in this Agreement, shall -be the binary software package "Oracle VM VirtualBox," which Product -allows for creating multiple virtual computers, each with different -operating systems ("Guest Computers"), on a physical computer with a -specific operating system ("Host Computer"), to allow for installing and -executing these Guest Computers simultaneously. The Product consists -of executable files in machine code for the Solaris, Windows, Linux, -and MacOSX operating systems as well as other data files as required -by the executable files at run-time and documentation in electronic -form. The Product includes all documentation and updates provided to -You by Oracle under this Agreement and the terms of this Agreement will -apply to all such documentation and updates unless a different license -is provided with an update or documentation. - -2 GRANT OF LICENSE. (1) Oracle grants you a personal, non-exclusive, -non-transferable, limited license without fees to reproduce, install, -execute, and use internally the Product a Host Computer for your Personal -Use, Educational Use, or Evaluation. "Personal Use" requires that you use -the Product on the same Host Computer where you installed it yourself and -that no more than one client connect to that Host Computer at a time for -the purpose of displaying Guest Computers remotely. "Educational use" is -any use in an academic institution (schools, colleges and universities, -by teachers and students). "Evaluation" means testing the Product for a -reasonable period (that is, normally for a few weeks); after expiry of -that term, you are no longer permitted to evaluate the Product. - -(2) The "VirtualBox Guest Additions" are a set of drivers and -utilities that are shipped as a subset of the Product for the purpose -of being installed inside a Guest Computer to improve its performance -and cooperation with the rest of the Product. In addition to and -independent of the rights granted by subsection 1, Oracle allows you -to install, execute, copy and redistribute a) unmodified copies of the -ISO installation medium of the VirtualBox Guest Additions as shipped -with the Product and b) the VirtualBox Guest Additions together with -the Guest Computer into which they have been installed. - -3 RESTRICTIONS AND RESERVATION OF RIGHTS. (1) Any use beyond the -provisions of 2 is prohibited. The Product and copies thereof provided -to you under this Agreement are copyrighted and licensed, not sold, to -you by Oracle. Oracle reserves all copyrights and other intellectual -property rights. This includes, but is not limited to, the right to -modify, make available or public, rent out, lease, lend or otherwise -distribute the Product. This does not apply as far as applicable law -may require otherwise or if Oracle grants you additional rights of use -in a separate agreement in writing. - -(2) You may not do any of the following: (a) modify the Product. However -if the documentation accompanying Product lists specific portions of -Product, such as header files, class libraries, reference source code, -and/or redistributable files, that may be handled differently, you may -do so only as provided in the documentation; (b) rent, lease, lend or -encumber the Product; (c) remove or alter any proprietary legends or -notices contained in the Product; or (d) decompile, or reverse engineer -the Product (unless enforcement of this restrictions is prohibited by -applicable law). - -(3) The Product is not designed, licensed or intended for use in the -design, construction, operation or maintenance of any nuclear facility -and Oracle and its licensors disclaim any express or implied warranty -of fitness for such uses. - -(4) No right, title or interest in or to any trademark, service mark, logo -or trade name of Oracle or its licensors is granted under this Agreement. - -4 TERMINATION. The Agreement is effective on the Date you receive the -Product and remains effective until terminated. Your rights under this -Agreement will terminate immediately without notice from Oracle if you -materially breach it or take any action in derogation of Oracle's and/or -its licensors' rights to Product. Oracle may terminate this Agreement -should any Product become, or in Oracle's reasonable opinion likely to -become, the subject of a claim of intellectual property infringement or -trade secret misappropriation. Upon termination, you will cease use of, -and destroy, Product and confirm compliance in writing to Oracle. Sections -3-9, inclusive, will survive termination of the Agreement. - -5 DISCLAIMER OF WARRANTY. TO THE EXTENT NOT PROHIBITED BY APPLICABLE -LAW, ORACLE PROVIDES THE PRODUCT "AS IS" WITHOUT WARRANTY OF ANY KIND, -EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR -NON-INFRINGEMENT, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO -BE LEGALLY INVALID. The entire risk as to the quality and performance of -the Product is with you. Should it prove defective, you assume the cost -of all necessary servicing, repair, or correction. In addition, Oracle -shall be allowed to provide updates to the Product in urgent cases. You -are then obliged to install such updates. Such an urgent case includes, -but is not limited to, a claim of rights to the Product by a third party. - -6 LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, -IN NO EVENT WILL ORACLE OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, -PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR -PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, -ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE PRODUCT, -EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In -no event will Oracle's liability to you, whether in contract, tort -(including negligence), or otherwise, exceed the amount paid by you for -Product under this Agreement. Some states do not allow the exclusion of -incidental or consequential damages, so some of the terms above may not -be applicable to you. - -7 THIRD PARTY CODE. Portions of Product may be provided with notices and -open source licenses from communities and third parties that govern the -use of those portions, and any licenses granted hereunder do not alter -any rights and obligations You may have under such open source licenses, -however, the disclaimer of warranty and limitation of liability provisions -in this Agreement will apply to all the Product. - -8 EXPORT REGULATIONS. All Product, documents, technical data, and any -other materials delivered under this Agreement are subject to U.S. export -control laws and may be subject to export or import regulations in other -countries. You agree to comply strictly with these laws and regulations -and acknowledge that you have the responsibility to obtain any licenses -to export, re-export, or import as may be required after delivery to you. - -9 U.S. GOVERNMENT RESTRICTED RIGHTS. If Product is being acquired -by or on behalf of the U.S. Government or by a U.S. Government prime -contractor or subcontractor (at any tier), then the Government's rights -in Product and accompanying documentation will be only as set forth -in this Agreement; this is in accordance with 48 CFR 227.7201 through -227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 -CFR 2.101 and 12.212 (for non-DOD acquisitions). - -10 MISCELLANEOUS. This Agreement is the entire agreement between you -and Oracle relating to its subject matter. It supersedes all prior or -contemporaneous oral or written communications, proposals, representations -and warranties and prevails over any conflicting or additional terms -of any quote, order, acknowledgment, or other communication between -the parties relating to its subject matter during the term of this -Agreement. No modification of this Agreement will be binding, unless in -writing and signed by an authorized representative of each party. If any -provision of this Agreement is held to be unenforceable, this Agreement -will remain in effect with the provision omitted, unless omission would -frustrate the intent of the parties, in which case this Agreement will -immediately terminate. Course of dealing and other standard business -conditions of the parties or the industry shall not apply. This Agreement -is governed by the substantive and procedural laws of California and you -and Oracle agree to submit to the exclusive jurisdiction of, and venue -in, the courts in San Francisco, San Mateo, or Santa Clara counties in -California in any dispute arising out of or relating to this Agreement. diff --git a/sdk_container/src/third_party/portage-stable/licenses/SmartLabs b/sdk_container/src/third_party/portage-stable/licenses/SmartLabs deleted file mode 100644 index 6cf629998a..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/SmartLabs +++ /dev/null @@ -1,42 +0,0 @@ -(c) SmartLabs LLC, 2008-2009 - -Freeware Licence Agreement -This licence agreement only applies to the free version of this software. - -Terms and Conditions -BY DOWNLOADING, INSTALLING, USING, TRANSMITTING, DISTRIBUTING OR COPYING THIS SOFTWARE ("THE SOFTWARE"), YOU AGREE TO THE TERMS OF THIS AGREEMENT (INCLUDING THE SOFTWARE LICENCE AND DISCLAIMER OF WARRANTY) WITH SmartLabs LLC (with the business address at 72, Oktyabrskata str., 127521 Moscow, Russia) THE OWNER OF ALL RIGHTS IN RESPECT OF THE SOFTWARE. - -PLEASE READ THIS DOCUMENT CAREFULLY BEFORE USING THE SOFTWARE. - -IF YOU DO NOT AGREE TO ANY OF THE TERMS OF THIS LICENCE THEN DO NOT DOWNLOAD, INSTALL, USE, TRANSMIT, DISTRIBUTE OR COPY THE SOFTWARE. - -THIS DOCUMENT CONSTITUES A LICENCE TO USE THE SOFTWARE ON THE TERMS AND CONDITIONS APPEARING BELOW. - -The Software is licensed to you without charge for use only upon the terms of this licence, and SmartLabs LLC reserves all rights not expressly granted to you. SmartLabs LLC retains ownership of all copies of the Software. - -1. Licence -You may use the Software without charge. - -You may distribute exact copies of the Software to anyone. - -2. Restrictions -SmartLabs LLC reserves the right to revoke the above distribution right at any time, for any or no reason. - -YOU MAY NOT MODIFY, ADAPT, TRANSLATE, RENT, LEASE, LOAN, SELL, REQUEST DONATIONS OR CREATE DERIVATE WORKS BASED UPON THE SOFTWARE OR ANY PART THEREOF. - -The Software contains trade secrets and to protect them you may not decompile, reverse engineer, disassemble or otherwise reduce the Software to a humanly perceivable form. You agree not to divulge, directly or indirectly, until such trade secrets cease to be confidential, for any reason not your own fault. - -3. Termination -This licence is effective until terminated. The Licence will terminate automatically without notice from SmartLabs LLC if you fail to comply with any provision of this Licence. Upon termination you must destroy the Software and all copies thereof. You may terminate this Licence at any time by destroying the Software and all copies thereof. Upon termination of this licence for any reason you shall continue to be bound by the provisions of Section 2 above. Termination will be without prejudice to any rights SmartLabs LLC may have as a result of this agreement. - -4. Disclaimer of Warranty, Limitation of Remedies -TO THE FULL EXTENT PERMITTED BY LAW, SmartLabs LLC HEREBY EXCLUDES ALL CONDITIONS AND WARRANTIES, WHETHER IMPOSED BY STATUTE OR BY OPERATION OF LAW OR OTHERWISE, NOT EXPRESSLY SET OUT HEREIN. THE SOFTWARE, AND ALL ACCOMPANYING FILES, DATA AND MATERIALS ARE DISTRIBUTED "AS IS" AND WITH NO WARRANTIES OF ANY KIND, WHETHER EXPRESS OR IMPLIED. SmartLabs LLC DOES NOT WARRANT, GUARANTEE OR MAKE ANY REPRESENTATIONS REGARDING THE USE, OR THE RESULTS OF THE USE, OF THE SOFTWARE WITH RESPECT TO ITS CORRECTNESS, ACCURACY, RELIABILITY, CURRENTNESS OR OTHERWISE. THE ENTIRE RISK OF USING THE SOFTWARE IS ASSUMED BY YOU. SmartLabs LLC MAKES NO EXPRESS OR IMPLIED WARRANTIES OR CONDITIONS INCLUDING, WITHOUT LIMITATION, THE WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE WITH RESPECT TO THE SOFTWARE. NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY SmartLabs LLC, IT'S DISTRIBUTORS, AGENTS OR EMPLOYEES SHALL CREATE A WARRANTY, AND YOU MAY NOT RELY ON ANY SUCH INFORMATION OR ADVICE. - -IMPORTANT NOTE: Nothing in this Agreement is intended or shall be construed as excluding or modifying any statutory rights, warranties or conditions which by virtue of any national or state Fair Trading, Trade Practices or other such consumer legislation may not be modified or excluded. If permitted by such legislation, however, SmartLabs LLC' liability for any breach of any such warranty or condition shall be and is hereby limited to the supply of the Software licensed hereunder again as SmartLabs LLC at its sole discretion may determine to be necessary to correct the said breach. - -IN NO EVENT SHALL SmartLabs LLC BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, AND THE LOSS OF BUSINESS INFORMATION OR COMPUTER PROGRAMS), EVEN IF SmartLabs LLC OR ANY SmartLabs LLC REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN ADDITION, IN NO EVENT DOES SmartLabs LLC AUTHORISE YOU TO USE THE SOFTWARE IN SITUATIONS WHERE FAILURE OF THE SOFTWARE TO PERFORM CAN REASONABLY BE EXPECTED TO RESULT IN A PHYSICAL INJURY, OR IN LOSS OF LIFE. ANY SUCH USE BY YOU IS ENTIRELY AT YOUR OWN RISK, AND YOU AGREE TO HOLD SmartLabs LLC HARMLESS FROM ANY CLAIMS OR LOSSES RELATING TO SUCH UNAUTHORISED USE. - -5. General -All rights of any kind in the Software which are not expressly granted in this Agreement are entirely and exclusively reserved to and by SmartLabs LLC. - -This agreement contains the entire Agreement between the parties hereto with respect to the subject matter hereof, and supersedes all prior agreements and/or understandings (oral or written). Failure or delay by SmartLabs LLC in enforcing any right or provision hereof shall not be deemed a waiver of such provision or right with respect to the instant or any subsequent breach. If any provision of this Agreement shall be held by a court of competent jurisdiction to be contrary to law, that provision will be enforced to the maximum extent permissible, and the remaining provisions of this Agreement will remain in force and effect. diff --git a/sdk_container/src/third_party/portage-stable/licenses/Spread-1.0 b/sdk_container/src/third_party/portage-stable/licenses/Spread-1.0 deleted file mode 100644 index 4a63da6949..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/Spread-1.0 +++ /dev/null @@ -1,68 +0,0 @@ -Spread Open-Source License -- Version 1.0 ------------------------------------------ -Copyright (c) 1993-2001 Spread Concepts LLC. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following request and - disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following request and - disclaimer in the documentation and/or other materials provided - with the distribution. - -3. All advertising materials (including web pages) mentioning features - or use of this software, or software that uses this software, must - display the following acknowledgment: "This product uses software - developed by Spread Concepts LLC for use in the Spread toolkit. For - more information about Spread see http://www.spread.org" - -4. The names "Spread" or "Spread toolkit" must not be used to endorse - or promote products derived from this software without prior - written permission. - -5. Redistributions of any form whatsoever must retain the following - acknowledgment: "This product uses software developed by Spread - Concepts LLC for use in the Spread toolkit. For more information about - Spread, see http://www.spread.org" - -6. This license shall be governed by and construed and enforced in - accordance with the laws of the State of Maryland, without - reference to its conflicts of law provisions. The exclusive - jurisdiction and venue for all legal actions relating to this - license shall be in courts of competent subject matter jurisdiction - located in the State of Maryland. - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, SPREAD IS PROVIDED -UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, -EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES -THAT SPREAD IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR -PURPOSE OR NON-INFRINGING. ALL WARRANTIES ARE DISCLAIMED AND THE -ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE CODE IS WITH -YOU. SHOULD ANY CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE -COPYRIGHT HOLDER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY -NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY -CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY CODE IS -AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL -THE COPYRIGHT HOLDER OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY -SPECIAL, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES FOR LOSS OF -PROFITS, REVENUE, OR FOR LOSS OF INFORMATION OR ANY OTHER LOSS. - -YOU EXPRESSLY AGREE TO FOREVER INDEMNIFY, DEFEND AND HOLD HARMLESS THE -COPYRIGHT HOLDERS AND CONTRIBUTORS OF SPREAD AGAINST ALL CLAIMS, -DEMANDS, SUITS OR OTHER ACTIONS ARISING DIRECTLY OR INDIRECTLY FROM -YOUR ACCEPTANCE AND USE OF SPREAD. - -Although NOT REQUIRED, we at Spread Concepts would appreciate it if -active users of Spread put a link on their web site to Spread's web -site when possible. We also encourage users to let us know who they -are, how they are using Spread, and any comments they have through -either e-mail (spread@spread.org) or our web site at -(http://www.spread.org/comments). - diff --git a/sdk_container/src/third_party/portage-stable/licenses/egressor b/sdk_container/src/third_party/portage-stable/licenses/egressor deleted file mode 100644 index c9150c2401..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/egressor +++ /dev/null @@ -1,75 +0,0 @@ - -TERMS AND CONDITIONS OF USE ----------------------------------------------------------------------- - -The MITRE Corporation (MITRE) licenses the Egress Filtering Diagnosis -Tool to you without charge . As used in this License, the Term -"Egress Filtering Information Tool" includes any documentation and -test results provided. - -The Egress Filtering Diagnosis Tool is the copyright work and the -proprietary intellectual property of MITRE. No ownership or other -proprietary interest in the Egress Filtering Diagnosis Tool is -granted you other than what is granted in this license. You may not -sell the Egress Filtering Diagnosis Tool to a third party, or charge -for using it to provide services to a third party - -YOU ASSUME ALL RISK AS TO THE SELECTION, USE, PERFORMANCE AND QUALITY -OF THE EGRESS FILTERING DIAGNOSIS TOOL. MITRE IS PROVID-ING THE -EGRESS FILTERING DIAGNOSIS TOOL "AS IS" AND MAKES NO WA-RRANTY, -EXPRESS OR IMPLIED, AS TO THE ACCURACY, CAPABILITY, EFFI-CIENCY, -MERCHANTABILITY, OR FUNCTIONING OF THE EGRESS FILTERING DIAGNOSIS -TOOL. IN NO EVENT WILL MITRE BE LIABLE FOR ANY GENERAL, -CONSEQUENTIAL, INDIRECT, INCIDENTAL, EXEMPLARY OR SPECIAL DAMAGES, -REGARDLESS OF THE CAUSE THEREOF, EVEN IF MITRE HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - -You accept the Egress Filtering Diagnosis Tool on the condition that -you indemnify and hold harmless MITRE, its Board of Trustees, -officers, agents, and employees, from any and all liability or damages -to third parties, including attorneys' fees, court costs, and other -related costs and expenses, arising out of your use of the Egress -Filtering Diagnosis Tool irrespective of the cause of said liability. - -You remain solely responsible for the security of your systems and for -the consequences of the use of the Egress Filtering Diagnosis Tool. -You assume the entire risk of any servicing, repair, or correction of -your property or operations arising out of your use of the Egress -Filtering Diagnosis Tool. - -MITRE uses its best efforts to protect against the loss, misuse or -alteration of information and information systems under its control by -incorporating security systems. However, if any MITRE server or -information system is penetrated or otherwise compromised, MITRE shall -have no liability to you or anyone claiming through you for any damage -or injury caused by the intentional, unintentional or negligent acts -of third parties. - -The export from the United States or the subsequent reexport of the -Egress Filtering Diagnosis Tool is subject to compliance with United -States export control and munitions control restrictions. You agree -that in the event you seek to export the Egress Filtering Diagnosis -Tool you assume full responsibility for obtaining all necessary export -licenses and approvals and for assuring compliance with applicable -reexport restrictions. - -If any provision of these terms is deemed unlawful, void, or for any -reason unenforceable, then that provision will be deemed severable -from these terms and will not affect the validity and enforceability -of the remaining provisions. - -This License shall be governed by the laws of the Commonwealth of -Virginia without regard to Virginia conflicts of laws rules. Any -legal action concerning use of the Egress Filtering Diagnosis Tool or -this License must be filed in the U.S. District Court for the Eastern -District of Virginia. - -(c) 2000 The MITRE Corporation. All rights reserved. ----------------------------------------------------------------------- -By using this software, you signify your acceptance of our Terms and -Conditions of Use. If you do not agree to these terms, do not use the -tool. - - - - diff --git a/sdk_container/src/third_party/portage-stable/licenses/linux-fw-redistributable b/sdk_container/src/third_party/portage-stable/licenses/linux-fw-redistributable index 6cafc451e4..321888c3a5 100644 --- a/sdk_container/src/third_party/portage-stable/licenses/linux-fw-redistributable +++ b/sdk_container/src/third_party/portage-stable/licenses/linux-fw-redistributable @@ -5,3 +5,7 @@ many of them being non-free. However, all images whose license is subsumed under this license label should at least be redistributable. You will need to check the WHENCE and LICEN[CS]E.* files in the package for specific licensing terms. + +Some firmware images are distributed under a free software license +(e.g. MIT or BSD), but only in binary form. These images are non-free +in spite of their license, because their source code is not available. diff --git a/sdk_container/src/third_party/portage-stable/licenses/mpeg2enc b/sdk_container/src/third_party/portage-stable/licenses/mpeg2enc deleted file mode 100644 index 3398402197..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/mpeg2enc +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved. - - -Disclaimer of Warranty - -These software programs are available to the user without any license fee or -royalty on an "as is" basis. The MPEG Software Simulation Group disclaims -any and all warranties, whether express, implied, or statuary, including any -implied warranties or merchantability or of fitness for a particular -purpose. In no event shall the copyright-holder be liable for any -incidental, punitive, or consequential damages of any kind whatsoever -arising from the use of these programs. - -This disclaimer of warranty extends to the user of these programs and user's -customers, employees, agents, transferees, successors, and assigns. - -The MPEG Software Simulation Group does not represent or warrant that the -programs furnished hereunder are free of infringement of any third-party -patents. - -Commercial implementations of MPEG-1 and MPEG-2 video, including shareware, -are subject to royalty fees to patent holders. Many of these patents are -general enough such that they are unavoidable regardless of implementation -design. diff --git a/sdk_container/src/third_party/portage-stable/licenses/sgb2ns b/sdk_container/src/third_party/portage-stable/licenses/sgb2ns deleted file mode 100644 index 3b880fff35..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/sgb2ns +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) 1997 by the University of Southern California -All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation in source and binary forms for non-commercial purposes -and without fee is hereby granted, provided that the above copyright -notice appear in all copies and that both the copyright notice and -this permission notice appear in supporting documentation. and that -any documentation, advertising materials, and other materials related -to such distribution and use acknowledge that the software was -developed by the University of Southern California, Information -Sciences Institute. The name of the University may not be used to -endorse or promote products derived from this software without -specific prior written permission. - -THE UNIVERSITY OF SOUTHERN CALIFORNIA makes no representations about -the suitability of this software for any purpose. THIS SOFTWARE IS -PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - -Other copyrights might apply to parts of this software and are so -noted when applicable. diff --git a/sdk_container/src/third_party/portage-stable/licenses/x2x b/sdk_container/src/third_party/portage-stable/licenses/x2x deleted file mode 100644 index 74f0430ab9..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/x2x +++ /dev/null @@ -1,33 +0,0 @@ - * Copyright (c) 1997 - * Digital Equipment Corporation. All rights reserved. - * - * By downloading, installing, using, modifying or distributing this - * software, you agree to the following: - * - * 1. CONDITIONS. Subject to the following conditions, you may download, - * install, use, modify and distribute this software in source and binary - * forms: - * - * a) Any source code, binary code and associated documentation - * (including the online manual) used, modified or distributed must - * reproduce and retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * b) No right is granted to use any trade name, trademark or logo of - * Digital Equipment Corporation. Neither the "Digital Equipment - * Corporation" name nor any trademark or logo of Digital Equipment - * Corporation may be used to endorse or promote products derived from - * this software without the prior written permission of Digital - * Equipment Corporation. - * - * 2. DISCLAIMER. THIS SOFTWARE IS PROVIDED BY DIGITAL "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED.IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From cf2128506f3936254ba53564f6da7fc6b9ae9762 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:37 +0000 Subject: [PATCH 49/76] net-analyzer/nmap: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/net-analyzer/nmap/Manifest | 2 + .../net-analyzer/nmap/metadata.xml | 4 - .../net-analyzer/nmap/nmap-7.92-r2.ebuild | 139 ++++++++++++++++++ .../{nmap-7.93.ebuild => nmap-7.93-r2.ebuild} | 7 +- .../net-analyzer/nmap/nmap-9999.ebuild | 7 +- 5 files changed, 149 insertions(+), 10 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.92-r2.ebuild rename sdk_container/src/third_party/portage-stable/net-analyzer/nmap/{nmap-7.93.ebuild => nmap-7.93-r2.ebuild} (95%) diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/Manifest b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/Manifest index 8e4258cbc6..ba0eb83f06 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/Manifest @@ -1,2 +1,4 @@ +DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59 +DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9 diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/metadata.xml b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/metadata.xml index 92acf338fc..e31f57e3f5 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/metadata.xml @@ -9,10 +9,6 @@ dilfridge@gentoo.org Andreas K. Hüttel - - zlogene@gentoo.org - Mikle Kolyada - Enable SSH support through net-libs/libssh2 Install the ncat utility diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.92-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.92-r2.ebuild new file mode 100644 index 0000000000..2c418afbe2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.92-r2.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-3 ) +LUA_REQ_USE="deprecated" +inherit autotools lua-single toolchain-funcs + +DESCRIPTION="Network exploration tool and security / port scanner" +HOMEPAGE="https://nmap.org/" +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nmap/nmap" +else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc + inherit verify-sig + + SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + + LICENSE="|| ( NPSL-0.92 NPSL-0.95 GPL-2 )" +fi + +SLOT="0" +IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua" +REQUIRED_USE=" + system-lua? ( nse ${LUA_REQUIRED_USE} ) + symlink? ( ncat ) +" + +RDEPEND=" + dev-libs/liblinear:= + dev-libs/libpcre + net-libs/libpcap + libssh2? ( + net-libs/libssh2[zlib] + sys-libs/zlib + ) + nse? ( sys-libs/zlib ) + ssl? ( dev-libs/openssl:0= ) + symlink? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) + system-lua? ( ${LUA_DEPS} ) +" +DEPEND="${RDEPEND}" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-5.10_beta1-string.patch + "${FILESDIR}"/${PN}-5.21-python.patch + "${FILESDIR}"/${PN}-6.46-uninstaller.patch + "${FILESDIR}"/${PN}-6.25-liblua-ar.patch + "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch + "${FILESDIR}"/${PN}-7.25-libpcre.patch + "${FILESDIR}"/${PN}-7.31-libnl.patch + "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch + "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch +) + +pkg_setup() { + use system-lua && lua-single_pkg_setup +} + +src_prepare() { + rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die + + cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die + + default + + sed -i \ + -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ + Makefile.in || die + + cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die + + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # we need the original for a Darwin-specific fix, bug #604432 + mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die + fi +} + +src_configure() { + # The bundled libdnet is incompatible with the version available in the + # tree, so we cannot use the system library here. + econf \ + $(use_enable ipv6) \ + $(use_with libssh2) \ + $(use_with ncat) \ + $(use_with nping) \ + $(use_with ssl openssl) \ + $(usex libssh2 --with-zlib) \ + $(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \ + $(usex nse --with-zlib) \ + --cache-file="${S}"/config.cache \ + --with-libdnet=included \ + --with-pcre="${ESYSROOT}"/usr \ + --without-ndiff \ + --without-zenmap +} + +src_compile() { + local directory + for directory in . libnetutil nsock/src \ + $(usex ncat ncat '') \ + $(usex nping nping '') + do + emake -C "${directory}" makefile.dep + done + + emake \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + # See bug #831713 for return of -j1 + LC_ALL=C emake \ + -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + + dodoc CHANGELOG HACKING docs/README docs/*.txt + + use symlink && dosym /usr/bin/ncat /usr/bin/nc +} diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.93.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.93-r2.ebuild similarity index 95% rename from sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.93.ebuild rename to sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.93-r2.ebuild index 1c9da57558..0b02e213c5 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.93.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.93-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools lua-single python-any-r1 toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" @@ -25,7 +25,8 @@ else KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi -LICENSE="|| ( NPSL GPL-2 )" +# https://github.com/nmap/nmap/issues/2199 +LICENSE="|| ( NPSL-0.94 NPSL-0.95 )" SLOT="0" IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua" REQUIRED_USE=" diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-9999.ebuild index 747d81979e..8617f57210 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" PLOCALE_BACKUP="en" inherit autotools lua-single plocale python-single-r1 toolchain-funcs @@ -27,7 +27,8 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi -LICENSE="|| ( NPSL GPL-2 )" +# https://github.com/nmap/nmap/issues/2199 +LICENSE="NPSL-0.95" SLOT="0" IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap" REQUIRED_USE=" From 0fe5204ec750fdf1c6696eaf0ad5b14fee228359 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:37 +0000 Subject: [PATCH 50/76] net-dns/bind-tools: Sync with Gentoo It's from Gentoo commit 2c49f3f775938d9d24680ec5184c0aa4fbd88e50. --- .../net-dns/bind-tools/bind-tools-9.16.36.ebuild | 4 ++-- .../portage-stable/net-dns/bind-tools/metadata.xml | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.36.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.36.ebuild index 8b2858e5aa..3ef97fde7b 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.36.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.36.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 EAPI=8 @@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+caps doc gssapi idn libedit readline test xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/metadata.xml b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/metadata.xml index 38322a5df4..e767b230c7 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/metadata.xml @@ -1,10 +1,6 @@ - - zlogene@gentoo.org - Mikle Kolyada - chutzpah@gentoo.org Patrick McLean From c3ead223cd84d59aa6aead5c4fe9bafe7ffbb79a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:37 +0000 Subject: [PATCH 51/76] net-fs/cifs-utils: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild | 4 ++-- .../portage-stable/net-fs/cifs-utils/cifs-utils-6.15.ebuild | 4 ++-- .../portage-stable/net-fs/cifs-utils/cifs-utils-7.0.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild index 9e2054bc08..9e39096264 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools bash-completion-r1 linux-info pam python-single-r1 diff --git a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15.ebuild index f613e4206f..bf70cf7a96 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-6.15.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools bash-completion-r1 linux-info pam python-single-r1 diff --git a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-7.0.ebuild b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-7.0.ebuild index a40518d230..5cd601f109 100644 --- a/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-7.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-fs/cifs-utils/cifs-utils-7.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools bash-completion-r1 linux-info pam python-single-r1 From 12499d97a2907a1241982036fbf915a82839be6d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:38 +0000 Subject: [PATCH 52/76] net-libs/libpcap: Sync with Gentoo It's from Gentoo commit 4a419599570c5efed5d5f740c41cf0b3904086c4. --- .../portage-stable/net-libs/libpcap/Manifest | 2 + .../net-libs/libpcap/libpcap-1.10.3.ebuild | 97 +++++++++++++++++++ .../net-libs/libpcap/metadata.xml | 4 - 3 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/Manifest index ee7a63215c..88e72a145a 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/Manifest @@ -2,3 +2,5 @@ DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88da DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d DIST libpcap-1.10.2.tar.gz 951063 BLAKE2B f8280c8e12065b4d86e451df8504c834da9c94b25029f0e5c22359d0ce35cf4e3490fa3343d0112209600ea01ffa54249c82c20e2859515884daee759e4a5e9b SHA512 ccacebf367db44ab74e588f88a4fd7cd82c58e478e6c35414ae36df58fb06d85d542597485b1d1393edfaacc2bc5d35578b7b87fee4965f6dfde10a03d2ddd32 DIST libpcap-1.10.2.tar.gz.sig 442 BLAKE2B c470ff70e58c13dfd1a6d72a00d83883515b9ca63e1561b3acbb75d744b043726df9b8dcb70dfa5ea1c0fa54624a407364d85e83fd3ec4dfd605aa401f5351df SHA512 122bf14c2525a05b2781f6d7bc029d73bcf4584c184220b9f9716def327cc0521ec78d658ad58bdf8a9cd9415ab9ad4d1d24ed1880db25ace6a01a93786bcc5e +DIST libpcap-1.10.3.tar.gz 951869 BLAKE2B 3614042f7d8cd5a25221f52d2ed09f9f44643cdc0901ff21041ddb7ba85193c667036f7d989c8b59e6e205d630e062da46533110914dd287013a9ff80b31e97f SHA512 57bc07cbc8c326e203ce10ce1eb9f55760fc33320718d8643c65a68949334291877dffcf19af5f61eb9b4eda2d8ffe7bacee38363d2d6536cc85ae81c851684d +DIST libpcap-1.10.3.tar.gz.sig 442 BLAKE2B 30f0053bc05564fd06aeac751d85eb4838c55c783a0eed450f4de238391c87b8915378f4dc679a14276c9e5e17e9bc74b861241a0a0e86bb22dc2680552f43db SHA512 dc5ae51a96f9dfc570009a5c711a1e4eca012e99d6eb7af3b35c5636199b3273e92a657fdf85688650c093cc9b6c435ba1e9b84100469b2604b8d3125613b4ab diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild new file mode 100644 index 0000000000..9bda8d87fb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal + +DESCRIPTION="A system-independent library for user-level network packet capture" +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug" +RESTRICT="!test? ( test )" + +RDEPEND=" + bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] ) + remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] ) + rdma? ( sys-cluster/rdma-core ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/yacc + sys-devel/flex + dbus? ( virtual/pkgconfig ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" +fi + +src_prepare() { + default + + if ! [[ -f VERSION ]]; then + echo ${PV} > VERSION || die + fi + + eautoreconf +} + +multilib_src_configure() { + # bug #884275 + export LEX=flex + + ECONF_SOURCE="${S}" econf \ + $(use_enable bluetooth) \ + $(use_enable dbus) \ + $(use_enable rdma) \ + $(use_enable remote) \ + $(use_enable usb) \ + $(use_enable yydebug) \ + $(use_with netlink libnl) \ + --enable-ipv6 +} + +multilib_src_compile() { + emake all shared + use test && emake testprogs +} + +multilib_src_test() { + testprogs/findalldevstest || die +} + +multilib_src_install_all() { + dodoc CREDITS CHANGES VERSION TODO README.* doc/README.* + + # remove static libraries (--disable-static does not work) + if ! use static-libs; then + find "${ED}" -name '*.a' -exec rm {} + || die + fi + + find "${ED}" -name '*.la' -delete || die + + # We need this to build pppd on G/FBSD systems + if [[ "${USERLAND}" == "BSD" ]]; then + insinto /usr/include + doins pcap-int.h portability.h + fi +} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/metadata.xml b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/metadata.xml index 011e819bab..a3e378e23e 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/metadata.xml @@ -1,10 +1,6 @@ - - zlogene@gentoo.org - Mikle Kolyada - sam@gentoo.org Sam James From 83a3d2a365d9ac6f0421c8a6dee08fa15df9be51 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:42 +0000 Subject: [PATCH 53/76] net-misc/curl: Sync with Gentoo It's from Gentoo commit 23b9a847d47e5b48b10825e6d01931bfd38e327a. --- ...rl-7.87.0.ebuild => curl-7.87.0-r1.ebuild} | 6 +- .../net-misc/curl/curl-7.87.0-r2.ebuild | 302 ++++++++++++++++++ .../curl-7.87.0-typecheck-deprecated.patch | 48 +++ 3 files changed, 353 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/portage-stable/net-misc/curl/{curl-7.87.0.ebuild => curl-7.87.0-r1.ebuild} (96%) create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.87.0-typecheck-deprecated.patch diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r1.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r1.ebuild index 68fc4577aa..1277249868 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r1.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 EAPI="8" @@ -12,7 +12,7 @@ SRC_URI="https://curl.se/download/${P}.tar.xz LICENSE="curl" SLOT="0" -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" IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" IUSE+=" nghttp3 quiche" @@ -267,7 +267,7 @@ multilib_src_configure() { fi if use nghttp3; then libs+=( "-lnghttp3" "-lngtcp2" ) - priv+=( "libnghttp3" "-libtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) fi if use ssl && use curl_ssl_openssl; then libs+=( "-lssl" "-lcrypto" ) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r2.ebuild new file mode 100644 index 0000000000..65942b7021 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r2.ebuild @@ -0,0 +1,302 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools prefix multilib-minimal verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" +SRC_URI="https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )" + +LICENSE="curl" +SLOT="0" +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" +IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" +IUSE+=" nghttp3 quiche" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc + +# Only one default ssl provider can be enabled +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_rustls + ) + )" + +# lead to lots of false negatives, bug #285669 +RESTRICT="!test? ( test )" + +RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + mbedtls? ( + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + openssl? ( + dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + nss? ( + dev-libs/nss:0[${MULTILIB_USEDEP}] + dev-libs/nss-pem + app-misc/ca-certificates + ) + rustls? ( + net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] + ) + ) + http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) + nghttp3? ( + net-libs/nghttp3[${MULTILIB_USEDEP}] + net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + ) + quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + sys-libs/zlib[${MULTILIB_USEDEP}] + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" + +# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 +# rtmp? ( +# media-video/rtmpdump +# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) +# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) +# ) + +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + + "${FILESDIR}"/${P}-gnutls-openssl-build.patch + "${FILESDIR}"/${P}-typecheck-deprecated.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + #myconf+=( --without-default-ssl-backend ) + if use ssl ; then + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) + + if use gnutls || use curl_ssl_gnutls; then + einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls || use curl_ssl_mbedtls; then + einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use nss || use curl_ssl_nss; then + einfo "SSL provided by nss" + myconf+=( --with-nss --with-nss-deprecated ) + fi + if use openssl || use curl_ssl_openssl; then + einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls || use curl_ssl_rustls; then + einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + + if use curl_ssl_gnutls; then + einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + $(use_enable ipv6) + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --without-fish-functions-dir + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + --without-libpsl + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + $(use_with quiche) + $(use_with rtmp librtmp) + --without-schannel + --without-secure-transport + $(use_enable websockets) + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # avoid building the client + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use quiche; then + libs+=( "-lquiche" ) + priv+=( "quiche" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can disable tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.87.0-typecheck-deprecated.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.87.0-typecheck-deprecated.patch new file mode 100644 index 0000000000..dec6d117ef --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.87.0-typecheck-deprecated.patch @@ -0,0 +1,48 @@ +https://bugs.gentoo.org/890587 +https://github.com/curl/curl/issues/10148 +https://github.com/curl/curl/commit/e2aed004302e51cfa5b6ce8c8ab65ef92aa83196 + +From e2aed004302e51cfa5b6ce8c8ab65ef92aa83196 Mon Sep 17 00:00:00 2001 +From: Patrick Monnerat +Date: Fri, 23 Dec 2022 15:35:27 +0100 +Subject: [PATCH] typecheck: accept expressions for option/info parameters + +As expressions can have side effects, evaluate only once. + +To enable deprecation reporting only once, get rid of the __typeof__ +use to define the local temporary variable and use the target type +(CURLoption/CURLINFO). This also avoids multiple reports on type +conflicts (if some) by the curlcheck_* macros. + +Note that CURLOPT_* and CURLINFO_* symbols may be deprecated, but not +their values: a curl_easy_setopt call with an integer constant as option +will never report a deprecation. + +Reported-by: Thomas Klausner +Fixes #10148 +Closes #10149 +--- a/include/curl/typecheck-gcc.h ++++ b/include/curl/typecheck-gcc.h +@@ -42,9 +42,8 @@ + */ + #define curl_easy_setopt(handle, option, value) \ + __extension__({ \ +- CURL_IGNORE_DEPRECATION(__typeof__(option) _curl_opt = option;) \ ++ CURLoption _curl_opt = (option); \ + if(__builtin_constant_p(_curl_opt)) { \ +- (void) option; \ + CURL_IGNORE_DEPRECATION( \ + if(curlcheck_long_option(_curl_opt)) \ + if(!curlcheck_long(value)) \ +@@ -120,9 +119,8 @@ + /* wraps curl_easy_getinfo() with typechecking */ + #define curl_easy_getinfo(handle, info, arg) \ + __extension__({ \ +- CURL_IGNORE_DEPRECATION(__typeof__(info) _curl_info = info;) \ ++ CURLINFO _curl_info = (info); \ + if(__builtin_constant_p(_curl_info)) { \ +- (void) info; \ + CURL_IGNORE_DEPRECATION( \ + if(curlcheck_string_info(_curl_info)) \ + if(!curlcheck_arr((arg), char *)) \ + From b68850d256ee7f599a74f2714e3a8cf2d4cd9e43 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:43 +0000 Subject: [PATCH 54/76] net-misc/rsync: Sync with Gentoo It's from Gentoo commit 831dd1209afaf2553baef3264b46b062d76e80b6. --- .../files/rsync-3.2.7-flist-memcmp-ub.patch | 21 +++++++++++++++++++ .../net-misc/rsync/rsync-3.2.4-r3.ebuild | 4 ++-- ...-3.2.7-r1.ebuild => rsync-3.2.7-r2.ebuild} | 18 +++++++++++++--- .../net-misc/rsync/rsync-9999.ebuild | 18 +++++++++++++--- 4 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch rename sdk_container/src/third_party/portage-stable/net-misc/rsync/{rsync-3.2.7-r1.ebuild => rsync-3.2.7-r2.ebuild} (92%) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch b/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch new file mode 100644 index 0000000000..9aa1b93e2c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.2.7-flist-memcmp-ub.patch @@ -0,0 +1,21 @@ +https://github.com/WayneD/rsync/issues/427 +https://github.com/WayneD/rsync/issues/429 +https://github.com/WayneD/rsync/commit/90df93e446f9ebbfd4ce97d6755c5fe1f45f9fd0 + +From 90df93e446f9ebbfd4ce97d6755c5fe1f45f9fd0 Mon Sep 17 00:00:00 2001 +From: Wayne Davison +Date: Sun, 8 Jan 2023 21:35:39 -0800 +Subject: [PATCH] Don't call memcmp() on an empty lastdir. + +--- a/flist.c ++++ b/flist.c +@@ -2367,7 +2367,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) + } + + dirlen = dir ? strlen(dir) : 0; +- if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) { ++ if (dirlen != lastdir_len || (dirlen && memcmp(lastdir, dir, dirlen) != 0)) { + if (!change_pathname(NULL, dir, -dirlen)) + goto bad_path; + lastdir = pathname; + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.4-r3.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.4-r3.ebuild index 05ce39b226..927590cf6b 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.4-r3.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 EAPI=7 @@ -10,7 +10,7 @@ fi WANT_LIBTOOL=none -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit autotools flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r2.ebuild similarity index 92% rename from sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r1.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r2.ebuild index 6c31cf7b85..4dc746f9c9 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 -PYTHON_COMPAT=( python3_{8..10} ) -inherit prefix python-single-r1 systemd +PYTHON_COMPAT=( python3_{9..11} ) +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -76,6 +76,10 @@ else BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" fi +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch +) + pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - 9999 needs commonmark at build time @@ -121,6 +125,14 @@ src_configure() { $(use_enable zstd) ) + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + econf "${myeconfargs[@]}" } diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild index 6c31cf7b85..4dc746f9c9 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Uncomment when introducing a patch which touches configure #RSYNC_NEEDS_AUTOCONF=1 -PYTHON_COMPAT=( python3_{8..10} ) -inherit prefix python-single-r1 systemd +PYTHON_COMPAT=( python3_{9..11} ) +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" @@ -76,6 +76,10 @@ else BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" fi +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch +) + pkg_setup() { # - USE=examples needs Python itself at runtime, but nothing else # - 9999 needs commonmark at build time @@ -121,6 +125,14 @@ src_configure() { $(use_enable zstd) ) + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + econf "${myeconfargs[@]}" } From a9dc92c0c1b14d3c044b2f8f0f9f2d003e4b93b4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:44 +0000 Subject: [PATCH 55/76] net-misc/wget: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild index 70e211e48b..d23a314397 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/wget.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig From 3caab5a94eb8d8880b7a444ee16811cecbc56277 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:49 +0000 Subject: [PATCH 56/76] profiles: Sync with Gentoo It's from Gentoo commit a6d8f02298770349527dcee49cc5a99adcbc5cfa. --- .../profiles/arch/amd64/make.defaults | 2 +- .../profiles/arch/amd64/package.use.mask | 5 + .../profiles/arch/amd64/use.stable.mask | 2 +- .../profiles/arch/amd64/x32/package.use.mask | 1 + .../profiles/arch/arm/armv7a/package.use.mask | 3 +- .../profiles/arch/arm/make.defaults | 2 +- .../profiles/arch/arm/package.use.mask | 3 +- .../profiles/arch/arm/use.stable.mask | 2 +- .../profiles/arch/arm64/make.defaults | 2 +- .../profiles/arch/arm64/use.stable.mask | 2 +- .../profiles/arch/base/package.use.mask | 5 + .../profiles/arch/hppa/make.defaults | 6 +- .../arch/hppa/package.use.stable.mask | 6 +- .../profiles/arch/hppa/use.stable.mask | 9 +- .../profiles/arch/m68k/package.use.mask | 1 + .../profiles/arch/powerpc/package.use.mask | 1 - .../arch/powerpc/package.use.stable.mask | 6 +- .../profiles/arch/powerpc/ppc32/make.defaults | 2 +- .../arch/powerpc/ppc32/package.use.mask | 6 +- .../powerpc/ppc32/package.use.stable.mask | 6 +- .../arch/powerpc/ppc32/use.stable.mask | 7 +- .../arch/powerpc/ppc64/64le/package.mask | 8 +- .../profiles/arch/powerpc/ppc64/make.defaults | 2 +- .../profiles/arch/powerpc/ppc64/package.mask | 8 +- .../arch/powerpc/ppc64/package.use.force | 7 +- .../arch/powerpc/ppc64/use.stable.mask | 2 +- .../profiles/arch/sparc/32ul/package.use.mask | 6 +- .../profiles/arch/sparc/make.defaults | 2 +- .../arch/sparc/package.use.stable.mask | 6 +- .../profiles/arch/sparc/use.stable.mask | 7 +- .../profiles/arch/x86/make.defaults | 2 +- .../profiles/arch/x86/package.mask | 6 +- .../profiles/arch/x86/package.use.stable.mask | 6 +- .../profiles/arch/x86/use.stable.mask | 7 +- .../portage-stable/profiles/arches.desc | 1 + .../profiles/base/make.defaults | 8 +- .../profiles/base/package.use.force | 5 +- .../profiles/base/package.use.mask | 52 +- .../profiles/base/package.use.stable.mask | 6 +- .../profiles/base/use.stable.mask | 5 +- .../linux/amd64/17.0/musl/package.mask | 5 +- .../linux/arm64/17.0/big-endian/systemd/eapi | 1 + .../17.0/big-endian/systemd/merged-usr/eapi | 1 + .../17.0/big-endian/systemd/merged-usr/parent | 2 + .../arm64/17.0/big-endian/systemd/parent | 2 + .../linux/arm64/23.0/big-endian/systemd/eapi | 1 + .../arm64/23.0/big-endian/systemd/parent | 2 + .../profiles/desc/python_single_target.desc | 3 +- .../profiles/desc/python_targets.desc | 3 +- .../profiles/embedded/make.defaults | 2 +- .../features/hardened/amd64/make.defaults | 5 +- .../profiles/features/musl/package.mask | 15 +- .../profiles/features/musl/package.use.mask | 5 +- .../profiles/features/prefix/rpath/packages | 2 +- .../profiles/features/selinux/package.mask | 1 - .../profiles/features/wd40/package.mask | 3 +- .../profiles/features/wd40/package.use.mask | 2 +- .../portage-stable/profiles/license_groups | 12 +- .../profiles/package.deprecated | 15 +- .../portage-stable/profiles/package.mask | 531 ++++++------------ .../portage-stable/profiles/profiles.desc | 4 +- .../profiles/releases/17.0/make.defaults | 2 +- .../profiles/releases/17.0/package.use.force | 2 +- .../profiles/releases/make.defaults | 2 +- .../portage-stable/profiles/updates/1Q-2017 | 28 - .../portage-stable/profiles/updates/1Q-2023 | 1 + .../portage-stable/profiles/updates/2Q-2017 | 4 - .../portage-stable/profiles/updates/3Q-2017 | 23 - .../portage-stable/profiles/updates/4Q-2017 | 6 - 69 files changed, 349 insertions(+), 561 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/merged-usr/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/merged-usr/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/23.0/big-endian/systemd/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/23.0/big-endian/systemd/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2017 create mode 100644 sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2017 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2017 delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2017 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/make.defaults index e7e18ff6a9..d6c8326720 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/make.defaults @@ -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 ARCH="amd64" diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask index 12787fac04..b0e7ddb895 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask @@ -17,6 +17,11 @@ #--- END OF EXAMPLES --- +# Sam James (2023-01-05) +# asm is only available for amd64 and arm, but for arm, is gated +# behind an experimental flag. +>=dev-libs/libsecp256k1-0.2.0 -asm + # Sam James (2022-12-11) # net-libs/rustls-ffi is keyworded here net-misc/curl -rustls -curl_ssl_rustls diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.stable.mask index eb5449388b..2f7f7dbd0e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file requires eapi 5 or later. New entries go on top. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.use.mask index 9e25c7136e..5bc1efcfa7 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.use.mask @@ -41,6 +41,7 @@ www-servers/uwsgi uwsgi_plugins_rados # Michał Górny (2018-01-12) # Those packages require net-libs/nodejs. +dev-lang/nim test-js dev-python/nbdime webtools dev-ruby/ammeter test dev-ruby/jsobfu test diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.use.mask index b987880714..30e3a211c6 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.use.mask @@ -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 # Sam James (2020-10-05) @@ -15,3 +15,4 @@ media-video/ffmpeg -rav1e # Sam James (2020-06-27) # Tests require Valgrind, available on armv7a dev-libs/rapidjson -test +sys-apps/proot -test diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/make.defaults index 8c15da959c..4527d2144a 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/make.defaults @@ -1,4 +1,4 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Main ARM profile diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask index 19dd87fa8d..a359b831e8 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask @@ -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 # Florian Schmaus (2022-11-23) @@ -138,6 +138,7 @@ kde-plasma/kdeplasma-addons webengine # Sam James (2020-06-27) # Tests require Valgrind, not available on (2020-05-17) # Mask until 'app-arch/lxqt-archiver' is keyworded. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask index c0fee12811..106b7593e9 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask @@ -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 # This file requires eapi 5 or later. New entries go on top. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/make.defaults index 2f35acff83..fd42ca3f2c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/make.defaults @@ -1,4 +1,4 @@ -# Copyright 2014-2021 Gentoo Authors +# Copyright 2014-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Main ARM64 (AArch64/ARMv8) profile; endian independent. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask index 75662ccee1..d05e57dc0d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask @@ -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 # # This file requires eapi 5 or later. New entries go on top. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask index 0a693ccb36..fd4c6198dd 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask @@ -1,6 +1,11 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2023-01-05) +# asm is only available for amd64 and arm, but for arm, is gated +# behind an experimental flag. +>=dev-libs/libsecp256k1-0.2.0 asm + # Sam James (2022-12-11) # Unkeyworded dependencies net-misc/curl rustls curl_ssl_rustls diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults index 2908b66bb4..197fd6f830 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults @@ -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 ARCH="hppa" @@ -22,3 +22,7 @@ CHOST_hppa="${CHOST}" # Donnie Berkholz (2006-08-18) # Defaults for video drivers VIDEO_CARDS="fbdev" + +# Hans de Graaff (2023-01-15) +# Temporary mask for https://bugs.gentoo.org/890915 +RUBY_TARGETS="ruby27" diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask index 518ff4aa00..192758d250 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask @@ -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 # When you add an entry to the top of this file, add your name, the date, and @@ -21,10 +21,6 @@ # Unstable test dependencies dev-util/pkgdev test -# Michał Górny (2022-11-06) -# Unmask the target on python-exec while it's masked elsewhere. -dev-lang/python-exec -python_targets_python3_11 - # Sam James (2022-02-02) # net-analyzer/net-snmp is not marked stable on HPPA net-analyzer/ifstat snmp diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask index ab85ab59b7..93c97503dd 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask @@ -1,13 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask -# Sam James (2022-11-08) -# Mask until dev-lang/python:3.11 becomes stable. -python_targets_python3_11 -python_single_target_python3_11 +# Hans de Graaff (2023-01-15) +# Temporary mask for https://bugs.gentoo.org/890915 +ruby_targets_ruby30 # Rolf Eike Beer (2021-11-12) # dev-libs/nspr and dev-libs/nss are not stable on hppa diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask index 49f32e2950..98c973ac29 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask @@ -59,6 +59,7 @@ dev-python/hatchling test dev-python/isort test dev-python/nose test dev-python/numpydoc test +dev-python/pip-run test dev-python/pytest-regressions test dev-python/requests test dev-python/sphinx test diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask index 3d57ab889e..d83ff7d53b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask @@ -232,7 +232,6 @@ net-libs/libproxy kde sys-auth/polkit kde sys-block/gparted kde virtual/notification-daemon kde -x11-wm/sawfish kde # Pacho Ramos (2015-11-15) # Missing keywords diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask index 2b80cef3f8..fe09371634 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask @@ -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 # When you add an entry to the top of this file, add your name, the date, and @@ -17,10 +17,6 @@ #--- END OF EXAMPLES --- -# Michał Górny (2022-11-06) -# Unmask the target on python-exec while it's masked elsewhere. -dev-lang/python-exec -python_targets_python3_11 - # Sam James (2021-10-25) # Various unstable dependencies: # gnome-base/nautilus diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/make.defaults index 0092e22c5c..12251d45c5 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/make.defaults @@ -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 # All extra USE/etc should be specified in sub-profiles. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask index 7938442997..db65690bc3 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask @@ -1,6 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2023-01-05) +# dev-python/pythran fails tests on ppc32 right now, bug #880263 +dev-python/scipy fortran pythran + # Sam James (2022-12-26) # Unkeyworded dependencies dev-util/diffoscope opendocument pascal pdf R diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask index 433b67add5..0c84d0693d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask @@ -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 # When you add an entry to the top of this file, add your name, the date, and @@ -22,10 +22,6 @@ sys-devel/clang-common default-lld sys-devel/llvm binutils-plugin z3 xar -# Michał Górny (2022-11-06) -# Unmask the target on python-exec while it's masked elsewhere. -dev-lang/python-exec -python_targets_python3_11 - # Sam James (2022-07-27) # sys-devel/lld is not marked stable on ppc >=dev-lang/spidermonkey-78 lto diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/use.stable.mask index 5e41fb10eb..f37bb699d2 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/use.stable.mask @@ -1,11 +1,6 @@ -# Copyright 2014-2022 Gentoo Authors +# Copyright 2014-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Sam James (2022-11-08) -# Mask until dev-lang/python:3.11 becomes stable. -python_targets_python3_11 -python_single_target_python3_11 - # Sam James (2022-03-03) # dev-lang/ocaml and dev-ml/* not marked stable here ocaml diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask index 86a0237523..1fd7b40d96 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask @@ -1,6 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Jimi Huotari (2023-01-11) +# Requires media-libs/libva since 29.0.0, which is unmasked here. +->=media-video/obs-studio-29.0.0 + # Michał Górny (2022-08-25) # Only ppc64le binpkg is provided. -dev-python/pypy-exe-bin @@ -16,7 +20,9 @@ # Broken on big endian, but should be fine on le. # bug #818424 -dev-games/openscenegraph +-dev-games/openscenegraph-openmw -dev-games/openscenegraph-qt +-games-engines/openmw -media-libs/openexr -media-libs/ctl -media-gfx/openvdb diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/make.defaults index 6f2df78adc..93e2c5b69f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/make.defaults @@ -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 # All extra USE/etc should be specified in sub-profiles. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask index 96a21d0855..6b90376ee8 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask @@ -1,6 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Jimi Huotari (2023-01-11) +# Requires media-libs/libva since 29.0.0. +>=media-video/obs-studio-29.0.0 + # Sam James (2022-10-08) # sys-boot/gnu-efi isn't keyworded here right now sys-kernel/installkernel-systemd-boot @@ -19,7 +23,9 @@ dev-lisp/sbcl # Broken on big endian. # bug #818424 dev-games/openscenegraph +dev-games/openscenegraph-openmw dev-games/openscenegraph-qt +games-engines/openmw media-libs/openexr media-libs/ctl media-gfx/openvdb diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.force index 1d5796d481..24fcd31f00 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.force @@ -1,11 +1,6 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Georgy Yakovlev (2022-11-10) -# fails with bundled png, so force system one. -# ld.lld: error: undefined symbol: png_init_filter_functions_vsx -www-client/chromium system-png - # Samuli Suominen (2012-10-30) # Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-plasma/kdm gets # stable keyword, this line can be removed. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/use.stable.mask index 49d27fdb81..762eccb758 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file requires eapi 5 or later. New entries go on top. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/32ul/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/32ul/package.use.mask index 3a336f7909..1abf6e0a33 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/32ul/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/32ul/package.use.mask @@ -1,6 +1,10 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner (2023-01-13) +# Fails to build, bug #676060 +dev-libs/openssl asm + # matoro (2022-08-05) # Depends on app-antivirus/clamav. Bug #638888 mail-client/claws-mail clamav diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/make.defaults index 23b5d7dad1..852a8fb95b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/make.defaults @@ -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 ARCH="sparc" diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask index 0e301da22b..f637dd1755 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask @@ -1,10 +1,6 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Michał Górny (2022-11-06) -# Unmask the target on python-exec while it's masked elsewhere. -dev-lang/python-exec -python_targets_python3_11 - # Sam James (2022-09-12) # dev-lang/rust lacks wiring up to use our custom rust-bin bootstrap # tarball, so force system-bootstrap instead (i.e. force using rust-bin diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.stable.mask index c247b6c607..90f7069f2f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.stable.mask @@ -1,14 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask -# Sam James (2022-11-08) -# Mask until dev-lang/python:3.11 becomes stable. -python_targets_python3_11 -python_single_target_python3_11 - # Matt Turner (2022-09-16) # gui-libs/gtk is not stable here gtk4 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/make.defaults index c1f35ac18d..2ff3ba0dff 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # All extra USE/etc should be specified in sub-profiles. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask index 30ad53dd61..9e960f3c60 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask @@ -1,10 +1,6 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Joonas Niilola (2022-12-30) -# Broken on x86, workaround mentioned in bug #887277. ->=www-client/firefox-108.0 - # Viorel Munteanu (2022-12-22) # The x86 build is broken and no longer available. Bug #887831 # Removal on 2023-01-22. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask index b007f38e6f..04b29c0c30 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask @@ -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 # When you add an entry to the top of this file, add your name, the date, and @@ -17,10 +17,6 @@ #--- END OF EXAMPLES --- -# Michał Górny (2022-11-06) -# Unmask the target on python-exec while it's masked elsewhere. -dev-lang/python-exec -python_targets_python3_11 - # Andreas Sturmlechner (2022-09-14) # sci-libs/vtk is not stable on x86 and we don't want to complicate # newer maxima and geant stabilisation, bug #867547, #886975 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask index a0c0ded892..29e2b97d38 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask @@ -1,14 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask -# Sam James (2022-11-08) -# Mask until dev-lang/python:3.11 becomes stable. -python_targets_python3_11 -python_single_target_python3_11 - # Sam James (2020-11-10) # media-gfx/openvdb is not stable on x86 # ... and has failing tests right now anyway diff --git a/sdk_container/src/third_party/portage-stable/profiles/arches.desc b/sdk_container/src/third_party/portage-stable/profiles/arches.desc index 75e4933903..9d3955bc92 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arches.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/arches.desc @@ -32,6 +32,7 @@ amd64-linux testing arm-linux testing arm64-linux testing ppc64-linux testing +riscv-linux testing x86-linux testing arm64-macos testing ppc-macos testing diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults index 332b189ec6..ab69dbfae5 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults @@ -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 # # System-wide defaults for the Portage system @@ -43,7 +43,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" # GOBIN needs to be cleaned as random values in GOBIN can affect the # building of some packages: # https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0 -ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" +ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME GDK_PIXBUF_MODULE_FILE XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" # Variables that are set exclusively by the profile # and not by user configuration files. @@ -101,8 +101,8 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te # Manuel Rüger (2015-09-09) # Default Ruby build target(s) -# Updated to include ruby27 on 2021-10-10 -RUBY_TARGETS="ruby27" +# Updated to include ruby30 on 2023-01-15 +RUBY_TARGETS="ruby27 ruby30" # Andreas K. Hüttel (2022-10-22) # These USE flags are what is common between the various sub-profiles. Stages 2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force index 50837e253e..7521686e4e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force @@ -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 # Matt Turner (2022-12-02) @@ -41,6 +41,7 @@ dev-java/openjdk:17 system-bootstrap >=sys-devel/clang-13.0.1_rc llvm_targets_SystemZ llvm_targets_WebAssembly >=sys-devel/clang-13.0.1_rc llvm_targets_X86 llvm_targets_XCore >=sys-devel/clang-14 llvm_targets_VE +>=sys-devel/clang-16 llvm_targets_LoongArch >=sys-devel/llvm-13.0.1_rc llvm_targets_AArch64 llvm_targets_AMDGPU >=sys-devel/llvm-13.0.1_rc llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF >=sys-devel/llvm-13.0.1_rc llvm_targets_Hexagon llvm_targets_Lanai @@ -50,6 +51,7 @@ dev-java/openjdk:17 system-bootstrap >=sys-devel/llvm-13.0.1_rc llvm_targets_SystemZ llvm_targets_WebAssembly >=sys-devel/llvm-13.0.1_rc llvm_targets_X86 llvm_targets_XCore >=sys-devel/llvm-14 llvm_targets_VE +>=sys-devel/llvm-16 llvm_targets_LoongArch # Sam James (2021-03-08) # Broken without USE=unicode @@ -211,7 +213,6 @@ app-shells/bash:0 readline # Michał Górny (2012-10-14) # Force-enable all PYTHON_TARGETS for python-exec to avoid using private # API. Please remember to keep it in sync with python_targets.desc. -dev-lang/python-exec python_targets_python3_8 dev-lang/python-exec python_targets_python3_9 dev-lang/python-exec python_targets_python3_10 dev-lang/python-exec python_targets_python3_11 diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask index e66012c8c8..eae9c78511 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask @@ -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 # New entries go on top. @@ -6,6 +6,39 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Michał Górny (2023-01-21) +# media-libs/libextractor is masked for removal. +media-plugins/vdr-xineliboutput libextractor + +# Michał Górny (2023-01-21) +# media-libs/qtav is masked for removal. +media-gfx/digikam mediaplayer +media-gfx/kphotoalbum qtav + +# Sam James (2023-01-21) +# Fails to compile: https://github.com/libffi/libffi/issues/760 +dev-libs/libffi exec-static-trampoline + +# Sam James (2023-01-10) +# Needs last-rited www-client/dillo, bug #890244 +mail-client/claws-mail dillo + +# Joonas Niilola (2023-01-08) +# Doesn't compile currently, bug #853094. +>=net-dialup/freeradius-3.2.0 oracle + +# David Seifert (2023-01-04) +# Out of date patchset, warns on latest version about being "expired", +# unofficial and maintainer discourages people upgrading to latest (non-packaged) +# versions of knots too. The upstream maintainer was recently compromised +# and there is no explanation as to how, so continuing to provide these patches +# would be irresponsible. Bug #889326 +dev-util/bitcoin-tx knots +net-libs/libbitcoinconsensus knots +net-p2p/bitcoin-cli knots +net-p2p/bitcoin-qt knots +net-p2p/bitcoind knots + # Matt Turner (2023-01-01) # Depends on nautilus < 43 >=app-text/evince-43.0 nautilus @@ -98,7 +131,7 @@ sys-libs/minizip-ng compat # Georgy Yakovlev (2022-09-17) # po4a crashes while translating # mask for now -=dev-util/schroot-1.6.13_p2 nls +dev-util/schroot nls # Sam James (2022-09-15) # Doesn't work on e.g. glibc systems. Unmasked on the LLVM profiles. @@ -204,13 +237,6 @@ media-video/wireplumber system-service sys-libs/glibc custom-cflags sys-devel/gcc custom-cflags -# Sam James (2022-01-12) -# Unmask PCH for now for GCC to avoid unnecessary rebuilds -# (USE=pch is now use.mask-ed globally) - (2021-12-31) # Rizin tests require a tarball of binaries of ambiguous license. # As such, we cannot properly test it, so mask the flag until this @@ -280,14 +306,6 @@ dev-lang/rust parallel-compiler # Mask experimental options. gui-libs/gtk ffmpeg vulkan -# Sam James (2021-07-24) -# USE=exec-static-trampoline can break consumers due to -# faulty assumptions. Masked for now due to the possibility -# of breaking systems. -# https://archives.gentoo.org/gentoo-dev/message/576259af17d008d4ec935f69a9049af7 -# bug #801109 -dev-libs/libffi exec-static-trampoline - # Marek Szuba (2021-07-14) # Makes two tests fail (when linked against openmpi, at least) due to # incorrect implementation of either MPI support itself or said tests: diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask index e4ade312e3..6045032710 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask @@ -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 # This file requires eapi 5 or later. New entries go on top. @@ -16,10 +16,6 @@ media-libs/gst-plugins-bad qsv # app-text/pandoc is not stable net-libs/gssdp man -# Michał Górny (2022-11-06) -# Unmask the target on python-exec while it's masked elsewhere. -dev-lang/python-exec -python_targets_python3_11 - # Marek Szuba (2022-09-25) # This depends on app-admin/ansible-molecule, which is not stable yet. # Moreover, all but the most recent versions of ansible-molecule diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask index 419ea2fee1..4cb6c49e04 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask @@ -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 # This file requires eapi 5 or later. New entries go on top. @@ -25,8 +25,7 @@ darcs python_targets_pypy3 python_single_target_pypy3 -# Hans de Graaff (2021-10-10) +# Hans de Graaff (2023-01-15) # Currently in testing and not ready to go stable yet. -ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/package.mask index 25a5df5e91..96d0b29f72 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/package.mask @@ -1,10 +1,11 @@ -# Copyright 2020-2022 Gentoo Authors. +# Copyright 2020-2023 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 # Sam James (2022-10-08) # openjdk-bin is available on amd64 musl +# version 8.352_p08 is first openjdk-bin:8 with musl tarball -dev-java/openjdk-bin -dev-java/openjdk-bin:8 + (2020-01-28) # rust-bin is available on amd64 musl diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/eapi new file mode 100644 index 0000000000..7ed6ff82de --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/merged-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/merged-usr/eapi new file mode 100644 index 0000000000..7ed6ff82de --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/merged-usr/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/merged-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/merged-usr/parent new file mode 100644 index 0000000000..c8b1675247 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/merged-usr/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../features/merged-usr diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/parent new file mode 100644 index 0000000000..7e061533c1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/big-endian/systemd/parent @@ -0,0 +1,2 @@ +.. +../../../../../../targets/systemd diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/23.0/big-endian/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/23.0/big-endian/systemd/eapi new file mode 100644 index 0000000000..7ed6ff82de --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/23.0/big-endian/systemd/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/23.0/big-endian/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/23.0/big-endian/systemd/parent new file mode 100644 index 0000000000..7e061533c1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/23.0/big-endian/systemd/parent @@ -0,0 +1,2 @@ +.. +../../../../../../targets/systemd diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc index 6c97869494..e0f1bed263 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc @@ -1,9 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors. +# Copyright 1999-2023 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags. -python3_8 - Build for Python 3.8 only python3_9 - Build for Python 3.9 only python3_10 - Build for Python 3.10 only python3_11 - Build for Python 3.11 only diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc index ad77fbf5b6..7b5841ecd4 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc @@ -1,9 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors. +# Copyright 1999-2023 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags. -python3_8 - Build with Python 3.8 python3_9 - Build with Python 3.9 python3_10 - Build with Python 3.10 python3_11 - Build with Python 3.11 diff --git a/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults index 050826ef69..5b6dc2b406 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults @@ -70,7 +70,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" # GOBIN needs to be cleaned as random values in GOBIN can affect the # building of some packages: # https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0 -ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" +ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME GDK_PIXBUF_MODULE_FILE XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" # Tiziano Müller (2010-01-24) # We usually don't want python to (re)write .py[co] files during phase runs diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/make.defaults index 1d58d93d31..e8f0bdf8ba 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/make.defaults @@ -1,5 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation. +# Copyright 1999-2023 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 -USE="-pic" - +USE="cet -pic" diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask index 65874303fe..1da0c19018 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask @@ -1,6 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Maciej Barć (2023-01-07) +# Currently ACL2 (sci-mathematics/acl2) unconditionally depends +# on SBCL (dev-lisp/sbcl), which is masked on the musl profile. +sci-mathematics/acl2 + # Sam James (2023-01-02) # Uses error.h, bug #888956 =sys-libs/liburing-2.3 @@ -11,7 +16,12 @@ dev-libs/intel-compute-runtime # Sam James (2022-12-17) # Segfaults when building on musl, bug #885501 ->=sys-devel/gcc-12.2.1_p20221203:12 +=sys-devel/gcc-10.4.1_p20221208:10 +=sys-devel/gcc-10.4.1_p20221222:10 +=sys-devel/gcc-11.3.1_p20221209:11 +=sys-devel/gcc-11.3.1_p20221223:11 +=sys-devel/gcc-12.2.1_p20221231:12 +=sys-devel/gcc-12.2.1_p20230121:12 # Andrey Grozin (2022-12-01) # These packages depend on dev-lisp/sbcl unconditionally @@ -211,7 +221,7 @@ media-video/amdgpu-pro-amf media-video/dvbackup media-video/makemkv media-video/popcorntime-bin -net-im/discord-bin +net-im/discord net-im/element-desktop-bin net-im/gitter-bin net-im/mattermost-desktop-bin @@ -310,7 +320,6 @@ dev-libs/cudnn-frontend dev-python/pycuda dev-util/nvidia-cuda-sdk dev-util/nvidia-cuda-toolkit -media-video/nvidia-video-codec dev-libs/optix x11-drivers/nvidia-drivers x11-misc/primus diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask index ce364a3891..3f2f720c2b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask @@ -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 # Andrew Ammerlaan (2022-12-10) @@ -108,7 +108,8 @@ dev-lang/gforth check net-misc/iputils idn # See bug #504200, #723370 -sys-devel/gcc sanitize nls vtv + # even with --without-included-gettext diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/rpath/packages b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/rpath/packages index 9e59660f04..2fa62df312 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/rpath/packages +++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/rpath/packages @@ -1,3 +1,3 @@ -# Copyright 1999-2022 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.mask index 6fa5977598..aa5f3c6bc8 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.mask @@ -123,7 +123,6 @@ =sec-policy/selinux-logsentry-2.20221101-r1 =sec-policy/selinux-logwatch-2.20221101-r1 =sec-policy/selinux-lpd-2.20221101-r1 -=sec-policy/selinux-mailman-2.20221101-r1 =sec-policy/selinux-makewhatis-2.20221101-r1 =sec-policy/selinux-mandb-2.20221101-r1 =sec-policy/selinux-matrixd-2.20221101-r1 diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask index 8bc372a32f..dd5994ae17 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask @@ -41,6 +41,7 @@ dev-python/openstacksdk dev-python/os-client-config dev-python/osc-lib dev-python/paramiko +dev-python/pooch dev-python/pyfuse3 >=dev-python/pyopenssl-22 dev-python/pymdown-extensions @@ -67,6 +68,7 @@ dev-python/twine dev-python/watchfiles dev-python/wcmatch dev-ros/roswtf +dev-util/buildbot-worker dev-util/cargo-c dev-util/cbindgen dev-util/git-delta @@ -85,7 +87,6 @@ gnome-extra/sushi >=media-gfx/libimagequant-4 media-libs/libavif >=media-libs/libopenraw-0.3.2 -media-video/ogmrip media-video/rav1e net-im/gajim >=net-irc/polari-3.37 diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask index c1cad5fead..02b2874cd1 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask @@ -98,7 +98,7 @@ media-libs/imlib2 svg # Michał Górny (2021-11-26) # These package flags require dev-python/cryptography which -- due # to the dependency on Rust -- is no longer portable to ${arch}. -dev-python/dnspython dnssec +dev-python/dnspython dnssec test dev-python/twisted conch ssl dev-python/urllib3 test net-fs/samba addc ads diff --git a/sdk_container/src/third_party/portage-stable/profiles/license_groups b/sdk_container/src/third_party/portage-stable/profiles/license_groups index 44388deb08..3864349505 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/license_groups +++ b/sdk_container/src/third_party/portage-stable/profiles/license_groups @@ -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 # Please report bugs or other requests at bugs.gentoo.org and assign to @@ -15,7 +15,7 @@ # https://www.gnu.org/licenses/license-list.html # GPL or LGPL with various exceptions are also included here, because # they are more permissive than the licenses they are based on. -GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FSFAP FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2+-with-openssl-exception GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-2+-with-Pyinstaller-Bootloader-exception GPL-3 GPL-3+ GPL-3+-with-autoconf-exception GPL-3+-with-font-exception GPL-3-with-font-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 wxWinLL-3.1 ZLIB ZPL +GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FSFAP FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2+-with-openssl-exception GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-2+-with-Pyinstaller-Bootloader-exception GPL-3 GPL-3+ GPL-3+-with-autoconf-exception GPL-3+-with-font-exception GPL-3-with-font-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 wxWinLL-3.1 ZLIB ZPL # Free software licenses approved by the FSF FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4 CDDL CeCILL-B CeCILL-C CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 FraunhoferFDK gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL-1.0 Zend-2.0 @@ -23,7 +23,7 @@ FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4 # Licenses approved by the Open Source Initiative # https://www.opensource.org/licenses # Note that the FSF lists these as nonfree: Artistic NOSA Watcom-1.0 -OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MirOS MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL-1.0 Sleepycat Unicode-DFS-2016 UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL +OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MirOS MIT MIT-0 MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL-1.0 Sleepycat Unicode-DFS-2016 UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL # Misc licenses that are probably free software, i.e. follow the # Free Software Definition at https://www.gnu.org/philosophy/free-sw.html @@ -32,7 +32,7 @@ OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Ar # Licenses in this list should NOT appear directly or indirectly in # @FSF-APPROVED or @OSI-APPROVED. # Note: Licenses for fonts should be included in @MISC-FREE-DOCS. -MISC-FREE AIFFWriter.m AOM Allegro alternate AMPAS BEER-WARE boehm-gc BSD-1 BSD-2-with-patent BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 CAOSL CDDL-1.1 CDDL-Schily CMake coldspringharbor CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLGPL-2.1 LPPL-1.3 lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-AMD NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA RtMidi rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda trio UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH +MISC-FREE AIFFWriter.m AOM Allegro alternate AMPAS BEER-WARE boehm-gc BSD-1 BSD-2-with-patent BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 CAOSL CDDL-1.1 CDDL-Schily CMake coldspringharbor CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLGPL-2.1 LPPL-1.3 lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-AMD NCSA-HDF netcat NEWLIB ngrep NPSL-0.95 Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA RtMidi rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda trio UCAR-Unidata URT VTK w3m wm2 xbatt xboing XC Xdebug xtrs ZSH # Metaset for all free software FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE @@ -67,13 +67,13 @@ FREE @FREE-SOFTWARE @FREE-DOCUMENTS # - IF (and only if) there is an explicit inclusion requirement, # USE=bindist MUST cause a copy of the license to be installed # in a file location compliant with the license -BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedist intel-ucode ipw2100-fw ipw2200-fw ipw3945 ISSL JSON linux-fw-redistributable LSI-tw_cli Mellanox-AS-IS MicroChip-SDCC no-source-code NVIDIA-r1 NVIDIA-r2 qlogic-fibre-channel-firmware shmux SmartLabs unRAR +BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedist intel-ucode ipw2100-fw ipw2200-fw ipw3945 ISSL JSON linux-fw-redistributable LSI-tw_cli Mellanox-AS-IS MicroChip-SDCC no-source-code NVIDIA-r1 NVIDIA-r2 qlogic-fibre-channel-firmware shmux unRAR ###################################################################### # License agreements that try to take away your rights. These are more # restrictive than "all-rights-reserved" or require explicit approval. -EULA 2dboy-EULA AMD-GPU-PRO-EULA android AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion JoyPixels LOKI-EULA MakeMKV-EULA Microsemi microsoft-edge Microsoft-vscode Mojang ms-teams-pre MTA-0.5 NVIDIA-CUDA NVIDIA-SDK OPERA-2018 PAPERS-PLEASE PassMark-EULA PICO-8 Primate-Plunge PUEL PUEL-11 Q3AEULA-20000111 QUAKE4 RAR sfpg Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone +EULA 2dboy-EULA AMD-GPU-PRO-EULA android AnyDesk-TOS Aseprite-EULA baudline bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion JoyPixels LOKI-EULA MakeMKV-EULA Microsemi microsoft-edge Microsoft-vscode Mojang ms-teams-pre MTA-0.5 NVIDIA-CUDA NVIDIA-SDK OPERA-2018 PAPERS-PLEASE PassMark-EULA PICO-8 Primate-Plunge PUEL-11 Q3AEULA-20000111 QUAKE4 RAR sfpg Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone # Deprecated license labels, used by repoman and pkgcheck #DEPRECATED (currently none) diff --git a/sdk_container/src/third_party/portage-stable/profiles/package.deprecated b/sdk_container/src/third_party/portage-stable/profiles/package.deprecated index 07895dbb05..26bcae9746 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.deprecated +++ b/sdk_container/src/third_party/portage-stable/profiles/package.deprecated @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Michał Górny (2023-01-18) +# Renamed to dev-python/pyproject-hooks (with upstream module name change). +dev-python/pep517 + # Sam James (2022-12-29) # Doesn't work correctly on newer kernels/hardware. Events may go unreported # if using sys-apps/edac-utils. See app-admin/rasdaemon's README for the technical @@ -73,10 +77,13 @@ app-accessibility/at-spi2-atk dev-libs/atk # Michał Górny (2022-06-19) -# dev-python/tox is a wrapper to run test suite in a virtual -# environment, possibly for multiple Python versions. It cannot really -# work inside network sandbox, and your package probably does not use -# it anyway. +# Test automation tools. They are generally used to run the test suite +# across multiple Python versions, i.e. what our eclasses do for you +# already. They usually can't work inside network sandbox (since they +# fetch and install all the dependencies inside the venv), so even +# if they are listed in dependencies, your package probably does not +# actually need them to run tests. +dev-python/nox dev-python/tox # Michał Górny (2022-06-17) diff --git a/sdk_container/src/third_party/portage-stable/profiles/package.mask b/sdk_container/src/third_party/portage-stable/profiles/package.mask index 85d1b98286..2630b81a20 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask @@ -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 #################################################################### @@ -33,6 +33,173 @@ #--- END OF EXAMPLES --- +# Sam James (2023-01-23) +# Please upgrade to >=app-eselect/eselect-wxwidgets-20230114-r1 as -r0 may +# lead to build failures. +=app-eselect/eselect-wxwidgets-20230114 + +# Michał Górny (2023-01-21) +# Packages that are incompatible with ffmpeg-5. +# +# media-libs/libextractor: no Gentoo maintainer, ver from 2019, bug #834382 +# media-libs/qtav: no Gentoo maintainer, no porting progress, bug #834386 +# media-plugins/vdr-vaapidevice: no activity since 2019, bug #834390 +# media-sound/potamus: last rel. 2018, one commit in 2020, bug #834396 +# media-video/ffmpeg2theora: no activity since 2016, bug #834403 +# +# Removal on 2023-02-20. +media-libs/libextractor +media-libs/qtav +media-plugins/vdr-vaapidevice +media-sound/potamus +media-video/ffmpeg2theora + +# Michał Górny (2023-01-21) +# Obsoleted in favor of using extract-on-the-first-run feature +# of games-strategy/wargus. +# Removal on 2023-02-20. Bug #578340. +games-strategy/wargus-data + +# Joonas Niilola (2023-01-21) +# 102.7.0 has a critical authentication issue with Microsoft 365 +# Business accounts. Fix should land in 102.7.1. If you're not affected +# and really want this update, please unmask it for yourself. +~mail-client/thunderbird-102.7.0 +~mail-client/thunderbird-bin-102.7.0 + +# Hans de Graaff (2023-01-21) +# No longer maintained upstream and missing recent security fixes. +# Use a newer Rails version instead. +# This mask also includes several supporting or rails 5.2-only packages. +# Masked for removal after 2023-02-21. +dev-ruby/actioncable:5.2 +dev-ruby/actionmailer:5.2 +dev-ruby/actionpack:5.2 +dev-ruby/actionview:5.2 +dev-ruby/activejob:5.2 +dev-ruby/activemodel:5.2 +dev-ruby/activerecord:5.2 +dev-ruby/activestorage:5.2 +dev-ruby/activesupport:5.2 +dev-ruby/rails:5.2 +dev-ruby/railties:5.2 +dev-ruby/arel +=www-apps/redmine-4.2.9 + +# Andreas Sturmlechner (2023-01-20) +# KDE Plasma 5.26.90 (5.27 Beta) mask +# Pre-release version - happy testing! +~kde-plasma/bluedevil-5.26.90 +~kde-plasma/breeze-5.26.90 +~kde-plasma/breeze-grub-5.26.90 +~kde-plasma/breeze-gtk-5.26.90 +~kde-plasma/breeze-plymouth-5.26.90 +~kde-plasma/discover-5.26.90 +~kde-plasma/drkonqi-5.26.90 +~kde-plasma/kactivitymanagerd-5.26.90 +~kde-plasma/kde-cli-tools-5.26.90 +~kde-plasma/kde-gtk-config-5.26.90 +~kde-plasma/kdecoration-5.26.90 +~kde-plasma/kdeplasma-addons-5.26.90 +~kde-plasma/kgamma-5.26.90 +~kde-plasma/khotkeys-5.26.90 +~kde-plasma/kinfocenter-5.26.90 +~kde-plasma/kmenuedit-5.26.90 +~kde-plasma/kpipewire-5.26.90 +~kde-plasma/kscreen-5.26.90 +~kde-plasma/kscreenlocker-5.26.90 +~kde-plasma/ksshaskpass-5.26.90 +~kde-plasma/ksystemstats-5.26.90 +~kde-plasma/kwallet-pam-5.26.90 +~kde-plasma/kwayland-integration-5.26.90 +~kde-plasma/kwin-5.26.90 +~kde-plasma/kwrited-5.26.90 +~kde-plasma/layer-shell-qt-5.26.90 +~kde-plasma/libkscreen-5.26.90 +~kde-plasma/libksysguard-5.26.90 +~kde-plasma/libkworkspace-5.26.90 +~kde-plasma/milou-5.26.90 +~kde-plasma/oxygen-5.26.90 +~kde-plasma/oxygen-sounds-5.26.90 +~kde-plasma/plasma-browser-integration-5.26.90 +~kde-plasma/plasma-desktop-5.26.90 +~kde-plasma/plasma-disks-5.26.90 +~kde-plasma/plasma-firewall-5.26.90 +~kde-plasma/plasma-integration-5.26.90 +~kde-plasma/plasma-meta-5.26.90 +~kde-plasma/plasma-nm-5.26.90 +~kde-plasma/plasma-pa-5.26.90 +~kde-plasma/plasma-sdk-5.26.90 +~kde-plasma/plasma-systemmonitor-5.26.90 +~kde-plasma/plasma-thunderbolt-5.26.90 +~kde-plasma/plasma-workspace-5.26.90 +~kde-plasma/plasma-workspace-wallpapers-5.26.90 +~kde-plasma/plasma-vault-5.26.90 +~kde-plasma/plymouth-kcm-5.26.90 +~kde-plasma/polkit-kde-agent-5.26.90 +~kde-plasma/powerdevil-5.26.90 +~kde-plasma/sddm-kcm-5.26.90 +~kde-plasma/systemsettings-5.26.90 +~kde-plasma/xdg-desktop-portal-kde-5.26.90 +~kde-plasma/xembed-sni-proxy-5.26.90 + +# Alfredo Tupone (2023-01-18) +# Masked for removal in 30 days. +# Not maintained (2006), no rev dep, bugs +# (bug #891283) +dev-tcltk/tclperl + +# David Seifert (2023-01-14) +# Py3.8 only backports +dev-python/backports-tempfile +dev-python/backports-weakref +dev-python/backports-zoneinfo +dev-python/pkgutil_resolve_name + +# Andreas Sturmlechner (2023-01-10) +# Unmaintained and reportedly broken by KDE Plasma 5.25 already. +# Masking current stable version is the first step towards last-rites. +# Consider migrating away from latte-dock for your workflow. +# See also: https://tinyurl.com/39dkw43a (links to reddit) +# Removal on 2023-01-30. +=kde-misc/latte-dock-0.10.8* + +# Jonas Stein (2023-01-09) +# Dead upstream, open bugs unmaintained. +# Removal after 2023-03-01. Bug #890244. +www-client/dillo + +# John Helmert III (2023-01-08) +# Multiple vulnerabilities include remote code execution, maintainer +# needed, removal in 30 days. Bug #834501 +dev-util/artifactory-bin + +# Michael Mair-Keimberger (2023-01-08) +# Broken since many years, no reverse dependencies, last release from 2000 +# Bug #678518. Removal on 2023-02-08. +net-dns/dnswalk + +# Michael Mair-Keimberger (2023-01-08) +# EAPI=6, Installs only card pictures and has no reverse dependencies. +# Bug #805278. Removal on 2023-02-08. +dev-games/cardpics + +# Michael Mair-Keimberger (2023-01-08) +# Dependencies of games-server/cyphesis, which got removed ~4 years ago, no +# other reverse dependencies. Bug #728230 +# Removal on 2023-02-08. +dev-games/mercator +dev-games/wfmath + +# Sam James (2023-01-05) +# Breaks reverse dependencies: bug #889694, bug #888579. +=sys-fs/btrfs-progs-6.1.1 + +# David Seifert (2023-01-02) +# EAPI 6, pretty much no upstream activity, outdated, last upstream +# release over 3 years ago, no revdeps. Removal on 2023-02-01. +dev-cpp/pngpp + # Jonas Stein (2023-01-01) # Package is broken and unusable, no activity upstream. # Removal after 2023-02-01. Bug #722568. @@ -43,11 +210,6 @@ net-analyzer/chaosreader # Removal: 2023-01-30. Bug #889200. app-containers/docker-gc -# Arthur Zamarin (2022-12-31) -# EAPI=6 ebuild, live only packages for 6 years! -# Removal: 2023-01-30. Bug #889198. -app-vim/lightline - # Arthur Zamarin (2022-12-31) # Live only packages for 4 years! # Removal: 2023-01-30. Bug #889196. @@ -79,7 +241,7 @@ sys-auth/pam_fprint # Sam James (2022-12-27) # Obsolete and incompatible with app-alternatives/* (see news item). -# Removal on 2023-01-27. bug #886019 and bug #886021 respectivly. +# Removal on 2023-01-27. bug #886019 and bug #886021 respectively. app-eselect/eselect-awk app-eselect/eselect-sh @@ -118,13 +280,6 @@ dev-python/pytest-toolbox # Removal on 2023-01-24. Bug #843344. app-portage/gander -# Michał Górny (2022-12-25) -# make.conf writing is broken and package.use support incomplete. -# Last release in 2013. Attempted unsuccessfully fixing it in 2017. -# Use an editor instead. -# Removal on 2023-01-24. Bug #888423. -app-portage/flaggie - # Hans de Graaff (2022-12-25) # Last release in 2018. Poor quality C extension code. Package # consistently segfaults on it tests with the latest ruby versions. @@ -652,17 +807,6 @@ sci-chemistry/votca-csgapps sci-chemistry/votca-xtp sci-libs/votca-tools -# Matt Turner (2022-12-21) -# Archived upstream, now that fwupd can handle updates. -# Removal on 2023-01-20. -media-gfx/colorhug-client - -# Matt Turner (2022-12-21) -# No reverse dependencies. GTK 4 doesn't use it. -# See https://gitlab.gnome.org/GNOME/atkmm/-/issues/4 -# Removal on 2023-01-20. -dev-cpp/atkmm:2.36 - # Michał Górny (2022-12-21) # The mauve project is no longer maintained upstream, and the actual # program has been removed from Gentoo in 2016. These are leftover @@ -684,168 +828,10 @@ dev-db/mysql-super-smack # Removal on 2023-01-20. Bug #737842. dev-php/phptal -# Michał Górny (2022-12-20) -# Pending version bump since 2015. No new upstream releases since. -# Removal on 2023-01-19. Bug #887489. -sys-cluster/ganglia - -# Michał Górny (2022-12-20) -# Unmaintained. Pending version bump since 2019. Even then, the newest -# upstream release has known vulnerabilities. -# Removal on 2023-01-19. Bug #696480. -sys-cluster/ganglia-web - -# Michał Górny (2022-12-20) -# Proprietary MPEG library that is no longer fetchable. No reverse -# dependencies. -# Removal on 2023-01-19. Bug #759190. -media-video/mpeg2vidcodec - -# Michał Górny (2022-12-20) -# An unmaintained library that was "quickly whipped up for some demos". -# Last bumped in 2011. No reverse dependencies. -# Removal on 2023-01-19. Bug #847406. -media-libs/guilib - # Georgy Yakovlev (2022-12-19) # This version currently is not compatible with kernel build (yet) ~dev-util/bindgen-0.63.0 -# Matt Turner (2022-12-19) -# Only reverse dependency was x11-terms/eterm which was removed almost a year -# ago. -# Removal on 2023-01-20. Bug #875143. -x11-libs/libast - -# Michał Górny (2022-12-19) -# Unmaintained. The current sawfish version in ::gentoo is a prerelease -# from 2017, there was a single release in 2021. Bugs are accumulating. -# Includes dependencies specific to Sawfish. -# Removal on 2023-01-18. Bug #637978. -dev-libs/librep -x11-libs/rep-gtk -x11-themes/sawfish-themes -x11-wm/sawfish - -# Andreas Sturmlechner (2022-12-18) -# Bundled by >=dev-util/hip-5, removal on 2023-01-19 -dev-libs/rocclr - -# Andreas Sturmlechner (2022-12-18) -# Stuck at 2.7.0, no revdeps; removal on 2023-01-19 -dev-libs/rocm-hostcall - -# Pacho Ramos (2022-12-18) -# Dead for ages, still included and barely maintained in bluez[deprecated]. -# See bug #885459 -# Removal: 2023-01-17. Bug #885459. -net-wireless/bluez-hcidump - -# Michał Górny (2022-12-17) -# The new version requires `multipart` that conflicts -# with dev-python/python-multipart used by dev-python/starlette. -# No reverse dependencies. -# Removal on 2023-01-16. Bug #886475. -dev-python/test_server - -# Michał Górny (2022-12-17) -# Discontinued upstream. Fails to build for some users. No reverse -# dependencies. -# Removal on 2023-01-16. Bug #650346. -dev-perl/perl-mozldap - -# Michał Górny (2022-12-17) -# No longer downloadable. Pending version bump with no reply from -# the maintainer. -# Removal on 2023-01-16. Bug #786912. -media-gfx/iscan-plugin-network-nt - -# Michał Górny (2022-12-17) -# Merged into sys-apps/util-linux. -# Removal on 2023-01-16. Bug #867220. -net-wireless/rfkill - -# Michał Górny (2022-12-16) -# Requires legacy gnome-base/gconf. A number of other unresolved -# issues. Last release in 2014. -# Removal on 2023-01-15. Bug #873871. -media-video/ogmrip -media-video/shrip - -# Michał Górny (2022-12-16) -# Multiple build failures reported. Last bumped in 2010. -# Homepage gone. -# Removal on 2023-01-15. Bug #839723. -net-firewall/nufw - -# Michał Górny (2022-12-16) -# Unmaintained. Broken with >=net-nds/openldap-2.6. -# Last release in 2009. -# Removal on 2023-01-15. Bug #835649. -net-nds/adtool - -# Michał Górny (2022-12-16) -# The distfile was removed from Gentoo servers in 2021, and it is -# unclear if we were allowed to host it in the first place. Also, -# it had a build failure reported in 2020. No reverse dependencies. -# Removal on 2023-01-15. Bug #790026. -sci-libs/libcmatrix - -# Hans de Graaff (2022-12-16) -# ruby27-only package. No longer maintained upstream. -# No reverse dependencies. Masked for removal in 30 days. -dev-ruby/daemon_controller - -# Hans de Graaff (2022-12-16) -# ruby27-only package. No longer maintained upstream. -# No reverse dependencies. Masked for removal in 30 days. -dev-ruby/ferret - -# Michał Górny (2022-12-16) -# Not installable since at least Dec 2020 due to checksum mismatch. -# Ebuild not touched since 2018. -# Removal on 2023-01-15. Bug #759121. -games-puzzle/mindless - -# Michał Górny (2022-12-16) -# NTLK relies on a large number of corpora that either have unknown -# license, a non-free license or that may be in violation of copyright. -# We have been rubber stamping over this in dev-python/nltk-data -# via LICENSE=all-rights-reserved + RESTRICT=bindist but this -# is not a feasible long-term solution. -# -# dev-python/lunr is the only revdep and has no reverse dependencies -# itself. -# -# Removal on 2023-01-15. Bug #886203. -dev-python/lunr -dev-python/nltk -dev-python/nltk-data - -# Michał Górny (2022-12-15) -# Fails to build since 2019. Last bumped in 2017. -# Removal on 2023-01-14. Bug #688950. -sci-astronomy/skycat - -# Marco Scardovi (2022-12-15) -# We are literally the only distro that still have -# an installation option for that package. -# It still uses EAPI 6 and no real support since -# years. -# Removal on 2023-01-14. Bug #885605 -net-print/kyocera-mita-ppds - -# Marco Scardovi (2022-12-15) -# Dead upstream, dead homepage, dead symlinks, -# no revdeps and no version bump since 2011 -# Removal on 2023-01-14. Bug #884881 -net-print/apsfilter - -# James Le Cuirot (2022-12-14) -# Merged into games-engines/scummvm a while back. No longer maintained upstream. -# Removal in 30 days. -games-engines/residualvm - # Jaco Kroon (2022-12-14) # Multiple open bugs (bug #870910, bug #877731, bug #884815), only one of which # is trivial to solve. @@ -859,191 +845,33 @@ games-engines/residualvm # Removal on 2023-01-31. net-voip/captagent -# Hans de Graaff (2022-12-11) -# ruby27-only package. No reverse dependencies. -# Last release in 2012. Removal in 30 days. -dev-ruby/log_buddy - -# Hans de Graaff (2022-12-11) -# ruby27-only slot. No reverse dependencies. -# Use a newer mime-types slot. -# Removal in 30 days. -dev-ruby/mime-types:2 - -# Hans de Graaff (2022-12-11) -# ruby27-only package. No reverse dependencies. -# Last release in 2013. Removal in 30 days. -dev-ruby/nagios_analyzer - -# Hans de Graaff (2022-12-11) -# ruby27-only package. No reverse dependencies. -# Last release in 2009. Removal in 30 days. -dev-ruby/ntlm-http - -# Hans de Graaff (2022-12-11) -# ruby27-only package. No reverse dependencies. -# Removal in 30 days. -dev-ruby/posix-spawn - # Jonas Stein (2022-12-11) # Unfetchable and mirror-restricted. # Upstream discontinued # Removal after 2023-02-01. Bug #884715. dev-cpp/sourcetrail -# Andreas K. Hüttel (2022-12-10) -# Fails to build with recent perl. No maintainer, no revdeps. -# Removal in 30 days. Bug 849518 -net-p2p/opendchub - # Sam James (2022-12-09) # Breaks compilation of reverse dependencies with broken pkgconfig (pc) file # bug #885075, https://github.com/libarchive/libarchive/issues/1766 =app-arch/libarchive-3.6.2 -# Sam James (2022-12-09) -# mpc.h breaks compilation of reverse dependencies, reported upstream to ML -=dev-libs/mpc-1.3.0 - -# Michał Górny (2022-12-09) -# Unfetchable as the upstream homepage is gone, and mirror-restricted. -# No package activity since 2018. -# Removal on 2023-01-08. Bug #668090. -games-strategy/netherearth - # Michał Górny (2022-12-08) # Seems to break some logic in pkg_resources. Masked for the time being # to prevent breakage. >=dev-python/packaging-22.0 -# Ionen Wolkens (2022-12-07) -# Formerly added to apply binary git patches to wine-staging without git, but -# has not been used since 2017 and stuck on EAPI-6. Alternatives: dev-vcs/git -# Removal: 2023-01-06. -dev-util/patchbin - -# Sam James (2022-12-07) -# HOMEPAGE & remote-id are for a different project, SRC_URI is gone, -# only results on Google are for Gentoo mirrors, EAPI 6. Removal on 2023-01-07. -# bug #630264, bug #655964, bug #750071. -dev-vcs/git-pimp - -# Sam James (2022-12-07) -# These versions have been masked for testing since 2014(!). These versions -# had a controversial licence change and therefore had limited adoption. -# See also the old 2021-05-30-deprecate-old-bdb-slots news item for -# additional context. -# Removal on 2023-01-07. -=sys-libs/db-6.1* -=sys-libs/db-6.2* -=sys-libs/db-18.1* - -# Naohiro Aota (2022-12-07) -# Masked for removal in 30 days. Depends on gnome-base/gconf. Last release -# in 2011. See bug #873880. -sys-apps/gpet - -# David Seifert (2022-12-06) -# EAPI 6, untouched for years, no revdeps. Removal on 2023-01-05. -media-video/nvidia-video-codec - -# Sam James (2022-12-06) -# Broke C++ reverse dependencies. Please upgrade to 1.1.0-r1. See bug #884369. -=x11-libs/libICE-1.1.0 - -# Hans de Graaff (2022-12-05) -# ruby27-only package. No longer maintained upstream. Last release in 2017. -# No reverse dependencies. Removal in 30 days. -dev-ruby/hipchat - -# Hans de Graaff (2022-12-05) -# This package has been subsumed into its only consumer: -# dev-ruby/nio4r. It is no longer developed, and its last standalone -# release was 11 years ago. Removal in 30 days. -dev-ruby/iobuffer - -# Marek Szuba (2022-12-05) -# No releases since 2003 (!), upstream effectively dead, no Unicode support, -# EAPI 6. Removal in 30 days (#884429) -app-editors/elvis - -# Robin H. Johnson (2022-12-04) -# sys-boot/mbr-gpt was a bizzare package extremely sensitive to compiler & -# linker changes. I don't know of any remaining consumers other than one weird -# system I have. -# If you're a consumer: syslinux gptmbr was the successor to this approach, -# you'll need to replace the contents of your BIOS Boot Partition, because it's -# not a direct 1:1 change. -# Only upstream release in 2008. Removal in 30 days. -sys-boot/mbr-gpt - -# Hans de Graaff (2022-12-03) -# ruby27-only package with no reverse dependencies. -# Last release in 2019. Removal in 30 days. -dev-ruby/logue - -# Hans de Graaff (2022-12-04) -# Obsolete slot without reverse dependencies. Use a newer -# public_suffix slot instead. Masked for removal in 30 days. -dev-ruby/public_suffix:3 - -# Hans de Graaff (2022-12-04) -# Obsolete slot without reverse dependencies. Use a newer -# rspec-rails slot instead. Masked for removal in 30 days. -dev-ruby/rspec-rails:4 - -# Hans de Graaff (2022-12-04) -# Obsolete slot without reverse dependencies. Use a newer -# selenium-webdriver slot instead. Masked for removal in 30 days. -dev-ruby/selenium-webdriver:3 - -# Hans de Graaff (2022-12-03) -# ruby27-only packages with no other reverse dependencies. -# Last releases in 2013 and 2015. Removal in 30 days. -dev-ruby/textpow -dev-ruby/ultraviolet - -# Hans de Graaff (2022-12-03) -# Obsolete slot without reverse dependencies. Use a newer vcr -# slot instead. Masked for removal in 30 days. -dev-ruby/vcr:3 - -# Sam James (2022-12-03) +# Stephan Hartmann (2023-01-15) # Dev channel releases are only for people who # are developers or want more experimental features # and accept a more unstable release. ->=www-client/chromium-110 - -# Hans de Graaff (2022-12-03) -# Obsolete slot without reverse dependencies. Use a newer faraday -# slot instead. Masked for removal in 30 days. -dev-ruby/faraday:0 - -# Hans de Graaff (2022-12-03) -# Obsolete slot without reverse dependencies. Use a newer net-ssh -# slot instead. Masked for removal in 30 days. -dev-ruby/net-ssh:5 - -# Hans de Graaff (2022-12-03) -# ruby27-only packages. No recent releases. No reverse dependencies -# anymore. Maksed for removal in 30 days. -dev-ruby/rspec-retry - -# Oz Tiram (2022-12-03) -# Mate-desktop no longer supports gtk+:2, so there is -# no need for this package. Removal on 2023-01-03. -x11-themes/mate-themes-meta +>=www-client/chromium-111 # Piotr Karbowski (2022-11-29) # Multiple stability issues, deadlocks on exit, broken API. # Bug #883559 =net-p2p/qbittorrent-4.5.0 -# David Seifert (2022-11-27) -# Broke API for C++, causes massive carnage for consumers. -# Bug #883223. -~dev-libs/glib-2.74.2 - # Matt Turner (2022-11-16) # Packages or their dependencies have not been ported to libsoup:3.0, while # other non-slotted dependencies have been. @@ -1062,11 +890,6 @@ net-misc/gnome-online-miners =net-misc/asterisk-opus-20* =net-misc/asterisk-g729-20* -# Sam James (2022-10-28) -# Please upgrade to >=media-libs/fontconfig-2.14.1-r1 for fixed -# cache dir to avoid sandbox violation errors, bug #878471. -=media-libs/fontconfig-2.14.1 - # John Helmert III (2022-10-16) # (2022-09-08) -# Breaks kernel builds with BTF enabled. -# Bug #868762. -=dev-util/pahole-1.24 - # hololeap (2022-08-21) # doctest-parallel does not currently work with Setup.hs (used internally by # haskell-cabal.eclass) @@ -1118,6 +936,7 @@ dev-qt/qtwayland:6 dev-qt/qtwebchannel:6 dev-qt/qtwebengine:6 dev-qt/qtwebsockets:6 +>=media-video/bino-2 # Fabian Groffen (2022-07-02) # Segfaults handling SPF validations (warn on permerror), like the @@ -1197,11 +1016,6 @@ dev-ml/patience_diff:0/0.15 dev-util/patdiff:0/0.15 =dev-ml/alcotest-1.6.0* -# David Seifert (2022-04-06) -# Unsupported branches, no consumers left, removal on 2023-01-01. -sys-devel/automake:1.13 -sys-devel/automake:1.15 - # Maciej Barć (2022-02-20) # Masked for testing, builds and passes tests but randomly segfaults, # meaningless backtrace, debugging (flags, symbols) do not help @@ -1229,6 +1043,7 @@ sys-devel/automake:1.15 # FFmpeg 5.0 ABI/API changes break many packages. # Masking for tracker/tinderbox. Bug #831437 =media-video/ffmpeg-5* +>=media-sound/spek-0.8.5 # Brian Evans (2022-01-07) # The main consumer, phpunit, does not initiate the new timer correctly diff --git a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc index 04783d940c..5845a27c35 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc @@ -141,7 +141,9 @@ arm64 default/linux/arm64/17.0/systemd/llvm/merged-usr exp # @MAINTAINER: steev@gentoo.org, slyfox@gentoo.org # big-endian profile intentionally does not contain all flavours # until it's lightly tested. -arm64 default/linux/arm64/17.0/big-endian exp +arm64 default/linux/arm64/17.0/big-endian exp +arm64 default/linux/arm64/17.0/big-endian/systemd exp +arm64 default/linux/arm64/17.0/big-endian/systemd/merged-usr exp # HPPA Profiles # @MAINTAINER: hppa@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/make.defaults index fb7bef2767..65c385e7ab 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/make.defaults @@ -1,2 +1,2 @@ -# Copyright 1999-2022 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.force index fb7bef2767..65c385e7ab 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/releases/17.0/package.use.force @@ -1,2 +1,2 @@ -# Copyright 1999-2022 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/releases/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/releases/make.defaults index fb7bef2767..65c385e7ab 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/releases/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/releases/make.defaults @@ -1,2 +1,2 @@ -# Copyright 1999-2022 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2017 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2017 deleted file mode 100644 index b68e933e5f..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2017 +++ /dev/null @@ -1,28 +0,0 @@ -move net-libs/libkpeople kde-frameworks/kpeople -move dev-libs/uchardet app-i18n/uchardet -move net-libs/libkgapi kde-apps/libkgapi -slotmove =dev-ruby/typhoeus-1.1.2 0 1 -move app-cdr/k3b kde-apps/k3b -move net-misc/libreswan net-vpn/libreswan -move net-misc/logmein-hamachi net-vpn/logmein-hamachi -move net-misc/openconnect net-vpn/openconnect -move net-misc/openfortivpn net-vpn/openfortivpn -move net-misc/openvpn net-vpn/openvpn -move net-misc/strongswan net-vpn/strongswan -move net-misc/tinc net-vpn/tinc -move net-misc/vpnc net-vpn/vpnc -move net-misc/vpncwatch net-vpn/vpncwatch -move net-misc/vtun net-vpn/vtun -move net-misc/isatapd net-vpn/isatapd -move net-misc/iodine net-vpn/iodine -move net-misc/corkscrew net-vpn/corkscrew -move net-misc/httptunnel net-vpn/httptunnel -move net-misc/nstx net-vpn/nstx -move net-misc/6tunnel net-vpn/6tunnel -move net-misc/i2pd net-vpn/i2pd -move net-misc/tor net-vpn/tor -move net-p2p/i2p net-vpn/i2p -move net-libs/rb_libtorrent net-libs/libtorrent-rasterbar -move dev-perl/gtk2-perl dev-perl/Gtk2 -move dev-haskell/hdbc-sqlite dev-haskell/hdbc-sqlite3 -move net-dialup/pptpd net-vpn/pptpd diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023 new file mode 100644 index 0000000000..64e6720dd8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023 @@ -0,0 +1 @@ +move net-im/discord-bin net-im/discord diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2017 b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2017 deleted file mode 100644 index bd65135796..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2017 +++ /dev/null @@ -1,4 +0,0 @@ -move kde-misc/kio_gopher kde-misc/kio-gopher -move dev-python/pyconstruct dev-python/construct -move dev-erlang/p1_pam dev-erlang/epam -move perl-core/Package-Constants dev-perl/Package-Constants diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2017 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2017 deleted file mode 100644 index 86a00c423c..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2017 +++ /dev/null @@ -1,23 +0,0 @@ -move app-vim/llvm-vim sys-devel/llvm-common -move dev-libs/kirigami kde-frameworks/kirigami -slotmove kde-frameworks/kirigami 2 5 -move app-i18n/libtomoe-gtk app-i18n/tomoe-gtk -move dev-libs/libchewing app-i18n/libchewing -move media-gfx/pydot dev-python/pydot -move x11-plugins/wmMoonClock x11-plugins/wmmoonclock -slotmove app-i18n/fcitx 0 4 -slotmove app-i18n/fcitx-anthy 0 4 -slotmove app-i18n/fcitx-chewing 0 4 -slotmove app-i18n/fcitx-cloudpinyin 0 4 -slotmove app-i18n/fcitx-configtool 0 4 -slotmove app-i18n/fcitx-hangul 0 4 -slotmove app-i18n/fcitx-libpinyin 0 4 -slotmove app-i18n/fcitx-m17n 0 4 -slotmove app-i18n/fcitx-qt5 0 4 -slotmove app-i18n/fcitx-rime 0 4 -slotmove app-i18n/fcitx-sayura 0 4 -slotmove app-i18n/fcitx-table-extra 0 4 -slotmove app-i18n/fcitx-unikey 0 4 -slotmove app-i18n/kcm-fcitx 4 4-plasma4 -slotmove app-i18n/kcm-fcitx 5 4-plasma5 -move dev-libs/dfxml app-forensics/dfxml diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2017 b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2017 deleted file mode 100644 index 53f6b7ef5a..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2017 +++ /dev/null @@ -1,6 +0,0 @@ -move dev-perl/HTML-Format dev-perl/HTML-Formatter -move dev-perl/MARC-XML dev-perl/MARC-File-XML -move dev-perl/MARC-file-XML dev-perl/MARC-File-XML -move dev-util/gogland dev-util/goland -move app-crypt/zuluCrypt app-crypt/zulucrypt -move dev-perl/RadiusPerl dev-perl/Authen-Radius From adb774f4a1a9e31adbcd0ac7e4ae14123bf07355 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:50 +0000 Subject: [PATCH 57/76] sys-apps/diffutils: Sync with Gentoo It's from Gentoo commit 046af5dddd5007df3cfe2f317e4076bddc0ead4c. --- .../third_party/portage-stable/sys-apps/diffutils/Manifest | 4 ++-- .../{diffutils-3.8_p20221230.ebuild => diffutils-3.9.ebuild} | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-apps/diffutils/{diffutils-3.8_p20221230.ebuild => diffutils-3.9.ebuild} (94%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/Manifest index 126881702d..eda49eac05 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/Manifest @@ -1,4 +1,4 @@ -DIST diffutils-3.8.43-2d50.tar.xz 1585696 BLAKE2B c4b8534ec167721cde4fc33778b69740fa55dc566cf1a1b8b489ad047e67f748290fff617bd44f024fd2995cd83c5d1019bf074ded863b8fb4397208152bf400 SHA512 f348d3588eed7e471851edcf488d32936af1261b0991e8699e056e8696c235444a8a70a8a26f5be52c4406bd3d210106e58e6446a8ce71dc025172a13ab69096 -DIST diffutils-3.8.43-2d50.tar.xz.sig 833 BLAKE2B a300a957da2377ff9c5372789bd57a77f3adcc4f8cea272f4c06395e78b176880ca1e933f3253c4d680d9624798ac0fd21c7cfe31fe56f8ee042f4f527c21cc7 SHA512 0a56ece94f06b6e0f57213f7c311cd5f9eebde65e5664a75b7d7d69772ac06024f1486a1a133f040ecf2af39caa3bca35855fc66bb776a273f663e12cfb00432 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5 +DIST diffutils-3.9.tar.xz 1587916 BLAKE2B d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f SHA512 d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f +DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5 SHA512 38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.8_p20221230.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild similarity index 94% rename from sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.8_p20221230.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild index f895d84c9b..ebbd0424d1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.8_p20221230.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.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 EAPI=8 @@ -40,6 +40,8 @@ src_configure() { use elibc_glibc && export gl_cv_func_getopt_gnu=yes local myeconfargs=( + # Interferes with F_S (sets F_S=2) + --disable-gcc-warnings --with-packager="Gentoo" --with-packager-version="${PVR}" --with-packager-bug-reports="https://bugs.gentoo.org/" From b008eb9bf9a9923b490d5a6f1f85035e3defc4df Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:52 +0000 Subject: [PATCH 58/76] sys-apps/file: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/sys-apps/file/Manifest | 2 - .../sys-apps/file/file-5.43-r2.ebuild | 162 ------------------ ...ile-5.44-r1.ebuild => file-5.44-r3.ebuild} | 17 +- .../sys-apps/file/file-9999.ebuild | 14 +- .../files/file-5.43-configure-clang16.patch | 20 --- .../files/file-5.44-decompress-empty.patch | 126 ++++++++++++++ 6 files changed, 146 insertions(+), 195 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.43-r2.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/file/{file-5.44-r1.ebuild => file-5.44-r3.ebuild} (87%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.43-configure-clang16.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.44-decompress-empty.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest index 86eb997f0b..4ecddd747b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/Manifest @@ -1,4 +1,2 @@ -DIST file-5.43.tar.gz 1162786 BLAKE2B aaaf32c5054fb83e912af6656e5e67947f45576ec3711c7cba5531ed780e142a448580e0db41a828c8a3c5d2f1bf0c8ed49bc9688499caaae4a08baa16b3610c SHA512 9d02f4e7a69d90468d6bd35df5ec240ddee8c2408b7df3e73427d7f18736baf77db0638a1fe8283f4e6abd1d5ad653890ed3a5a0d48bb52d4023ca4070ecdf06 -DIST file-5.43.tar.gz.asc 195 BLAKE2B d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f SHA512 c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3 DIST file-5.44.tar.gz 1186437 BLAKE2B a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42 SHA512 26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63 DIST file-5.44.tar.gz.asc 195 BLAKE2B a0905d42fec0fa052d75fb5b267c6ae223176451c0f1d3346006d4b760c3d858f2dcda5f0a30c6aa4b09b5afee427b75bc4debd5033d978f39dc1da01d3e1bd1 SHA512 1a4dc39283f4859581441aa35b3ed72b323c4e05ca0960d17126d1b9ec18465c695c0545e24f09f8437a60ab52e582be67b6cbbc656bbb676de00148c3644d23 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.43-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.43-r2.ebuild deleted file mode 100644 index 610753073a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.43-r2.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{8..11} ) - -inherit distutils-r1 libtool toolchain-funcs multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/glensc/file.git" - inherit autotools git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc - inherit verify-sig - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )" - - 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" - - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )" -fi - -DESCRIPTION="Identify a file's format by scanning binary data for patterns" -HOMEPAGE="https://www.darwinsys.com/file/" - -LICENSE="BSD-2" -SLOT="0" -IUSE="bzip2 lzma python seccomp static-libs zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - python? ( !dev-python/python-magic ) - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" -BDEPEND+=" - python? ( - ${PYTHON_DEPS} - ${DISTUTILS_DEPS} - )" - -PATCHES=( - "${FILESDIR}/file-5.43-portage-sandbox.patch" #713710 #728978 - "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet - "${FILESDIR}/${P}-configure-clang16.patch" -) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - else - elibtoolize - fi - - # don't let python README kill main README, bug ##60043 - mv python/README.md python/README.python.md || die - # bug #662090 - sed 's@README.md@README.python.md@' -i python/setup.py || die -} - -multilib_src_configure() { - local myeconfargs=( - --enable-fsect-man5 - $(use_enable bzip2 bzlib) - $(use_enable lzma xzlib) - $(use_enable seccomp libseccomp) - $(use_enable static-libs static) - $(use_enable zlib) - ) - econf "${myeconfargs[@]}" -} - -build_src_configure() { - local myeconfargs=( - --disable-shared - --disable-libseccomp - --disable-bzlib - --disable-xzlib - --disable-zlib - ) - - econf_build "${myeconfargs[@]}" -} - -need_build_file() { - # when cross-compiling, we need to build up our own file - # because people often don't keep matching host/target - # file versions, bug #362941 - tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}" -} - -src_configure() { - local ECONF_SOURCE="${S}" - - if need_build_file ; then - mkdir -p "${WORKDIR}"/build || die - cd "${WORKDIR}"/build || die - build_src_configure - fi - - multilib-minimal_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi ; then - emake - else - # bug #586444 - emake -C src magic.h - emake -C src libmagic.la - fi -} - -src_compile() { - if need_build_file ; then - # bug #586444 - emake -C "${WORKDIR}"/build/src magic.h - emake -C "${WORKDIR}"/build/src file - local -x PATH="${WORKDIR}/build/src:${PATH}" - fi - - multilib-minimal_src_compile - - if use python ; then - cd python || die - distutils-r1_src_compile - fi -} - -multilib_src_install() { - if multilib_is_native_abi ; then - default - else - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" - fi -} - -multilib_src_install_all() { - dodoc ChangeLog MAINT # README - - # Required for `file -C` - insinto /usr/share/misc/magic - doins -r magic/Magdir/* - - if use python ; then - cd python || die - distutils-r1_src_install - fi - - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.44-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.44-r3.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.44-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.44-r3.ebuild index c29778951f..a8a4f92d1f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.44-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.44-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 libtool toolchain-funcs multilib-minimal @@ -18,7 +18,7 @@ else SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )" fi @@ -39,23 +39,28 @@ DEPEND=" ${PYTHON_DEPS} dev-python/setuptools[${PYTHON_USEDEP}] ) + seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) " -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} python? ( !dev-python/python-magic ) - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" + seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] ) +" BDEPEND+=" python? ( ${PYTHON_DEPS} ${DISTUTILS_DEPS} - )" + ) +" PATCHES=( "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046 "${FILESDIR}/file-5.44-limits-solaris.patch" # applied upstream "${FILESDIR}/file-5.44-seccomp-utimes.patch" # upstream + "${FILESDIR}/file-5.44-decompress-empty.patch" # upstream ) src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild index c83ce4f71f..82884ca365 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit distutils-r1 libtool toolchain-funcs multilib-minimal @@ -39,17 +39,21 @@ DEPEND=" ${PYTHON_DEPS} dev-python/setuptools[${PYTHON_USEDEP}] ) + seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) " -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} python? ( !dev-python/python-magic ) - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" + seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] ) +" BDEPEND+=" python? ( ${PYTHON_DEPS} ${DISTUTILS_DEPS} - )" + ) +" PATCHES=( "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.43-configure-clang16.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.43-configure-clang16.patch deleted file mode 100644 index 15fd5b1c4a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.43-configure-clang16.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/file/file/commit/4502517cc7316569d5902ab65c97b3b8e46f8a25 -https://github.com/file/file/commit/8c845b7bbad085678695d3e70467b8eec3dfa7af ---- a/configure -+++ b/configure -@@ -14037,13 +14037,14 @@ else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+#include - int - main (void) - { - #if !HAVE_DECL_DAYLIGHT - extern int daylight; - #endif --atoi(daylight); -+daylight = atoi("1"); - ; - return 0; - } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.44-decompress-empty.patch b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.44-decompress-empty.patch new file mode 100644 index 0000000000..21dcfa4c94 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/files/file-5.44-decompress-empty.patch @@ -0,0 +1,126 @@ +https://bugs.astron.com/view.php?id=415 +https://github.com/file/file/commit/1dd21dd360472d7b830825df8e40a06cdc1cbbcf + +From 1dd21dd360472d7b830825df8e40a06cdc1cbbcf Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sun, 8 Jan 2023 18:09:16 +0000 +Subject: [PATCH] fix decompression always returning empty. + +--- a/src/compress.c ++++ b/src/compress.c +@@ -609,6 +609,7 @@ uncompresszlib(const unsigned char *old, unsigned char **newch, + int rc; + z_stream z; + ++ DPRINTF("builtin zlib decompression\n"); + z.next_in = CCAST(Bytef *, old); + z.avail_in = CAST(uint32_t, *n); + z.next_out = *newch; +@@ -650,6 +651,7 @@ uncompressbzlib(const unsigned char *old, unsigned char **newch, + int rc; + bz_stream bz; + ++ DPRINTF("builtin bzlib decompression\n"); + memset(&bz, 0, sizeof(bz)); + rc = BZ2_bzDecompressInit(&bz, 0, 0); + if (rc != BZ_OK) +@@ -690,6 +692,7 @@ uncompressxzlib(const unsigned char *old, unsigned char **newch, + int rc; + lzma_stream xz; + ++ DPRINTF("builtin xzlib decompression\n"); + memset(&xz, 0, sizeof(xz)); + rc = lzma_auto_decoder(&xz, UINT64_MAX, 0); + if (rc != LZMA_OK) +@@ -729,6 +732,7 @@ uncompresszstd(const unsigned char *old, unsigned char **newch, + ZSTD_inBuffer in; + ZSTD_outBuffer out; + ++ DPRINTF("builtin zstd decompression\n"); + if ((zstd = ZSTD_createDStream()) == NULL) { + return makeerror(newch, n, "No ZSTD decompression stream, %s", + strerror(errno)); +@@ -777,6 +781,7 @@ uncompresslzlib(const unsigned char *old, unsigned char **newch, + + bufp = *newch; + ++ DPRINTF("builtin lzlib decompression\n"); + dec = LZ_decompress_open(); + if (!dec) { + return makeerror(newch, n, "unable to allocate LZ_Decoder"); +@@ -833,11 +838,13 @@ makeerror(unsigned char **buf, size_t *len, const char *fmt, ...) + va_list ap; + int rv; + ++ DPRINTF("Makeerror %s\n", fmt); + free(*buf); + va_start(ap, fmt); + rv = vasprintf(&msg, fmt, ap); + va_end(ap); + if (rv < 0) { ++ DPRINTF("Makeerror failed"); + *buf = NULL; + *len = 0; + return NODATA; +@@ -1048,7 +1055,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork, + pid_t pid; + pid_t writepid = -1; + size_t i; +- ssize_t r; ++ ssize_t r, re; + char *const *args; + #ifdef HAVE_POSIX_SPAWNP + posix_spawn_file_actions_t fa; +@@ -1103,6 +1110,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork, + + handledesc(&fa, fd, fdp); + ++ DPRINTF("Executing %s\n", compr[method].argv[0]); + status = posix_spawnp(&pid, compr[method].argv[0], &fa, NULL, + args, NULL); + +@@ -1128,6 +1136,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork, + * do not modify fdp[i][j]. + */ + handledesc(NULL, fd, fdp); ++ DPRINTF("Executing %s\n", compr[method].argv[0]); + + (void)execvp(compr[method].argv[0], args); + dprintf(STDERR_FILENO, "exec `%s' failed, %s", +@@ -1146,6 +1155,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork, + if (writepid == (pid_t)-1) { + rv = makeerror(newch, n, "Write to child failed, %s", + strerror(errno)); ++ DPRINTF("Write to child failed\n"); + goto err; + } + closefd(fdp[STDIN_FILENO], 1); +@@ -1153,6 +1163,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork, + + rv = OKDATA; + r = sread(fdp[STDOUT_FILENO][0], *newch, bytes_max, 0); ++ DPRINTF("read got %zd\n", r); + if (r < 0) { + rv = ERRDATA; + DPRINTF("Read stdout failed %d (%s)\n", fdp[STDOUT_FILENO][0], +@@ -1165,15 +1176,17 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork, + * errors, otherwise we risk the child blocking and never + * exiting. + */ ++ DPRINTF("Closing stdout for bytes_max\n"); + closefd(fdp[STDOUT_FILENO], 0); + goto ok; + } +- if ((r = sread(fdp[STDERR_FILENO][0], *newch, bytes_max, 0)) > 0) { ++ if ((re = sread(fdp[STDERR_FILENO][0], *newch, bytes_max, 0)) > 0) { ++ DPRINTF("Got stuff from stderr %s\n", *newch); + rv = ERRDATA; + r = filter_error(*newch, r); + goto ok; + } +- if (r == 0) ++ if (re == 0) + goto ok; + rv = makeerror(newch, n, "Read stderr failed, %s", + strerror(errno)); + From bdb11950c6ce36c9b533071d0ca8707ff391a520 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:54 +0000 Subject: [PATCH 59/76] sys-apps/i2c-tools: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/sys-apps/i2c-tools/i2c-tools-4.2.ebuild | 4 ++-- .../portage-stable/sys-apps/i2c-tools/i2c-tools-4.3.ebuild | 4 ++-- .../portage-stable/sys-apps/i2c-tools/metadata.xml | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.2.ebuild index c40274690e..ed58d716a3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9,10} ) DISTUTILS_OPTIONAL="1" inherit distutils-r1 flag-o-matic toolchain-funcs diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.3.ebuild index dcf5549739..13f644926e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_OPTIONAL="1" inherit distutils-r1 flag-o-matic toolchain-funcs diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/metadata.xml index 48d3ded011..85e4ed814f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/metadata.xml @@ -1,8 +1,5 @@ - - zlogene@gentoo.org - Mikle Kolyada - + From 47503c60ad638ca86648f177bc850a1f57e8435d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:55 +0000 Subject: [PATCH 60/76] sys-apps/portage: Sync with Gentoo It's from Gentoo commit 6ce6f3338b5fcc9582caa2a2a33c68b9a2558779. --- .../portage-stable/sys-apps/portage/Manifest | 4 +- .../files/portage-3.0.38.1-xz-32-bit.patch | 90 ------ .../portage/portage-3.0.38.1-r6.ebuild | 292 ------------------ .../sys-apps/portage/portage-3.0.42-r1.ebuild | 292 ------------------ ....41-r2.ebuild => portage-3.0.43-r1.ebuild} | 10 +- ...ge-3.0.43.ebuild => portage-3.0.44.ebuild} | 8 +- .../sys-apps/portage/portage-9999.ebuild | 10 +- 7 files changed, 9 insertions(+), 697 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/portage/files/portage-3.0.38.1-xz-32-bit.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.38.1-r6.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.42-r1.ebuild rename sdk_container/src/third_party/portage-stable/sys-apps/portage/{portage-3.0.41-r2.ebuild => portage-3.0.43-r1.ebuild} (97%) rename sdk_container/src/third_party/portage-stable/sys-apps/portage/{portage-3.0.43.ebuild => portage-3.0.44.ebuild} (97%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest index ae06f1d83f..e7cafaec4b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest @@ -1,4 +1,2 @@ -DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af977dd28ca659695d3e4014e4aa83b054acba82a160e7c0a8d3d4fbc3514bea619c3d720e450cb4890818e4b1bc1e43a SHA512 1375565e936276fd6cfd2a4f6f782b91e234e973d6a998f2276a076dd165272bcf12067fd01e77b238f194eac69edf967bbe3ac62edc3701fe9375c693622ab9 -DIST portage-3.0.41.tar.bz2 1119737 BLAKE2B 6c6d1fa11f16362505e321eb530d233cf73a7e1cc7dab2fc88ad40701c16835e08a7d16a408381e2f717ac5f48d46344e57b9b5296be4eba0a7583540c6a81aa SHA512 046621ee59b2b1b374a63091028ed3462b1212960b337e8e034c739d5c51d5ae1e7b491c88940199e710081409e38778749a5c86576cf5bb6c59b1890dc892b5 -DIST portage-3.0.42.tar.bz2 1122793 BLAKE2B 9df93e5ebeab415bd3b56e4e1771b628f5e3622d997aa8818e7ce42f77d60ffcb1807093dbc44852c5b359c632c11dcb7db6c026f2e7e224293e7ebb9e64b286 SHA512 f3d2bb5a1adc801c641ff14043b1617831c646a9432b2602e48343d8264850bb410a1666d646b97e224864d56cc7acae0aa044a7476384030063fb77e4323724 DIST portage-3.0.43.tar.bz2 1139615 BLAKE2B e0f2646c3b6d5d49ec23038ad27507f7b9c0c03b848e82aff336896802c07b29344f924c4525d880f8895ba38f8116a7c79ecea51c794a433da9bd146efadc20 SHA512 b5e5339f3b5446f5c8f9b319e86e82d260e004b0606c3d0eadf09f91c95de0279c64c0fc4d7f6251ebd2cf7a65ba1ba37d752ed48b712e72b8c024835e747691 +DIST portage-3.0.44.tar.bz2 1140911 BLAKE2B 06f584e6e37bbb309b9bb0e29ba4381eadd4ae6246aeb1045e3a5c5dcb33d74f74e74aa3f2325acbf37e16a535095c433f2796ed042f73cea5e208150e210cb0 SHA512 d40c95f3a31c5e2ae35374243c40c8d1f6b47b7c89f6a711a12d8744cb6848a85443298c0f947475b32acf52332e7f09b1e85915149ab8363930c0404f08410e diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/files/portage-3.0.38.1-xz-32-bit.patch b/sdk_container/src/third_party/portage-stable/sys-apps/portage/files/portage-3.0.38.1-xz-32-bit.patch deleted file mode 100644 index fa50fbab01..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/files/portage-3.0.38.1-xz-32-bit.patch +++ /dev/null @@ -1,90 +0,0 @@ -https://github.com/gentoo/portage/commit/6a47cc7bcf49b7c17fdca31969b6d6aeff84332c -https://github.com/gentoo/portage/commit/041da67db3a61d19fa5b287db4da9c51794af115 -https://github.com/gentoo/portage/commit/6834e464803b5ac98f8ab1bbca5379970b5bc6d9 - -From 6a47cc7bcf49b7c17fdca31969b6d6aeff84332c Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Mon, 17 Oct 2022 19:37:03 +0100 -Subject: [PATCH] xz: add workaround for < xz 5.3.3_alpha 32-bit issue - -With older versions of xz, xz -T0 will on 32-bit systems -try to allocate too much memory and bail out. - -After discussing with upstream, we set --memlimit-compress=50% as a -way to make things work with both older & newer versions. This limiting -is essentially already present with >= 5.3.3_alpha as -T0 includes it. - -Note that we don't need to do this for decompression as it's automatic -there for newer versions and older versions -Tn a no-op. - -Signed-off-by: Sam James ---- a/bin/ecompress -+++ b/bin/ecompress -@@ -128,7 +128,7 @@ if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then - # See: https://bugs.gentoo.org/672916 - # Setting '--rm' will remove the source files after a successful compression. - lz4) PORTAGE_COMPRESS_FLAGS="-m --rm";; -- xz) PORTAGE_COMPRESS_FLAGS="-9 -T$(___makeopts_jobs)";; -+ xz) PORTAGE_COMPRESS_FLAGS="-9 -T$(___makeopts_jobs) --memlimit-compress=50%";; - zstd) PORTAGE_COMPRESS_FLAGS="-q --rm -T$(___makeopts_jobs)";; - esac - fi - -From 041da67db3a61d19fa5b287db4da9c51794af115 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Mon, 17 Oct 2022 23:07:58 +0100 -Subject: [PATCH] xz: pass -q to xz - -Avoids noise from memlimit-compress. - -Signed-off-by: Sam James ---- a/bin/ecompress -+++ b/bin/ecompress -@@ -128,7 +128,7 @@ if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then - # See: https://bugs.gentoo.org/672916 - # Setting '--rm' will remove the source files after a successful compression. - lz4) PORTAGE_COMPRESS_FLAGS="-m --rm";; -- xz) PORTAGE_COMPRESS_FLAGS="-9 -T$(___makeopts_jobs) --memlimit-compress=50%";; -+ xz) PORTAGE_COMPRESS_FLAGS="-9 -T$(___makeopts_jobs) --memlimit-compress=50% -q";; - zstd) PORTAGE_COMPRESS_FLAGS="-q --rm -T$(___makeopts_jobs)";; - esac - fi - -From 6834e464803b5ac98f8ab1bbca5379970b5bc6d9 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 21 Oct 2022 02:32:17 +0100 -Subject: [PATCH] ecompress: don't set -9 for xz -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From xz(1): -""" -The differences between the presets are more significant than with gzip(1) and bzip2(1). The selected compression settings determine the memory requirements of the decompressor, thus us‐ -ing a too high preset level might make it painful to decompress the file on an old system with little RAM. Specifically, it's not a good idea to blindly use -9 for everything like it of‐ -ten is with gzip(1) and bzip2(1). -[...] --7 ... -9 - These are like -6 but with higher compressor and decompressor memory requirements. These are useful only when compressing files bigger than 8 MiB, 16 MiB, and 32 MiB, respectively. -[...] -• DictSize is the LZMA2 dictionary size. It is waste of memory to use a dictionary bigger than the size of the uncompressed file. This is why it is good to avoid using the presets -7 -... -9 when there's no real need for them. At -6 and lower, the amount of memory wasted is usually low enough to not matter. -""" - -Most things that ecompress touches are tiny (<32MB certainly). I made the -mistake the man page warngs about -- don't assume it's a good idea just -because of gzip & bzip2, and that's exactly what I did! - -Signed-off-by: Sam James ---- a/bin/ecompress -+++ b/bin/ecompress -@@ -128,7 +128,7 @@ if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then - # See: https://bugs.gentoo.org/672916 - # Setting '--rm' will remove the source files after a successful compression. - lz4) PORTAGE_COMPRESS_FLAGS="-m --rm";; -- xz) PORTAGE_COMPRESS_FLAGS="-9 -T$(___makeopts_jobs) --memlimit-compress=50% -q";; -+ xz) PORTAGE_COMPRESS_FLAGS="-q -T$(___makeopts_jobs) --memlimit-compress=50%";; - zstd) PORTAGE_COMPRESS_FLAGS="-q --rm -T$(___makeopts_jobs)";; - esac - fi - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.38.1-r6.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.38.1-r6.ebuild deleted file mode 100644 index 636d3faab4..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.38.1-r6.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{8..11} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" -SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/xz-utils - test? ( dev-vcs/git )" -DEPEND=" - !build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - ) -" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -# app-portage/gemato goes without PYTHON_USEDEP since we're calling -# the executable. -RDEPEND=" - acct-user/portage - app-arch/zstd - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/findutils-4.4 - !build? ( - >=sys-apps/sed-4.0.5 - >=app-shells/bash-5.0:0[readline] - >=app-admin/eselect-1.2 - rsync-verify? ( - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - >=sec-keys/openpgp-keys-gentoo-release-20220101 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !=file-5.44-r1 stable -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - || ( - >=sys-apps/file-5.44-r1 - =sys-apps/file-5.43-r2 - ) - >=sys-apps/coreutils-6.4 - ) -" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync - -pkg_pretend() { - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" - - if use native-extensions && tc-is-cross-compiler; then - einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)" - fi - - check_extra_config -} - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}"/${P}-xz-32-bit.patch - ) - - distutils-r1_python_prepare_all - - sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die - - if use gentoo-dev; then - einfo "Disabling --dynamic-deps by default for gentoo-dev..." - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ - -i lib/_emerge/create_depgraph_params.py || \ - die "failed to patch create_depgraph_params.py" - - einfo "Enabling additional FEATURES for gentoo-dev..." - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ - >> cnf/make.globals || die - fi - - if use native-extensions && ! tc-is-cross-compiler; then - printf "[build_ext]\nportage_ext_modules=true\n" >> \ - setup.cfg || die - fi - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i lib/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if use build || ! use rsync-verify; then - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ - -e '/^sync-webrsync-verify-signature/s|yes|no|' \ - -i cnf/repos.conf || die "sed failed" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ - -w "/_BINARY/" lib/portage/const.py - - einfo "Prefixing shebangs ..." - > "${T}/shebangs" || die - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - echo "${REPLY}" >> "${T}/shebangs" || die - fi - done < <(find . -type f -executable ! -name etc-update -print0) - - if [[ -s ${T}/shebangs ]]; then - xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" - fi - - einfo "Adjusting make.globals, repos.conf and etc-update ..." - hprefixify cnf/{make.globals,repos.conf} bin/etc-update - - if use prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - cd "${S}/cnf" || die - if [ -f "make.conf.example.${ARCH}".diff ]; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use apidoc && targets+=( apidoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( - install_docbook - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - use apidoc && targets+=( - install_apidoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - if ! use build; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} - -pkg_postinst() { - # Warn about obsolete "enotice" script, bug #867010 - local bashrc=${EROOT}/etc/portage/profile/profile.bashrc - if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then - eerror "Obsolete 'enotice' script detected!" - eerror "Please remove this from ${bashrc} to avoid problems." - eerror "See bug 867010 for more details." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.42-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.42-r1.ebuild deleted file mode 100644 index cba50d3d02..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.42-r1.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{8..11} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" -SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/xz-utils - test? ( dev-vcs/git ) -" -DEPEND=" - !build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - ) -" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -# app-portage/gemato goes without PYTHON_USEDEP since we're calling -# the executable. -RDEPEND=" - acct-user/portage - app-arch/zstd - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/findutils-4.4 - !build? ( - >=sys-apps/sed-4.0.5 - >=app-shells/bash-5.0:0[readline] - >=app-admin/eselect-1.2 - rsync-verify? ( - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - >=sec-keys/openpgp-keys-gentoo-release-20220101 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !=file-5.44-r1 stable -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - || ( - >=sys-apps/file-5.44-r1 - =sys-apps/file-5.43-r2 - ) - >=sys-apps/coreutils-6.4 - ) -" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync - -pkg_pretend() { - local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" - - if use native-extensions && tc-is-cross-compiler; then - einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)" - fi - - check_extra_config -} - -python_prepare_all() { - local PATCHES=( - ) - - distutils-r1_python_prepare_all - - sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die - - if use gentoo-dev; then - einfo "Disabling --dynamic-deps by default for gentoo-dev..." - sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ - -i lib/_emerge/create_depgraph_params.py || \ - die "failed to patch create_depgraph_params.py" - - einfo "Enabling additional FEATURES for gentoo-dev..." - echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \ - >> cnf/make.globals || die - fi - - if use native-extensions && ! tc-is-cross-compiler; then - printf "[build_ext]\nportage_ext_modules=true\n" >> \ - setup.cfg || die - fi - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i lib/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if use build || ! use rsync-verify; then - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ - -e '/^sync-webrsync-verify-signature/s|yes|no|' \ - -i cnf/repos.conf || die "sed failed" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ - -w "/_BINARY/" lib/portage/const.py - - einfo "Prefixing shebangs ..." - > "${T}/shebangs" || die - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - echo "${REPLY}" >> "${T}/shebangs" || die - fi - done < <(find . -type f -executable ! -name etc-update -print0) - - if [[ -s ${T}/shebangs ]]; then - xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" - fi - - einfo "Adjusting make.globals, repos.conf and etc-update ..." - hprefixify cnf/{make.globals,repos.conf} bin/etc-update - - if use prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - cd "${S}/cnf" || die - if [[ -f "make.conf.example.${ARCH}".diff ]] ; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use apidoc && targets+=( apidoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( - install_docbook - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - use apidoc && targets+=( - install_apidoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - if ! use build; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} - -pkg_postinst() { - # Warn about obsolete "enotice" script, bug #867010 - local bashrc=${EROOT}/etc/portage/profile/profile.bashrc - if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then - eerror "Obsolete 'enotice' script detected!" - eerror "Please remove this from ${bashrc} to avoid problems." - eerror "See bug 867010 for more details." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.41-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.43-r1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.41-r2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.43-r1.ebuild index 7654a8382e..13065e2d01 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.41-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.43-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{8..11} ) +PYTHON_COMPAT=( pypy3 python3_{9..11} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 @@ -68,15 +68,11 @@ RDEPEND=" !=file-5.44-r1 stable PDEPEND=" !build? ( >=net-misc/rsync-2.6.4 - || ( - >=sys-apps/file-5.44-r1 - =sys-apps/file-5.43-r2 - ) >=sys-apps/coreutils-6.4 + >=sys-apps/file-5.44-r3 ) " # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.43.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.43.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44.ebuild index 42a5752874..df564a4830 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.43.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{8..11} ) +PYTHON_COMPAT=( pypy3 python3_{9..11} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 @@ -68,15 +68,11 @@ RDEPEND=" !=file-5.44-r1 stable PDEPEND=" !build? ( >=net-misc/rsync-2.6.4 - || ( - >=sys-apps/file-5.44-r1 - =sys-apps/file-5.43-r2 - ) >=sys-apps/coreutils-6.4 + >=sys-apps/file-5.44-r3 ) " # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild index 27741e2fdd..3eac8033c3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{8..11} ) +PYTHON_COMPAT=( pypy3 python3_{9..11} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 @@ -66,15 +66,11 @@ RDEPEND=" !=file-5.44-r1 stable PDEPEND=" !build? ( >=net-misc/rsync-2.6.4 - || ( - >=sys-apps/file-5.44-r1 - =sys-apps/file-5.43-r2 - ) >=sys-apps/coreutils-6.4 + >=sys-apps/file-5.44-r3 ) " # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 From 129e173145f75648b2c8b4e221e1df04fbcae0d0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:57 +0000 Subject: [PATCH 61/76] sys-devel/autoconf-wrapper: Sync with Gentoo It's from Gentoo commit 1e4003179ec1b93f403570d29b9a35a448ce2290. --- .../autoconf-wrapper/autoconf-wrapper-20221207.ebuild | 4 ++-- .../portage-stable/sys-devel/autoconf-wrapper/metadata.xml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild index 936757448f..9788b3e841 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.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 EAPI=8 @@ -16,7 +16,7 @@ else #SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - 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 LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml index 1f8aa323a0..2847c0b042 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml @@ -5,7 +5,9 @@ base-system@gentoo.org Gentoo Base System + proj/autotools-wrappers + gentoo/autotools-wrappers From 8e55204243740695bd1801a1f8e4ac5bf544ddf6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:57 +0000 Subject: [PATCH 62/76] sys-devel/automake: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../sys-devel/automake/Manifest | 2 - .../automake/automake-1.13.4-r2.ebuild | 90 -------------- .../automake/automake-1.15.1-r2.ebuild | 111 ------------------ .../sys-devel/automake/automake-1.16.5.ebuild | 4 +- .../sys-devel/automake/automake-9999.ebuild | 4 +- .../files/automake-1.13-dyn-ithreads.patch | 59 ---------- .../automake-1.13-hash-order-workaround.patch | 14 --- ...nstall-sh-avoid-low-risk-race-in-tmp.patch | 77 ------------ ...nstall-sh-avoid-low-risk-race-in-tmp.patch | 82 ------------- 9 files changed, 4 insertions(+), 439 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.13.4-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.15.1-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/automake/Manifest index e73efe2785..ee180dcca5 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/Manifest @@ -1,4 +1,2 @@ DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba -DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1aac59bdc0d941077fde9be7742da0f57b48d678169e7a0e8b652c3ef46c314cdd3efb0fc489c389852fed1c39a02 SHA512 c9b145c1b822a4d83f2899f4280a76ccae932301b273f4c9718dc7f53161aa03dc1be2c1fb1a61083c54186e1908ae2c8284250aa1d8f6dea484767aca1344d3 -DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.13.4-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.13.4-r2.ebuild deleted file mode 100644 index 520ca9e3da..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.13.4-r2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:4}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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" -IUSE="" -RESTRICT="test" - -RDEPEND=">=dev-lang/perl-5.6 - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69:* - sys-devel/gnuconfig" -DEPEND="${RDEPEND} - sys-apps/help2man" -BDEPEND="app-arch/gzip" - -PATCHES=( - "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch - "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch - "${FILESDIR}"/${PN}-1.13-hash-order-workaround.patch - "${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch -) - -src_prepare() { - default - export WANT_AUTOCONF=2.5 - sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null || die - rm -f dir || die - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null || die -} - -src_install() { - default - - slot_info_pages - rm "${ED}"/usr/share/aclocal/README || die - rmdir "${ED}"/usr/share/aclocal || die - rm \ - "${ED}"/usr/bin/{aclocal,automake} \ - "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - local x - for x in guess sub ; do - dosym ../gnuconfig/config.${x} \ - /usr/share/${PN}-${SLOT}/config.${x} - done - - # Avoid QA message about pre-compressed file in docs - local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" - if [[ -f "${tarfile}" ]] ; then - gunzip "${tarfile}" || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.15.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.15.1-r2.ebuild deleted file mode 100644 index fcc66ddf35..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.15.1-r2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" - - inherit git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - if [[ ${PV/_beta} == ${PV} ]]; then - MY_P=${P} - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" - else - MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" - MY_P="${PN}-${MY_PV}" - - # Alpha/beta releases are not distributed on the usual mirrors. - SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" - fi - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Used to generate Makefile.in from Makefile.am" -HOMEPAGE="https://www.gnu.org/software/automake/" - -LICENSE="GPL-2" -# Use Gentoo versioning for slotting. -SLOT="${PV:0:4}" -IUSE="" -RESTRICT="test" - -RDEPEND=">=dev-lang/perl-5.6 - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69:* - sys-devel/gnuconfig" -DEPEND="${RDEPEND} - sys-apps/help2man" -BDEPEND="app-arch/gzip" - -PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch ) - -src_prepare() { - default - export WANT_AUTOCONF=2.5 - # Don't try wrapping the autotools this thing runs as it tends - # to be a bit esoteric, and the script does `set -e` itself. - ./bootstrap || die - sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die - - # Bug 628912 - if ! has_version sys-apps/texinfo ; then - touch doc/{stamp-vti,version.texi,automake.info} || die - fi -} - -# slot the info pages. do this w/out munging the source so we don't have -# to depend on texinfo to regen things. #464146 (among others) -slot_info_pages() { - pushd "${ED}"/usr/share/info >/dev/null || die - rm -f dir || die - - # Rewrite all the references to other pages. - # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. - # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. - local p pages=( *.info ) args=() - for p in "${pages[@]/%.info}" ; do - args+=( - -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" - -e "s:(${p}):(${p}-${SLOT}):g" - ) - done - sed -i "${args[@]}" * || die - - # Rewrite all the file references, and rename them in the process. - local f d - for f in * ; do - d=${f/.info/-${SLOT}.info} - mv "${f}" "${d}" || die - sed -i -e "s:${f}:${d}:g" * || die - done - - popd >/dev/null || die -} - -src_install() { - default - - slot_info_pages - rm "${ED}"/usr/share/aclocal/README || die - rmdir "${ED}"/usr/share/aclocal || die - rm \ - "${ED}"/usr/bin/{aclocal,automake} \ - "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die - - # remove all config.guess and config.sub files replacing them - # w/a symlink to a specific gnuconfig version - local x - for x in guess sub ; do - dosym ../gnuconfig/config.${x} \ - /usr/share/${PN}-${SLOT}/config.${x} - done - - # Avoid QA message about pre-compressed file in docs - local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" - if [[ -f "${tarfile}" ]] ; then - gunzip "${tarfile}" || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild index 75cb2be5e4..055d581c25 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-any-r1 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild index c569293725..df5d9b7ecf 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-any-r1 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch deleted file mode 100644 index f790e7724c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://bugs.gentoo.org/343439 - -From 182626687f2640609f8eb28ad1b04b078342f2c7 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 12 Jan 2013 00:19:40 -0500 -Subject: [PATCH] ithreads: use runtime (not configure time) detection of perl - threads - -I can't imagine the runtime checks being a big runtime penalty, so there -shouldn't be a need to do the checks at configure check and hardcode the -result in the generated automake. - -With the current system, it means if you change your perl config (build -perl w/threads, build automake, build perl w/out threads), or deploy a -compiled automake package on a different system (build had threads, but -deployed system does not), you get errors when trying to run automake. - -So take the logic from configure.ac and move it to the one place where -PERL_THREADS is used (lib/Automake/Config.in) and do the version/config -checking at runtime. - -* bootstrap.sh (PERL_THREADS): Delete assignment and use in sed. -* configure.ac (am_cv_prog_PERL_ithreads, PERL_THREADS): Delete all code -related to these two variables. -* lib/Automake/Config.in (perl_threads): Initialize to 0, and only set to -1 if the perl version is at least 5.007_002, and useithreads is in Config. - -Copyright-paperwork-exempt: yes -Signed-off-by: Mike Frysinger -Signed-off-by: Stefano Lattarini ---- - bootstrap.sh | 2 -- - configure.ac | 26 -------------------------- - lib/Automake/Config.in | 9 ++++++++- - 3 files changed, 8 insertions(+), 29 deletions(-) - -diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in -index fe6ef9d..885e74e 100644 ---- a/lib/Automake/Config.in -+++ b/lib/Automake/Config.in -@@ -33,7 +33,14 @@ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@'; - our $VERSION = '@VERSION@'; - our $RELEASE_YEAR = '@RELEASE_YEAR@'; - our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; --our $perl_threads = @PERL_THREADS@; -+ -+our $perl_threads = 0; -+# We need at least this version for CLONE support. -+if (eval { require 5.007_002; }) -+ { -+ use Config; -+ $perl_threads = $Config{useithreads}; -+ } - - 1; - --- -1.8.0.2 - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch deleted file mode 100644 index 79b81e6fa4..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.13-hash-order-workaround.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/t/primary-prefix-invalid-couples.tap -+++ b/t/primary-prefix-invalid-couples.tap -@@ -186,8 +186,10 @@ grep -v 'dir.* not a legitimate directory' stderr && exit 1 - # Check that the same failures are present without the '--add-missing' - # option. - mv stderr stderr.old -+cat stderr.old | sort > a - AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples" -+cat stderr | sort > b - command_ok_ "... and with the same diagnostic of 'automake -a'" \ -- diff stderr.old stderr -+ diff a b - - : diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch deleted file mode 100644 index 679370686a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Pavel Raiskup -Date: Sat, 15 Aug 2015 04:40:57 -0400 -Subject: install-sh: avoid (low risk) race in /tmp - -Ensure that nobody can cross privilege boundaries by pre-creating -symlink on '$tmpdir' path. - -Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not -safe because '/tmp' directory is usually world-writeable and -'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by -attacker (at least for shells where $RANDOM is not supported). -So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p. -This step would fail early if somebody wanted catch us. - -Note that systems that implement (and have enabled) -fs.protected_symlinks kernel feature are not affected even without -this commit. - -References: -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455 -https://bugzilla.redhat.com/show_bug.cgi?id=1140725 - -* lib/install-sh: Implement safer 'mkdir -p' test by running -'$mkdirprog $mkdir_mode "$tmpdir"' first. -(scriptversion): Bump. - ---- a/lib/install-sh -+++ b/lib/install-sh -@@ -345,34 +345,41 @@ do - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) -+ # $RANDOM is not portable (e.g. dash); use it when possible to -+ # lower collision chance - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ -- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 -+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - -+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so -+ # create the $tmpdir first (and fail if unsuccessful) to make sure -+ # that nobody tries to guess the $tmpdir name. - if (umask $mkdir_umask && -- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 -+ $mkdirprog $mkdir_mode "$tmpdir" && -+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. -- ls_ld_tmpdir=`ls -ld "$tmpdir"` -+ test_tmpdir="$tmpdir/a" -+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && -- $mkdirprog -m$different_mode -p -- "$tmpdir" && { -- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` -+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { -+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi -- rmdir "$tmpdir/d" "$tmpdir" -+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. -- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null -+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch b/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch deleted file mode 100644 index 1fabdd5fb3..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch +++ /dev/null @@ -1,82 +0,0 @@ -From: Pavel Raiskup -Date: Sat, 15 Aug 2015 04:40:57 -0400 -Subject: install-sh: avoid (low risk) race in /tmp - -Ensure that nobody can cross privilege boundaries by pre-creating -symlink on '$tmpdir' path. - -Just testing 'mkdir -p' by creating '/tmp/ins$RANDOM-$$/d' is not -safe because '/tmp' directory is usually world-writeable and -'/tmp/ins$RANDOM-$$' content could be pretty easily guessed by -attacker (at least for shells where $RANDOM is not supported). -So, as the first step, create the '/tmp/ins$RANDOM-$$' without -p. -This step would fail early if somebody wanted catch us. - -Note that systems that implement (and have enabled) -fs.protected_symlinks kernel feature are not affected even without -this commit. - -References: -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760455 -https://bugzilla.redhat.com/show_bug.cgi?id=1140725 - -* lib/install-sh: Implement safer 'mkdir -p' test by running -'$mkdirprog $mkdir_mode "$tmpdir"' first. -(scriptversion): Bump. ---- - lib/install-sh | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/lib/install-sh b/lib/install-sh -index 0b0fdcb..59990a1 100755 ---- a/lib/install-sh -+++ b/lib/install-sh -@@ -324,34 +324,41 @@ do - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) -+ # $RANDOM is not portable (e.g. dash); use it when possible to -+ # lower collision chance - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ -- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 -+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - -+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so -+ # create the $tmpdir first (and fail if unsuccessful) to make sure -+ # that nobody tries to guess the $tmpdir name. - if (umask $mkdir_umask && -- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 -+ $mkdirprog $mkdir_mode "$tmpdir" && -+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. -- ls_ld_tmpdir=`ls -ld "$tmpdir"` -+ test_tmpdir="$tmpdir/a" -+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && -- $mkdirprog -m$different_mode -p -- "$tmpdir" && { -- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` -+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { -+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi -- rmdir "$tmpdir/d" "$tmpdir" -+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. -- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null -+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; From 63df68e1d67921ec1f6767566230b7f171c560ef Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:57 +0000 Subject: [PATCH 63/76] sys-devel/automake-wrapper: Sync with Gentoo It's from Gentoo commit f87e7f23ebe135aafedc801c870b1256b75c57b9. --- .../portage-stable/sys-devel/automake-wrapper/metadata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/metadata.xml index 1f8aa323a0..2847c0b042 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/metadata.xml @@ -5,7 +5,9 @@ base-system@gentoo.org Gentoo Base System + proj/autotools-wrappers + gentoo/autotools-wrappers From d05dcf54cb95a1ec8c6b6b32f4e792ee1019b73c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:58 +0000 Subject: [PATCH 64/76] sys-devel/binutils: Sync with Gentoo It's from Gentoo commit cdfb1257f1557792e5f7a2a466e55adac553d263. --- .../sys-devel/binutils/Manifest | 2 + .../binutils/binutils-2.32-r2.ebuild | 9 +- .../binutils/binutils-2.33.1-r1.ebuild | 9 +- .../binutils/binutils-2.34-r2.ebuild | 9 +- .../sys-devel/binutils/binutils-2.35.2.ebuild | 9 +- .../binutils/binutils-2.36.1-r2.ebuild | 9 +- .../binutils/binutils-2.37_p1-r2.ebuild | 9 +- .../binutils/binutils-2.38-r2.ebuild | 9 +- .../binutils/binutils-2.39-r4.ebuild | 9 +- .../sys-devel/binutils/binutils-2.40.ebuild | 492 ++++++++++++++++++ .../sys-devel/binutils/binutils-9999.ebuild | 16 +- 11 files changed, 568 insertions(+), 14 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/Manifest index 0de4b0fbbc..8ce6050a80 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/Manifest @@ -14,3 +14,5 @@ DIST binutils-2.38-patches-4.tar.xz 193852 BLAKE2B 5a83e20008e58464ed563a6817a36 DIST binutils-2.38.tar.xz 23651408 BLAKE2B 19ede396ec97b88e632aded2f69f4684cc5053109e06c3c4a1934944e3f0ceaa9e4a2604528a440189771f778cb5d75edd510163970eeea31afba87fa256feba SHA512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d DIST binutils-2.39-patches-5.tar.xz 82924 BLAKE2B 2cf75f661989f22270d6afe5f3c543814eb6a331be4493016fa2871e1f10a84a123c1c51e77a19b35e46680b9fe77390cb1532ca40d470a6041fa768fed3ccd7 SHA512 4b5811b4822b3a06f590fc7d082dc0ddf18a6058ac23887254e2ee9bd63c7f06f1636e446152115c7e0b01a6c5298a0d9df6904bd1582e66504ccde80dd1ecbd DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 +DIST binutils-2.40-patches-1.tar.xz 12260 BLAKE2B d525502e08012080417634fd41981550362d4d799952e89f388af2a6e5db5b80e88bfdb0b5b1d2a1bcf8ebda529eefbced8fa2ae84c7fe3ddb10184e98d4b369 SHA512 140f80be786511f63651e67bf25c2992de6a21bac00a3252dcf98becc3f9379c8070ef1380d5542bbf2e1908c50dab2c7ebb651d13bb97609594fe9fd9f1f079 +DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild index d19fc5bc16..df54d7b742 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.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 EAPI=7 @@ -162,6 +162,13 @@ src_configure() { # Keep things sane strip-flags + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + local x echo for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild index 2fd7c51dac..04c74a25e1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.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 EAPI=7 @@ -155,6 +155,13 @@ src_configure() { # Keep things sane strip-flags + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + local x echo for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild index f135644d03..941890975f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.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 EAPI=7 @@ -152,6 +152,13 @@ src_configure() { # Keep things sane strip-flags + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + local x echo for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild index 88e1395e63..3e9e6183b4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.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 EAPI=7 @@ -169,6 +169,13 @@ src_configure() { # Keep things sane strip-flags + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + local x echo for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild index 2231530b7f..dcaa4a446b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.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 EAPI=7 @@ -164,6 +164,13 @@ src_configure() { # Keep things sane strip-flags + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + local x echo for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild index 712f1d46b7..333ff355ed 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.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 EAPI=7 @@ -170,6 +170,13 @@ src_configure() { # Keep things sane strip-flags + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 local x diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild index 401310d2e9..bea67260a9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.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 EAPI=7 @@ -175,6 +175,13 @@ src_configure() { # Keep things sane strip-flags + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 local x diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r4.ebuild index f0baee70d1..3adccc27a4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r4.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 EAPI=7 @@ -171,6 +171,13 @@ src_configure() { # Keep things sane strip-flags + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 local x diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40.ebuild new file mode 100644 index 0000000000..95fe278997 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40.ebuild @@ -0,0 +1,492 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="https://sourceware.org/binutils/" + +LICENSE="GPL-3+" +IUSE="cet doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla zstd" + +# Variables that can be set here (ignored for live ebuilds) +# PATCH_VER - the patchset version +# Default: empty, no patching +# PATCH_BINUTILS_VER - the binutils version in the patchset name +# - Default: PV +# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/... +# for the patchsets + +PATCH_VER=1 +PATCH_DEV=dilfridge + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + SLOT=${PV} +else + PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} + PATCH_DEV=${PATCH_DEV:-dilfridge} + SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz" + [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" + SLOT=$(ver_cut 1-2) + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +# +# The cross-compile logic +# +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +# +# The dependencies +# +RDEPEND=" + >=sys-devel/binutils-config-3 + sys-libs/zlib + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( sys-apps/texinfo ) + test? ( + dev-util/dejagnu + sys-devel/bc + ) + nls? ( sys-devel/gettext ) + zstd? ( virtual/pkgconfig ) + sys-devel/flex + app-alternatives/yacc +" + +RESTRICT="!test? ( test )" + +MY_BUILDDIR=${WORKDIR}/build + +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git + git-r3_src_unpack + mv patches-git/9999 patch || die + + EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" + S=${WORKDIR}/binutils + EGIT_CHECKOUT_DIR=${S} + git-r3_src_unpack + else + unpack ${P/-hppa64/}.tar.xz + + cd "${WORKDIR}" || die + unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz + + # _p patch versions are Gentoo specific tarballs ... + local dir=${P%_p?} + dir=${dir/-hppa64/} + + S=${WORKDIR}/${dir} + fi + + cd "${WORKDIR}" || die + mkdir -p "${MY_BUILDDIR}" || die +} + +src_prepare() { + local patchsetname + if [[ ${PV} == 9999* ]] ; then + patchsetname="from git master" + else + patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}" + fi + + if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then + if ! use vanilla; then + einfo "Applying binutils patchset ${patchsetname}" + eapply "${WORKDIR}/patch" + einfo "Done." + fi + fi + + # Make sure our explicit libdir paths don't get clobbered, bug #562460 + sed -i \ + -e 's:@bfdlibdir@:@libdir@:g' \ + -e 's:@bfdincludedir@:@includedir@:g' \ + {bfd,opcodes}/Makefile.in || die + + # Fix locale issues if possible, bug #122216 + if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then + einfo "Fixing misc issues in configure files" + for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do + ebegin " Updating ${f/${S}\/}" + patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \ + || eerror "Please file a bug about this" + eend $? + done + fi + + # Apply things from PATCHES and user dirs + default + + # Run misc portage update scripts + gnuconfig_update + elibtoolize --portage --no-uclibc +} + +toolchain-binutils_bugurl() { + printf "https://bugs.gentoo.org/" +} +toolchain-binutils_pkgversion() { + printf "Gentoo ${PV}" + [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}" +} + +src_configure() { + # See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html + # Avoid really confusing logs from subconfigure spam, makes logs far + # more legible. + MAKEOPTS="--output-sync=line ${MAKEOPTS}" + + # Setup some paths + LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} + INCPATH=${LIBPATH}/include + DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} + if is_cross ; then + TOOLPATH=/usr/${CHOST}/${CTARGET} + else + TOOLPATH=/usr/${CTARGET} + fi + BINPATH=${TOOLPATH}/binutils-bin/${PV} + + # Make sure we filter $LINGUAS so that only ones that + # actually work make it through, bug #42033 + strip-linguas -u */po + + # Keep things sane + strip-flags + + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + + local x + echo + for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do + einfo "$(printf '%10s' ${x}:) ${!x}" + done + echo + + cd "${MY_BUILDDIR}" || die + local myconf=() + + if use plugins ; then + myconf+=( --enable-plugins ) + fi + # enable gold (installed as ld.gold) and ld's plugin architecture + if use gold ; then + myconf+=( --enable-gold ) + fi + + if use nls ; then + myconf+=( --without-included-gettext ) + else + myconf+=( --disable-nls ) + fi + + myconf+=( --with-system-zlib ) + + # For bi-arch systems, enable a 64bit bfd. This matches the bi-arch + # logic in toolchain.eclass. bug #446946 + # + # We used to do it for everyone, but it's slow on 32bit arches. bug #438522 + case $(tc-arch) in + ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;; + esac + + use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) + + [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) + + is_cross && myconf+=( + --with-sysroot="${EPREFIX}"/usr/${CTARGET} + --enable-poison-system-directories + ) + + myconf+=( --enable-secureplt ) + + # mips can't do hash-style=gnu ... + if [[ $(tc-arch) != mips ]] ; then + myconf+=( --enable-default-hash-style=gnu ) + fi + + myconf+=( + --prefix="${EPREFIX}"/usr + --host=${CHOST} + --target=${CTARGET} + --datadir="${EPREFIX}"${DATAPATH} + --datarootdir="${EPREFIX}"${DATAPATH} + --infodir="${EPREFIX}"${DATAPATH}/info + --mandir="${EPREFIX}"${DATAPATH}/man + --bindir="${EPREFIX}"${BINPATH} + --libdir="${EPREFIX}"${LIBPATH} + --libexecdir="${EPREFIX}"${LIBPATH} + --includedir="${EPREFIX}"${INCPATH} + --enable-obsolete + --enable-shared + --enable-threads + # Newer versions (>=2.27) offer a configure flag now. + --enable-relro + # Newer versions (>=2.24) make this an explicit option, bug #497268 + --enable-install-libiberty + # Available from 2.35 on + --enable-textrel-check=warning + + # These hardening options are available from 2.39+ but + # they unconditionally enable the behaviour even on arches + # where e.g. execstacks can't be avoided. + # See https://sourceware.org/bugzilla/show_bug.cgi?id=29592. + #--enable-warn-execstack + #--enable-warn-rwx-segments + #--disable-default-execstack (or is it --enable-default-execstack=no? docs are confusing) + + # Things to think about + #--enable-deterministic-archives + + # Works better than vapier's patch, bug #808787 + --enable-new-dtags + + --disable-jansson + --disable-werror + --with-bugurl="$(toolchain-binutils_bugurl)" + --with-pkgversion="$(toolchain-binutils_pkgversion)" + $(use_enable static-libs static) + $(use_with zstd) + + # Disable modules that are in a combined binutils/gdb tree, bug #490566 + --disable-{gdb,libdecnumber,readline,sim} + # Strip out broken static link flags. + # https://gcc.gnu.org/PR56750 + --without-stage1-ldflags + # Change SONAME to avoid conflict across + # {native,cross}/binutils, binutils-libs. bug #666100 + --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st) + + # Avoid automagic dependency on (currently prefix) systems + # systems with debuginfod library, bug #754753 + --without-debuginfod + + # Avoid automagic dev-libs/msgpack dep, bug #865875 + --without-msgpack + + # Allow user to opt into CET for host libraries. + # Ideally we would like automagic-or-disabled here. + # But the check does not quite work on i686: bug #760926. + $(use_enable cet) + + # We can enable this by default in future, but it's brand new + # in 2.39 with several bugs: + # - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477) + # - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521) + # - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479) + # - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113) + $(use_enable gprofng) + ) + + if ! is_cross ; then + myconf+=( $(use_enable pgo pgo-build lto) ) + + if use pgo ; then + export BUILD_CFLAGS="${CFLAGS}" + fi + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" || die + + # Prevent makeinfo from running if doc is unset. + if ! use doc ; then + sed -i \ + -e '/^MAKEINFO/s:=.*:= true:' \ + Makefile || die + fi +} + +src_compile() { + cd "${MY_BUILDDIR}" || die + + # see Note [tooldir hack for ldscripts] + emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all + + # only build info pages if the user wants them + if use doc ; then + emake V=1 info + fi + + # we nuke the manpages when we're left with junk + # (like when we bootstrap, no perl -> no manpages) + find . -name '*.1' -a -size 0 -delete +} + +src_test() { + cd "${MY_BUILDDIR}" || die + + # bug #637066 + filter-flags -Wall -Wreturn-type + + emake -k V=1 check +} + +src_install() { + local x d + + cd "${MY_BUILDDIR}" || die + + # see Note [tooldir hack for ldscripts] + emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install + rm -rf "${ED}"/${LIBPATH}/bin || die + use static-libs || find "${ED}" -name '*.la' -delete + + # Newer versions of binutils get fancy with ${LIBPATH}, bug #171905 + cd "${ED}"/${LIBPATH} || die + for d in ../* ; do + [[ ${d} == ../${PV} ]] && continue + mv ${d}/* . || die + rmdir ${d} || die + done + + # Now we collect everything intp the proper SLOT-ed dirs + # When something is built to cross-compile, it installs into + # /usr/$CHOST/ by default ... we have to 'fix' that :) + if is_cross ; then + cd "${ED}"/${BINPATH} || die + for x in * ; do + mv ${x} ${x/${CTARGET}-} || die + done + + if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then + mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH} + mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/ + rm -r "${ED}"/usr/${CHOST}/{include,lib} + fi + fi + + insinto ${INCPATH} + local libiberty_headers=( + # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir. + demangle.h + dyn-string.h + fibheap.h + hashtab.h + libiberty.h + objalloc.h + splay-tree.h + ) + doins "${libiberty_headers[@]/#/${S}/include/}" + if [[ -d ${ED}/${LIBPATH}/lib ]] ; then + mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ || die + rm -r "${ED}"/${LIBPATH}/lib || die + fi + + # Generate an env.d entry for this binutils + insinto /etc/env.d/binutils + cat <<-EOF > "${T}"/env.d + TARGET="${CTARGET}" + VER="${PV}" + LIBPATH="${EPREFIX}${LIBPATH}" + EOF + newins "${T}"/env.d ${CTARGET}-${PV} + + # Handle documentation + if ! is_cross ; then + cd "${S}" || die + dodoc README + + docinto bfd + dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO + + docinto binutils + dodoc binutils/ChangeLog binutils/NEWS binutils/README + + docinto gas + dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* + + docinto gprof + dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl + + docinto ld + dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO + + docinto libiberty + dodoc libiberty/ChangeLog* libiberty/README + + docinto opcodes + dodoc opcodes/ChangeLog* + fi + + # Remove shared info pages + rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} + + # Trim all empty dirs + find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null +} + +pkg_postinst() { + # Make sure this ${CTARGET} has a binutils version selected + [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 + binutils-config ${CTARGET}-${PV} +} + +pkg_postrm() { + local current_profile=$(binutils-config -c ${CTARGET}) + + # If no other versions exist, then uninstall for this + # target ... otherwise, switch to the newest version + # Note: only do this if this version is unmerged. We + # rerun binutils-config if this is a remerge, as + # we want the mtimes on the symlinks updated (if + # it is the same as the current selected profile) + if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then + local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') + choice=${choice//$'\n'/ } + choice=${choice/* } + if [[ -z ${choice} ]] ; then + binutils-config -u ${CTARGET} + else + binutils-config ${choice} + fi + elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then + binutils-config ${CTARGET}-${PV} + fi +} + +# Note [slotting support] +# ----------------------- +# Gentoo's layout for binutils files is non-standard as Gentoo +# supports slotted installation for binutils. Many tools +# still expect binutils to reside in known locations. +# binutils-config package restores symlinks into known locations, +# like: +# /usr/bin/${CTARGET}- +# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips +# /usr/include/ +# +# Note [tooldir hack for ldscripts] +# --------------------------------- +# Build system does not allow ./configure to tweak every location +# we need for slotting binutils hence all the shuffling in +# src_install(). This note is about SCRIPTDIR define handling. +# +# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value +# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib' +# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time. +# Thus we can't just move files around after compilation finished. +# +# Our goal is the following: +# - at build-time set scriptdir to point to symlinked location: +# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case) +# - at install-time set scriptdir to point to slotted location: +# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild index 7897167274..eae71c276c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-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 EAPI=7 @@ -9,8 +9,7 @@ DESCRIPTION="Tools necessary to build programs" HOMEPAGE="https://sourceware.org/binutils/" LICENSE="GPL-3+" -IUSE="cet default-gold doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla zstd" -REQUIRED_USE="default-gold? ( gold )" +IUSE="cet doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla zstd" # Variables that can be set here (ignored for live ebuilds) # PATCH_VER - the patchset version @@ -63,6 +62,7 @@ BDEPEND=" sys-devel/bc ) nls? ( sys-devel/gettext ) + zstd? ( virtual/pkgconfig ) sys-devel/flex app-alternatives/yacc " @@ -172,6 +172,13 @@ src_configure() { # Keep things sane strip-flags + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 local x @@ -190,9 +197,6 @@ src_configure() { # enable gold (installed as ld.gold) and ld's plugin architecture if use gold ; then myconf+=( --enable-gold ) - if use default-gold; then - myconf+=( --enable-gold=default ) - fi fi if use nls ; then From 6ab21f5c7766c8b20ce7ed5a7007c6f17d16a0a2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:58 +0000 Subject: [PATCH 65/76] sys-devel/binutils-config: Sync with Gentoo It's from Gentoo commit 36185b1ea7d6b08e398b27de2a05ba443f9fdf37. --- .../sys-devel/binutils-config/Manifest | 1 + .../binutils-config-5.5.ebuild | 39 +++++++++++++++++++ .../binutils-config-9999.ebuild | 6 +-- .../sys-devel/binutils-config/metadata.xml | 4 ++ 4 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/binutils-config-5.5.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/Manifest index de1ae43166..f9cff1890d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/Manifest @@ -1 +1,2 @@ DIST binutils-config-5.4.1.tar.xz 7328 BLAKE2B 51f0ca625abfd964cc1b6c902017edc9790da1d33a44b3da64e3b2c68ed245fc1c0eb8b3fb999f6acb88e614f47e2f53e19b456b03c069bb61cd0f39e85d786d SHA512 af12644d591152f45d573bee0499b21c293b68a9b81626e9e1d46d5a7dc40e9a24642364bdb2bce52d61cbe3d2e045f4ab6e50a9827648a820bac885f20239cd +DIST binutils-config-5.5.tar.xz 7344 BLAKE2B decef43013ca2f7c6d36c12d08d55f499d866b6b1b55ed58f8b2df3761077b5e2c4d09d1f2c40762d42c2d3b9827575833a502b79180ef13b845f1a39a5f2feb SHA512 6f6e21799b47e38cd61621e4ec018dc0db4811f363c0817025c3e3be651d3790b30a0cab233f35fe40b1d57c88daa246037f24a7488187f4e47cca589d87d45b diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/binutils-config-5.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/binutils-config-5.5.ebuild new file mode 100644 index 0000000000..4a85f28d4c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/binutils-config-5.5.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/binutils-config.git" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="Utility to change the binutils version being used" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+native-symlinks" + +# We also RDEPEND on sys-apps/findutils which is in base @system +RDEPEND="sys-apps/gentoo-functions" + +src_compile() { + emake PV="${PV}" USE_NATIVE_LINKS="$(usex native-symlinks)" +} + +src_install() { + emake DESTDIR="${D}" PV="${PV}" install +} + +pkg_postinst() { + # Re-register all targets. USE flags or new versions can change + # installed symlinks. + local x + for x in $(binutils-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + binutils-config ${x} + done +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/binutils-config-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/binutils-config-9999.ebuild index 0282c67448..4a85f28d4c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/binutils-config-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/binutils-config-9999.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/binutils-config.git" inherit git-r3 else SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Utility to change the binutils version being used" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/metadata.xml index 34de766f7e..b44ab6e353 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils-config/metadata.xml @@ -8,4 +8,8 @@ Install native symlinks like 'as' or 'ar' to /usr/bin. Otherwise keep only ${CTARGET}-as and friends. + + proj/binutils-config + gentoo/binutils-config + From 06ee84f939b499ac809087404279ddc59bc025da Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:58 +0000 Subject: [PATCH 66/76] sys-devel/bison: Sync with Gentoo It's from Gentoo commit aa1d9b702b2f2ae20082028c5ee9436a40879755. --- .../sys-devel/bison/bison-3.8.2-r2.ebuild | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild index bdf5a076c8..5b827b301f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r2.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 EAPI=8 @@ -88,6 +88,14 @@ pkg_postinst() { # ensure to preserve the symlinks before app-alternatives/yacc # is installed if [[ ! -h ${EROOT}/usr/bin/yacc ]]; then + if [[ -e ${EROOT}/usr/bin/yacc ]] ; then + # bug #886123 + ewarn "${EROOT}/usr/bin/yacc exists but is not a symlink." + ewarn "This is expected during Prefix bootstrap and unsual otherwise." + ewarn "Moving away unexpected ${EROOT}/usr/bin/yacc to .bak." + mv "${EROOT}/usr/bin/yacc" "${EROOT}/usr/bin/yacc.bak" || die + fi + ln -s yacc.bison "${EROOT}/usr/bin/yacc" || die fi } From 49edf677c43c675cdf941c872898fa53e19cf534 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:58 +0000 Subject: [PATCH 67/76] sys-devel/crossdev: Sync with Gentoo It's from Gentoo commit 6439dce33f10da50ea0f7b1986672990370897a3. --- .../sys-devel/crossdev/Manifest | 1 - .../crossdev/crossdev-20221227-r1.ebuild | 34 ------------------- .../sys-devel/crossdev/metadata.xml | 4 +++ 3 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20221227-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest index c26d337dc5..7953946f2d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest @@ -1,3 +1,2 @@ DIST crossdev-20220909.tar.xz 29480 BLAKE2B 9c3ef9d9b8f13c81f9d2e21f8914158c04035a105ee1ac90ba30cb23a69744c9c6959bbcfd2e50d29144fc79937e5e585054d2eedfb2ced65a88467e509243be SHA512 86e8900a13095b7b12b00d739d28e2921f98818cd62daccfe6d750ce02113d0ef2d5e470b500bbfb80a9cf8f05b2a13882ac9963c3f1a4e1b7454bc1201df183 -DIST crossdev-20221227.tar.xz 29548 BLAKE2B c990ca8494db59e0dd5792fc0327d50424a816e2584eb1aff369185ce56c5cba00db783300d5eda709944df92da2679df792c6b090f9ebfb21dc65e63dccd779 SHA512 e5ae34234d6527f792ed30747f962afff9920cf85e449671651a9bf5726bce7b5cf4009d3be2e0965732857420de0937a5d7c78e61025e7f437d95a15cb56685 DIST crossdev-20221228.tar.xz 29568 BLAKE2B 0458a338a872a27058240c816abfcf9116703d18b687da0050213f834d5aba5df87552e16999fca7d0340aab5b8738ee0edb6ccfb656579b99f20357c077e326 SHA512 16d9d72f74c3b0d6c587c16eb8bea405c7c8eb3effc59fac55027d02348db2e10aacd9098b6f42479574a014783022737325acfaf63031e430fdf90391fa574b diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20221227-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20221227-r1.ebuild deleted file mode 100644 index a3a84da996..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20221227-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -if [[ ${PV} == "99999999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" -else - SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -DESCRIPTION="Gentoo Cross-toolchain generator" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - >=sys-apps/portage-2.1 - app-shells/bash - sys-apps/gentoo-functions -" -BDEPEND="app-arch/xz-utils" - -src_install() { - default - - if [[ ${PV} == "99999999" ]] ; then - sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml index a4be5df4df..d4d3daf6c1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml @@ -13,4 +13,8 @@ embedded@gentoo.org Embedded Gentoo + + proj/crossdev + gentoo/crossdev + From c828bb6f17f3ab52fd714fefe8f4bf061d614844 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:59 +0000 Subject: [PATCH 68/76] sys-devel/gcc: Sync with Gentoo It's from Gentoo commit 9365f1e0f71f7b4568795239d257626d218bd077. --- .../portage-stable/sys-devel/gcc/Manifest | 24 ++---- .../sys-devel/gcc/gcc-10.4.1_p20221229.ebuild | 58 ------------- ....ebuild => gcc-10.4.1_p20230119-r1.ebuild} | 6 +- .../sys-devel/gcc/gcc-11.3.0.ebuild | 22 ----- .../sys-devel/gcc/gcc-11.3.1_p20221230.ebuild | 52 ------------ ....ebuild => gcc-11.3.1_p20230120-r1.ebuild} | 8 +- .../sys-devel/gcc/gcc-12.2.1_p20221126.ebuild | 8 +- .../sys-devel/gcc/gcc-12.2.1_p20221210.ebuild | 52 ------------ .../sys-devel/gcc/gcc-12.2.1_p20221224.ebuild | 52 ------------ ....ebuild => gcc-12.2.1_p20230121-r1.ebuild} | 4 +- .../gcc/gcc-13.0.0_pre20221218.ebuild | 53 ------------ ...3.0.9999.ebuild => gcc-13.0.1.9999.ebuild} | 2 +- ...5.ebuild => gcc-13.0.1_pre20230122.ebuild} | 2 +- .../portage-stable/sys-devel/gcc/metadata.xml | 84 +++++++++++++++++-- 14 files changed, 98 insertions(+), 329 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221229.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-10.4.1_p20221222.ebuild => gcc-10.4.1_p20230119-r1.ebuild} (89%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221230.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-11.3.1_p20221223.ebuild => gcc-11.3.1_p20230120-r1.ebuild} (87%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221210.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221224.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-12.2.1_p20221231.ebuild => gcc-12.2.1_p20230121-r1.ebuild} (91%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221218.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.0.9999.ebuild => gcc-13.0.1.9999.ebuild} (97%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.0.0_pre20221225.ebuild => gcc-13.0.1_pre20230122.ebuild} (97%) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest index 431de6608e..a4714bcaec 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest @@ -1,35 +1,25 @@ DIST gcc-10-20221208.tar.xz 72098912 BLAKE2B 8167b3d91fb95c727caa3a76d8bd6d70e0d0bd79eda72305f3005c9f7163dcd425c75386ba55b2d71644ecf83d998a4bccb6fd265bb615dcdd104f27cadb8e76 SHA512 5e49159d86300eaa4c2f34fb3537b5f257931e861a1a1217dbabcfcd5ef9da224d4a6023aaf8d24c8893ecd204ec0cd6e96349ae0dd445d62d92ebb041aeb054 -DIST gcc-10-20221222.tar.xz 72112292 BLAKE2B fad78a6bc00e23909fa4c441592e61311709efa770ec713c44923f6f088c1185c52022cb9fa2e13185e644b655b16f7b4f4247e93bc82925ae44b2580feab8dd SHA512 34ecb5def4152e69c6b2a5fcd111c244447f6c53ed4359516923331af4634e67b803635ec770f24fc7dc12a571918d523fdf4f23d13e7aec927a05f8c5b83090 -DIST gcc-10-20221229.tar.xz 72106168 BLAKE2B 315233f7906fd12ebe206d351b7c0ee26f5f5010674f7133b9683122172b755e08ae29a837448bf49aef6759a1b373ae4a80acafb79b3d0207f3c0d8a543ba0c SHA512 39404361a464c0ec65923a6f01761beb70b56e2ed0c587b77b833290db71b943071e806fabd13dc3bd41f67813aabcda49d9d5ae490241dd913f115fa59cfba6 +DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 6e28cba9f6ff5c9f9231828bb400c82b8658a4f9c0166c28a6a12d71728d4460904152a8c84bbeff88c06b7f9378937b7b61bf4a871a10c56bd005170dc5fde2 SHA512 6cbb567ef1da1b6fa65892b6e71c3b7cd37e0c483e049720ea1987d444a0e7b4eb15d1e99f4e35995acdce560a811a779574eeba52bb252c61325accedd6a5c5 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b414eed8770c72e6b11b295b7e7b3c9d38d7407dff63b5751f4449f6fa842c02e87f156cc868e7436a8313f7c8514242d255 SHA512 b93cc54cd7b78fdc487df7c449b03bbfd10094e45f3f8eef20cd69f27a68a14817fe662a2ec119b384eea2dad0491b70f838d010457e386700030b76457afad6 DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5544b369720e8c54fc59375e591ebd0a429b7e81a2a3df86bd2eaf19e4b8148bf2e1b0c8410de3944d4801ce412016b2 SHA512 5855aa23ee0b262c20a1b6fd2d4a947180c079dc00e0fa675043edceee0c822eec0dc752f5fcb281b70c04e50c6fcaf6c5d5160ab15d3f0c51fa030eb2d79d26 -DIST gcc-10.5.0-patches-3.tar.xz 17292 BLAKE2B 403b3955756c060fa00cdc55c29cdad58cf0ce449af7a75aabf4ddecc9043cffe5f1d6fe77bec00a59de2040e207fabb390f9c603748926821d189be53f4000d SHA512 f5a192f42222d02ab765e8b284dfbd999e69db8a7d6a2e5f1f378a16ba3f0b26f35bbad3b3a9e6e9e30c6734b76d8b69d80b802593cbe4d671f14cc16db30c8e +DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B f368b741fd42199c85b770ec45a5232d27295cf7796163251f24fa963f2264c473e161bb34e66b43c4b227e41859d540a66331111392478b280b289d359806c6 SHA512 94f7fbd1b4672f0378c85ac3a96f7954cd22bd7cc1013c32519bbe1cae0ebb5183e14469c61dfc9d931b8d1c261f2ead1c4b47278104d1b5189a0c787aabc40e DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3 -DIST gcc-11-20221223.tar.xz 76237128 BLAKE2B 4d50d3a296bae501dd4287ca7c877304a60b1a6d444b96598ff2e018f4cf540896c675c11a99cc127acfbe7e3af38d603f6b80b7049d9e525420eaee7c0f81e4 SHA512 efbb26ce3b8a5ffcc36ad84f797b638c1d8d0a1fe61e3d9bd984c0dbce0a887d1384f8644d71f4b25b22ae2c67fedcbc4282780a2b834a47a318ed558fd9e0ed -DIST gcc-11-20221230.tar.xz 76219720 BLAKE2B 25694ef7300f241f3e144b9d29b7d1dc9b779a322d25a5457d3b1fc9b695e11a252e496d7a4a3bc00d6b06304cf9971571dde1e4331d20579f57a39458da1a1b SHA512 2118a7c5637fc21db53472cf0e633e1ac2495cc13a1b63fe55c4d7d17f8bc75a9d36ef4b9dc7dc82d5ab0800bf7a4c808b6a42cfadacb6ef99dd769f23a7b4ca -DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334 -DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d -DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 +DIST gcc-11-20230120.tar.xz 76201244 BLAKE2B 07bc819dad3e2ee3747f09f43fd73a4263f06274362728174b32d9ead52ea95c25ea6a192397378b9b4c4f958285d97488d28e425c26129d23f143b1a8668fbc SHA512 81f71aeb706b4ccb89e2af5201770fd72cc3190b9b5eac0b5a25a522626b9c4015a2e5d13e4bd1360ac0f7f1be27df51fc530c15ce3c3d782f39f34d5c58803e DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac DIST gcc-11.4.0-musl-patches-1.tar.xz 4320 BLAKE2B 9f59aef44243b6d63bd9c4639b413523e74784dc0da931a9f1be75d2091f7e99c530b32b567315972a88816d6b30d2c404465a2f28138ba2cc894914d7a123fb SHA512 c174623bf40fb0cab53d1ca82fa7e0b05f0114c61c839e316dfff7678d202b850d4d5011432cf6fa40c54e563e28381e9a9f80667d9428b3f272ba8391c6ac84 DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9 -DIST gcc-11.4.0-patches-5.tar.xz 15136 BLAKE2B 202bc321d1a75a543bcbb54ddd7aae2a6d81764b1ae752e95bbcb7b1e68cbac33e2066a1c935c705fc7cea6603e93a6dcb3041645131a5e76c986242a8613908 SHA512 96ec2dec4e663d739fa7b80e63df32aa6d72c193e124bc93580cc1c0f9b8d3578dee3faf0e765b766cc6bb46136958a4b0e7095962d73b6e2a8066b8be558a5c +DIST gcc-11.4.0-patches-7.tar.xz 14416 BLAKE2B 3ebf62cba04cac8830a93a99d11c21347c38891db3a81493a10e02e8b7af0c86389ffbede50672dfe1189a77a67b832f8f97a1d95d43eff11db131a143b1d03d SHA512 41e2ed1ccf6d3631accccdab057877c79c99eb1b3c32f9d35628bca6c633c4f8dadb1d7f93bed2e4d7ff9f36cc9e46ea00f0e57e8af64b2e5f4b3b01285c6da3 DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df -DIST gcc-12-20221210.tar.xz 79645632 BLAKE2B 063222037d420f356d452d0419fc4621c30393beaca1f2661d7070c087bca88831f27ae96d8fb7433efaeb59cb338495fb210611a1c37931a1d00373cba9812b SHA512 00399148932b5c57dbe442dcde01e856cbb981c7cc6703760ea51b28e0784cbc6e016663f195b69714da8c7e2cdcfbc03cb1939bab3e6b507b64846e1e814fa6 -DIST gcc-12-20221224.tar.xz 79647600 BLAKE2B 9c99e6fee09457ac56f8b975650aa0b7dc82f05e990b722af16383ef75b9c02ea592fc37ba3a098e5a601c2115fe2c2414699830175e375325f99743d8ed952f SHA512 018c68d323d9fbe25295807211f750fa80efb947b77e8557860cfd9e97c90198e50c5b3f589afe7fd287a226ff5105b59c6134e4a6cd616ac3d551a5914a15e8 -DIST gcc-12-20221231.tar.xz 79647424 BLAKE2B 8e75adb993eedf38059ced571d2df160aa3a11ab855bbbba6be7ea8ad630ec0cdf470e432d6d80b794c1b326aca63cf0b8b673fb9c89330f52e5418e2aab8d43 SHA512 76fc6bd5b1e7711e4f2f7c391bc057a3c64db193af11cd2edb7bde5a638134aaac37012da75b90aea30da04b69565276f377266318471b4d123252cf3e5f5852 +DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258 +DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9 -DIST gcc-12.2.0-patches-6.tar.xz 19096 BLAKE2B 9d97f4b1d4c82c00d6bac923963444198fb8144753bfb25f0068d96e4c7444f6163a7cd2e6ed2b808f608131f3208746776b2d061986b8d50311ca6cd8cbb917 SHA512 9af71c64490a289d959e95b2df34e62861c161cb161632020f66a4fbdfdbc7f08f6f2956d08e0a7995332d010c974f58a8bc8e4d595769c5632c4755a4e86b31 -DIST gcc-12.2.0-patches-7.tar.xz 14492 BLAKE2B 95347cc4a7affab3ac1ed2b89ed7dcb239e17b28c93ab45f248765d297ca37e2ab127b13fba2a38256166c2daf43156e574ac783868ac48d561909af5fe82139 SHA512 661daf478f6abeab8c3164282aef591c44e18ab99deaa1aee2102de4c8d05da4145bf3ea371ebcf7e4f2455d5ae97c6d94e321b98d373750c784c1b278efb87a -DIST gcc-12.2.0-patches-8.tar.xz 14656 BLAKE2B 25f00289699e8e3417c5e4a7d424cdbb140304fb764e8d1fee2e259b4231987c8b53cdbdeba761899a0256b764f7cfd6b4e691fcf44634b59b9dac9ab8a49cdc SHA512 dca2983a72d6c95c3cfe8e1c43195c9aff2a9c5c012851c1b30e51f4384be9b08e761ca589e4941528c89e522d1f11bc6964c8584d7761a889f47e302a3d2b5d DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 -DIST gcc-13-20221218.tar.xz 82692928 BLAKE2B d68af44da5708d6433cc4c409d93d725111bd69fa76d49e8354043ad2bb8aa8cb396489151442910fc4544fedd5290277aa8934aac5c24332c0963dc4605c149 SHA512 27b98455bedecbd8cf70f6357924ca1ad45f79ce4a50aefcbcf5b14f6c6a0a5c60fda5b85e7c2c24cf8ce65233dc1eda72c5e48dd0cac699ded1e72c32f0164d -DIST gcc-13-20221225.tar.xz 82806372 BLAKE2B 73da814af9d75a1217de7cc84ab3fee1b762ee3845242b21e8724ff22193447f2a5d5c850270083b8de4eb66cf6d70821aa10e0a552d094a7fb7ae0d61a55477 SHA512 30bcb6a6a914489513eca6c065b8f6105417bb1fa279664a1b5aa4c2103d9b0fe1c4ba37156f5448c5ffd5990aa72785710082825ab54ccce3998ddd97730b9e +DIST gcc-13-20230122.tar.xz 82869800 BLAKE2B fff4bee436910ba587640600a95c2a89ddec415e12f629c941c8b27d28202c62b39dac2ca0b5d82d9fb4ca271310b178e89202f488f5ef4a7fbc63cd3ecfd7d7 SHA512 a24c0acedc81f72104fe13aba7403ee8920949089971aad5a296de7b46b8969d82b77df92bfd4ef2537b2e5c2010b72d3a33e3bf35ff734d9c49a7a1746026b5 DIST gcc-13.1.0-patches-5.tar.xz 11404 BLAKE2B 5ba2b4002e917750757a28fa4c7ff6ff7090c35f28eb984aee6ad7fc0ac80c88a9d08e1d4d9efa98e6bd3f06e89df47b10b51f8294bb7d2ef0d1ac3fd2a1a963 SHA512 6864738794237bd7430c612404dd4b84e275362cb5abd081284a91e5b24c1b0aa97d90b9543168c72147be146887219715325d52ae2920912d9c4e17e7224aa3 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221229.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221229.ebuild deleted file mode 100644 index 8dae3d80c0..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221229.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_SUFFIX="xz" -TOOLCHAIN_PATCH_DEV="sam" -#TOOLCHAIN_GCC_RC=1 -PATCH_GCC_VER="10.5.0" -PATCH_VER="3" -MUSL_VER="1" -MUSL_GCC_VER="10.5.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi - -RDEPEND="" -BDEPEND="${CATEGORY}/binutils" - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - if has_version '>=sys-libs/glibc-2.32-r1'; then - rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die - fi - - toolchain_src_prepare -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221222.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221222.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild index bbed5b020b..2d7951f9c2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221222.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230119-r1.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 EAPI=8 @@ -7,7 +7,7 @@ TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" #TOOLCHAIN_GCC_RC=1 PATCH_GCC_VER="10.5.0" -PATCH_VER="3" +PATCH_VER="4" MUSL_VER="1" MUSL_GCC_VER="10.5.0" @@ -36,7 +36,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi RDEPEND="" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.0.ebuild deleted file mode 100644 index f599396850..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -TOOLCHAIN_PATCH_DEV="sam" -TOOLCHAIN_PATCH_SUFFIX="xz" -PATCH_VER="7" -PATCH_GCC_VER="11.3.0" -MUSL_VER="1" -MUSL_GCC_VER="11.3.0" - -inherit toolchain - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -# Technically only if USE=hardened *too* right now, but no point in complicating it further. -# If GCC is enabling CET by default, we need glibc to be built with support for it. -# bug #830454 -RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" -DEPEND="${RDEPEND}" -BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221230.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221230.ebuild deleted file mode 100644 index 6335866c4e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221230.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_SUFFIX="xz" -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="5" -PATCH_GCC_VER="11.4.0" -MUSL_VER="1" -MUSL_GCC_VER="11.4.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi - -# Technically only if USE=hardened *too* right now, but no point in complicating it further. -# If GCC is enabling CET by default, we need glibc to be built with support for it. -# bug #830454 -RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" -DEPEND="${RDEPEND}" -BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - toolchain_src_prepare - - eapply_user -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221223.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221223.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild index f353c58a4e..9c37d622eb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221223.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="5" +PATCH_VER="7" PATCH_GCC_VER="11.4.0" -MUSL_VER="0" +MUSL_VER="1" MUSL_GCC_VER="11.4.0" if [[ $(ver_cut 3) == 9999 ]] ; then @@ -28,7 +28,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi # Technically only if USE=hardened *too* right now, but no point in complicating it further. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild index 28a10fb471..e1e84c1bc2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.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 EAPI=8 @@ -34,9 +34,9 @@ inherit toolchain EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi # Technically only if USE=hardened *too* right now, but no point in complicating it further. # If GCC is enabling CET by default, we need glibc to be built with support for it. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221210.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221210.ebuild deleted file mode 100644 index aa28751532..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221210.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="6" -PATCH_GCC_VER="12.2.0" -MUSL_VER="1" -MUSL_GCC_VER="12.2.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain - -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -# Technically only if USE=hardened *too* right now, but no point in complicating it further. -# If GCC is enabling CET by default, we need glibc to be built with support for it. -# bug #830454 -RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" -DEPEND="${RDEPEND}" -BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" - -src_prepare() { - toolchain_src_prepare - - eapply_user -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221224.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221224.ebuild deleted file mode 100644 index ffcf1a8407..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221224.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="7" -PATCH_GCC_VER="12.2.0" -MUSL_VER="1" -MUSL_GCC_VER="12.2.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain - -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -# Technically only if USE=hardened *too* right now, but no point in complicating it further. -# If GCC is enabling CET by default, we need glibc to be built with support for it. -# bug #830454 -RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" -DEPEND="${RDEPEND}" -BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" - -src_prepare() { - toolchain_src_prepare - - eapply_user -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221231.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221231.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild index 85b3b5eaee..1d9c09da85 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221231.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="8" +PATCH_VER="10" PATCH_GCC_VER="12.2.0" MUSL_VER="1" MUSL_GCC_VER="12.2.0" @@ -35,7 +35,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi # Technically only if USE=hardened *too* right now, but no point in complicating it further. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221218.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221218.ebuild deleted file mode 100644 index d460676876..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221218.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="5" -PATCH_GCC_VER="13.1.0" -MUSL_GCC_VER="13.1.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - MY_PV_3=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=master - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - KEYWORDS="~loong" -fi - -# Technically only if USE=hardened *too* right now, but no point in complicating it further. -# If GCC is enabling CET by default, we need glibc to be built with support for it. -# bug #830454 -RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" -DEPEND="${RDEPEND}" -BDEPEND="${CATEGORY}/binutils[cet(-)?]" - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - toolchain_src_prepare - - eapply_user -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1.9999.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.9999.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1.9999.ebuild index 1210755732..ca9d13f5dd 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1.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 EAPI=8 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221225.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230122.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221225.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230122.ebuild index d460676876..41e7410862 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221225.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230122.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 EAPI=8 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml index 4d9f63a02b..d1c5c03813 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml @@ -7,29 +7,97 @@ Build the ADA language (GNAT) frontend - Enable support for Intel Control Flow Enforcement Technology (CET) + + Enable support for Intel Control Flow Enforcement Technology (CET). + + Only effective on amd64/x86. + + Only provides benefits on newer CPUs. For Intel, the CPU + must be at least as new as Tiger Lake. For AMD, it must be + at least as new as Zen 3. This is harmless on older CPUs, + but provides no benefit either. + + When combined with USE=hardened, GCC will set -fcf-protection + by default when building software. The effect is minimal + on systems which do not support it, other than a possible + small increase in codesize for the NOPs. The generated + code is therefore compatible with i686 at the earliest. + Enable support for the D programming language - Build packages with stack clash protection on by default - Request full relocation on start from ld.so by default + + Build packages with stack clash protection on by default as + a hardening measure. + + This enables -fstack-clash-protection by default which protects against + large memory allocations allowing stack smashing. + + May cause slightly increased codesize, but modern compilers + have been adapted to optimize well for this case, as + this mitigation is now quite common. + + See https://developers.redhat.com/blog/2020/05/22/stack-clash-mitigation-in-gcc-part-3 + and https://www.qualys.com/2017/06/19/stack-clash/stack-clash.txt. + + + Request full relocation on start from ld.so by default. + + This sets the -z,now (BIND_NOW) flag by default on all linker invocations. By + resolving all dynamic symbols at application startup, parts of the program + can be made read-only as a hardening measure. + + This is closely related to RELRO which is also separately + enabled by default. + + In some applications with many unresolved symbols (heavily plugin based, + for example), startup time may be impacted. + Enable fixed-point arithmetic support for MIPS targets in gcc (Warning: significantly increases compile time!) Build the GCC Go language frontend. Add support for the framework for loop optimizations based on a polyhedral intermediate representation Use accelerated 128-bit IEEE long double ABI (ppc64le only) Enable libgccjit so other applications can embed gcc for Just-In-Time compilation. Build SSP support into a dedicated library rather than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES) - Build using Link Time Optimizations (LTO) + + Build using Link Time Optimizations (LTO). + + Note that GCC is always built with support for building + other programs with LTO. This USE flag is for whether + GCC itself is built and optimized with LTO. + Enable support for Intel Memory Protection Extensions (MPX) Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually) Build support for the Objective C code language Build support for the Objective C++ language Build support for the Objective C code language Garbage Collector - Build GCC using Profile Guided Optimization (PGO) + + Build GCC using Profile Guided Optimization (PGO). + + GCC will build itself and then analyze the just-built + binary and then rebuild itself using the data obtained + from analysis of codepaths taken. + + It does not affect whether GCC itself supports PGO + when building other software. + + This substantially increases the build time needed for + building GCC itself. + Build support for the Rust language, installs gccrs. - Build support for various sanitizer functions (ASAN/TSAN/etc...) - Build packages with stack smashing protector on by default + + Build support for various sanitizer functions (ASAN/TSAN/etc...) + to find runtime problems in applications. + + Build packages with stack smashing protection on by default enable systemtap static probe points Enable valgrind annotations for gcc internals (useful for gcc debugging). - Build support for virtual table verification (a C++ hardening feature) + + Build support for virtual table verification (a C++ hardening feature). + + This does not control whether GCC defaults to using VTV> + + Note that actually using VTV breaks ABI and hence the whole + system must be built with -fvtable-verify. + cpe:/a:gnu:gcc From fcdec9bd96239b8e72632cd8a1606e083da5ba21 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:22:59 +0000 Subject: [PATCH 69/76] sys-devel/gcc-config: Sync with Gentoo It's from Gentoo commit e958d4fadbead2caac9181c80d89ae58b4252890. --- .../third_party/portage-stable/sys-devel/gcc-config/Manifest | 2 +- .../{gcc-config-2.9.ebuild => gcc-config-2.10.ebuild} | 2 +- .../portage-stable/sys-devel/gcc-config/metadata.xml | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/{gcc-config-2.9.ebuild => gcc-config-2.10.ebuild} (97%) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest index d50b35cec6..ba7fe333bd 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest @@ -1,2 +1,2 @@ +DIST gcc-config-2.10.tar.xz 18040 BLAKE2B de902fcf9169290a09988b56fa75f1bf24f702ce98a8fe37b6d4fe090bab615716c32a9e219d25a2257c60099eb4424b86cc1a1565c1b4f3dbcd6c9acad6f340 SHA512 cced56c52d97cbace5fb7e1fc9c73b413454bc5c53641c9429a7da88a0b31db2c70a8b90a4b4b0fbe1e732f21a5f979a4721a7bc8537666f8277b7755bd4af52 DIST gcc-config-2.8.tar.xz 17968 BLAKE2B aa34e681ef0c86bb846d89b816b46276f5c7c32974c785a9611a903a4fe165c997a34664abe17aa4d8720a96f194054e5d8c371a6c9270b1c235d7539094436c SHA512 5e91df44fb7782b9ad41ed06fbd53f74868c059f892c6c2b8195ebaa899905dd9f502562887f1a3765dd6b61698e956d01c6fa6f97a535cf16e26e70fcd902ba -DIST gcc-config-2.9.tar.xz 18032 BLAKE2B 6ee4d89a7fc2c211cb2ce0f6b0802ac300b30deccf6e54cd80a548d6e2e878097ad93cb0174485df8611780cf29e0c3c7590f726409f369a92c6d780db5c167f SHA512 11fa782699ffcca38eee9ef3ca8dbdfdda68459bdad80ca3378ae07e0ee7c114a494c3362e05dc39d69d9770808f2b97bc682aec49e3c3483e7ba0c4498d57f3 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.10.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.9.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.10.ebuild index 7ff12f007e..1b01042208 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.10.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 EAPI=8 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/metadata.xml index 4dac4d50b5..61a8b0758c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/metadata.xml @@ -9,4 +9,8 @@ Install and manage 'cc' and 'f77' wrappers in /usr/bin. Otherwise ignore them. Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends. + + proj/gcc-config + gentoo/gcc-config + From f7a35aad6732d64e2686617c4e35125daf2d2b9d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:23:00 +0000 Subject: [PATCH 70/76] sys-devel/m4: Sync with Gentoo It's from Gentoo commit 231e4e05dfbf967ae40fe2c2e4c0eebac9ac496f. --- .../m4/files/m4-1.4.19-fortify-source.patch | 50 +++++++++ .../sys-devel/m4/m4-1.4.19-r1.ebuild | 101 ++++++++++++++++++ 2 files changed, 151 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/m4/files/m4-1.4.19-fortify-source.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/m4/files/m4-1.4.19-fortify-source.patch b/sdk_container/src/third_party/portage-stable/sys-devel/m4/files/m4-1.4.19-fortify-source.patch new file mode 100644 index 0000000000..d07fe620c3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/m4/files/m4-1.4.19-fortify-source.patch @@ -0,0 +1,50 @@ +https://lists.gnu.org/archive/html/m4-patches/2023-01/msg00001.html +https://bugs.gentoo.org/890273 + +From 960b9b4d0774f78d286932251d6f53f638aefb19 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 9 Jan 2023 08:00:34 +0000 +Subject: [PATCH] build: Don't add _FORTIFY_SOURCE if already set by + user/toolchain + +Newer toolchains (GCC 12+ or Clang 9+, glibc-2.34) allow _FORTIFY_SOURCE=3. + +The current macro used in configure.ac will forcefully downgrade to F_S=2 +and emit a warning if the user set something else: +``` +x86_64-pc-linux-gnu-gcc -DEXEEXT=\"\" -I. -I../lib -DIN_M4_GNULIB_TESTS=1 -I. -I. -I.. -I./.. -I../lib -I./../lib -O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type -ggdb3 -Werror=implicit-function-declaration -Werror=implicit-int -c -o glthread/thread.o glthread/thread.c +In file included from glthread/thread.c:20: +../lib/config.h:202: warning: "_FORTIFY_SOURCE" redefined + 202 | # define _FORTIFY_SOURCE 2 + | +: note: this is the location of the previous definition +``` + +See: 390d259efe8e1c7e4b6babb4738fef7427416857 +Signed-off-by: Sam James +--- a/configure.ac ++++ b/configure.ac +@@ -133,7 +133,9 @@ if test "$gl_gcc_warnings" = yes; then + [/* Enable compile-time and run-time bounds-checking, and some warnings, + without upsetting newer glibc. */ + #if defined __OPTIMIZE__ && __OPTIMIZE__ +- # define _FORTIFY_SOURCE 2 ++ # ifndef _FORTIFY_SOURCE ++ # define _FORTIFY_SOURCE 2 ++ # endif + #endif + ]) + fi +--- a/lib/config.hin ++++ b/lib/config.hin +@@ -198,7 +198,9 @@ + /* Enable compile-time and run-time bounds-checking, and some warnings, + without upsetting newer glibc. */ + #if defined __OPTIMIZE__ && __OPTIMIZE__ +- # define _FORTIFY_SOURCE 2 ++ # ifndef _FORTIFY_SOURCE ++ # define _FORTIFY_SOURCE 2 ++ # endif + #endif + + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19-r1.ebuild new file mode 100644 index 0000000000..83b5384aa9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/m4.asc +inherit verify-sig + +DESCRIPTION="GNU macro processor" +HOMEPAGE="https://www.gnu.org/software/m4/m4.html" +if [[ ${PV} == *_beta* ]] ; then + MY_P="${PN}-1.4.18d" + SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz" + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )" + S="${WORKDIR}/${MY_P}" +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" + 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 + +LICENSE="GPL-3" +SLOT="0" +IUSE="examples nls" + +RDEPEND=" + virtual/libiconv + nls? ( + sys-devel/gettext + virtual/libintl + )" +DEPEND="${RDEPEND}" +# Remember: cannot dep on autoconf since it needs us +BDEPEND="app-arch/xz-utils + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-m4 )" + +PATCHES=( + "${FILESDIR}"/ppc-musl.patch + "${FILESDIR}"/loong-fix-build.patch + "${FILESDIR}"/${PN}-1.4.19-make-4.4-tests.patch + "${WORKDIR}"/${P}-test-198-sysval-r1.patch + "${FILESDIR}"/${PN}-1.4.19-fortify-source.patch +) + +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + fi + + default +} + +src_prepare() { + default + + # touch generated files after patching m4, to avoid activating maintainer + # mode + # remove when loong-fix-build.patch is no longer necessary + touch ./aclocal.m4 ./lib/config.hin ./configure ./doc/stamp-vti || die + find . -name Makefile.in -exec touch {} + || die +} + +src_configure() { + local -a myeconfargs=( + --enable-changeword + + --with-packager="Gentoo Linux" + --with-packager-version="${PVR}" + --with-packager-bug-reports="https://bugs.gentoo.org/" + + $(usex nls '' '--disable-nls') + + # Disable automagic dependency over libsigsegv; see bug #278026 + ac_cv_libsigsegv=no + ) + + [[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g ) + + econf "${myeconfargs[@]}" +} + +src_test() { + [[ -d /none ]] && die "m4 tests will fail with /none/" #244396 + emake check +} + +src_install() { + default + + # autoconf-2.60 for instance, first checks gm4, then m4. If we don't have + # gm4, it might find gm4 from outside the prefix on for instance Darwin + use prefix && dosym m4 /usr/bin/gm4 + + if use examples ; then + dodoc -r examples + rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile* + fi +} From 45831ef3e27b45fc9a92e90d3d0d1222345a6c9d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:23:05 +0000 Subject: [PATCH 71/76] sys-fs/multipath-tools: Sync with Gentoo It's from Gentoo commit 816055e2387bc79b730315f51a067b54965919f0. --- .../sys-fs/multipath-tools/Manifest | 2 - .../multipath-tools-0.8.7-respect-flags.patch | 14 --- .../multipath-tools-0.9.0-respect-flags.patch | 15 --- .../sys-fs/multipath-tools/metadata.xml | 3 - .../multipath-tools-0.8.9.ebuild | 88 ----------------- .../multipath-tools-0.9.0.ebuild | 76 --------------- .../multipath-tools-0.9.3-r2.ebuild | 2 +- .../multipath-tools-0.9.3.ebuild | 95 ------------------- 8 files changed, 1 insertion(+), 294 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest index da55c0c395..a3d16d489d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest @@ -1,3 +1 @@ -DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30 SHA512 25f2a5d436af6a343804988cef45ca1574d4a981655a2b91563ddb89138619158befdf5af92d836a17c95d6dcf901072b614473c2129274e5dcdb1a1d64edb4d -DIST multipath-tools-0.9.0.tar.gz 537311 BLAKE2B e7d4958d24d1e19da2b80be23585ad37f6b0c1b66dc1377014d825ddd2be10ea3b8c30162cb7a23b120427bf0c957c6cad8560018e1cb058c284f37afd5d50d4 SHA512 6c417f6d1d116fa43bedb9f77769ece9cbb7b35b78a9b3558c41df2360e52a65a07314b12ab7e4a7bbc867b9755250de9db96a2f7eb4a6a37f0b0b3f0bbc840e DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949 SHA512 4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b55557e2f7f68b279583da diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch deleted file mode 100644 index 43c03883ee..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.8.7-respect-flags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -101,8 +101,9 @@ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 - WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ - -Werror=implicit-function-declaration -Werror=format-security \ - $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) --CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 --CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ -+CPPFLAGS ?= -Wp,-D_FORTIFY_SOURCE=2 -+CFLAGS ?= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe -+CFLAGS += --std=gnu99 \ - -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ - -MMD -MP - BIN_CFLAGS = -fPIE -DPIE diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch deleted file mode 100644 index f2b6dca057..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.9.0-respect-flags.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -140,10 +140,9 @@ - WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ - -Werror=implicit-function-declaration -Werror=format-security \ - $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) --CPPFLAGS := $(FORTIFY_OPT) \ -- -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" -DRUN_DIR=\"${RUN}\" \ -+CPPFLAGS += -DBIN_DIR=\"$(bindir)\" -DMULTIPATH_DIR=\"$(plugindir)\" -DRUN_DIR=\"${RUN}\" \ - -DCONFIG_DIR=\"$(configdir)\" -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP --CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe -+CFLAGS += -std=gnu99 $(WARNFLAGS) - BIN_CFLAGS = -fPIE -DPIE - LIB_CFLAGS = -fPIC - SHARED_FLAGS = -shared diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/metadata.xml index 1cbf200d6c..019e77364d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/metadata.xml @@ -5,9 +5,6 @@ base-system@gentoo.org Gentoo Base System - - Enable Rados block device support via sys-cluster/ceph - opensvc/multipath-tools diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild deleted file mode 100644 index 4d67993c2e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit linux-info systemd toolchain-funcs udev - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" -IUSE="systemd rbd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/json-c:= - dev-libs/libaio - dev-libs/userspace-rcu:= - >=sys-fs/lvm2-2.02.45 - >=virtual/libudev-232-r3 - sys-libs/readline:0= - rbd? ( sys-cluster/ceph ) - systemd? ( sys-apps/systemd ) -" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~DM_MULTIPATH" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.7-respect-flags.patch -) - -src_prepare() { - default - - # The upstream lacks any way to configure the build at present - # and ceph is a huge dependency, so we're using sed to make it - # optional until the upstream has a proper configure system - if ! use rbd ; then - sed \ - -e "s/libcheckrbd.so/# libcheckrbd.so/" \ - -e "s/-lrados//" \ - -i libmultipath/checkers/Makefile \ - || die - fi -} - -src_compile() { - tc-export CC - - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - LIB="${EPREFIX}/$(get_libdir)" \ - LIBDM_API_FLUSH=1 \ - PKGCONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - dodir /sbin /usr/share/man/man{3,5,8} - emake \ - DESTDIR="${D}" \ - LIB="${EPREFIX}/$(get_libdir)" \ - RUN=run \ - unitdir="$(systemd_get_systemunitdir)" \ - libudevdir='${prefix}'/"$(get_udevdir)" \ - pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \ - install - - newinitd "${FILESDIR}"/multipathd-r1.rc multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - einstalldocs - - find "${ED}" -type f -name "*.la" -delete || die -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild deleted file mode 100644 index c3ba08e79c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info systemd toolchain-funcs udev - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/json-c:= - dev-libs/libaio - dev-libs/userspace-rcu:= - >=sys-fs/lvm2-2.02.45 - >=virtual/libudev-232-r3 - sys-libs/readline:= - systemd? ( sys-apps/systemd )" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~DM_MULTIPATH" - -PATCHES=( "${FILESDIR}"/${PN}-0.9.0-respect-flags.patch ) - -src_compile() { - tc-export CC - - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - prefix="${EPREFIX}" \ - LIB="$(get_libdir)" \ - LIBDM_API_FLUSH=1 \ - PKGCONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - dodir /sbin /usr/share/man/man{3,5,8} - emake \ - DESTDIR="${D}" \ - prefix="${EPREFIX}" \ - LIB="$(get_libdir)" \ - RUN=run \ - unitdir="$(systemd_get_systemunitdir)" \ - libudevdir='$(prefix)'/$(get_udevdir) \ - pkgconfdir='$(prefix)/usr/$(LIB)/pkgconfig' \ - install - einstalldocs - - newinitd "${FILESDIR}"/multipathd-r1.rc multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - udev_reload - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild index ff744e92c0..65869a6998 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.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 EAPI=8 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild deleted file mode 100644 index 6fa03671b7..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info systemd toolchain-funcs udev tmpfiles - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" -IUSE="systemd test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/json-c:= - dev-libs/libaio - dev-libs/userspace-rcu:= - >=sys-fs/lvm2-2.02.45 - >=virtual/libudev-232-r3 - sys-libs/readline:= - systemd? ( sys-apps/systemd )" -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" -BDEPEND="virtual/pkgconfig" - -CONFIG_CHECK="~DM_MULTIPATH" - -src_prepare() { - default - - sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \ - "${S}"/Makefile.inc || die -} - -src_compile() { - tc-export CC - - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - prefix="${EPREFIX}/usr" \ - LIB="$(get_libdir)" \ - LIBDM_API_FLUSH=1 \ - PKGCONFIG="$(tc-getPKG_CONFIG)" \ - GENTOO_CFLAGS="${CFLAGS}" \ - GENTOO_CPPFLAGS="${CPPFLAGS}" \ - FAKEVAR=1 -} - -src_install() { - dodir /sbin - - # Please clean this up > 0.9.3: https://github.com/opensvc/multipath-tools/pull/53 - # $(prefix) doesn't work correctly in makefile in 0.9.3. - emake \ - DESTDIR="${ED}" \ - prefix="${EPREFIX}" \ - LIB="$(get_libdir)" \ - RUN=run \ - unitdir="$(systemd_get_systemunitdir)" \ - libudevdir="${EPREFIX}/$(get_udevdir)" \ - pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \ - GENTOO_CFLAGS="${CFLAGS}" \ - GENTOO_CPPFLAGS="${CPPFLAGS}" \ - install - - rmdir "${ED}"/usr/include - rmdir "${ED}"/usr/share - mv "${ED}"/include "${ED}"/usr/include || die - mv "${ED}"/share "${ED}"/usr/share || die - einstalldocs - - newinitd "${FILESDIR}"/multipathd-r1.rc multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf - udev_reload - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} - -pkg_postrm() { - udev_reload -} From d96a7d92e6838f1ea39a6518c3abb5c0ff85f34c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:23:05 +0000 Subject: [PATCH 72/76] sys-libs/binutils-libs: Sync with Gentoo It's from Gentoo commit e9fdffcef805793ff04d141f1b2f83dfc067af88. --- .../sys-libs/binutils-libs/Manifest | 2 + .../binutils-libs-2.40-r1.ebuild | 159 ++++++++++++++++++ 2 files changed, 161 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest index bcf9f223b8..c438b58272 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest @@ -10,3 +10,5 @@ DIST binutils-2.38-patches-4.tar.xz 193852 BLAKE2B 5a83e20008e58464ed563a6817a36 DIST binutils-2.38.tar.xz 23651408 BLAKE2B 19ede396ec97b88e632aded2f69f4684cc5053109e06c3c4a1934944e3f0ceaa9e4a2604528a440189771f778cb5d75edd510163970eeea31afba87fa256feba SHA512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d DIST binutils-2.39-patches-5.tar.xz 82924 BLAKE2B 2cf75f661989f22270d6afe5f3c543814eb6a331be4493016fa2871e1f10a84a123c1c51e77a19b35e46680b9fe77390cb1532ca40d470a6041fa768fed3ccd7 SHA512 4b5811b4822b3a06f590fc7d082dc0ddf18a6058ac23887254e2ee9bd63c7f06f1636e446152115c7e0b01a6c5298a0d9df6904bd1582e66504ccde80dd1ecbd DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 +DIST binutils-2.40-patches-1.tar.xz 12260 BLAKE2B d525502e08012080417634fd41981550362d4d799952e89f388af2a6e5db5b80e88bfdb0b5b1d2a1bcf8ebda529eefbced8fa2ae84c7fe3ddb10184e98d4b369 SHA512 140f80be786511f63651e67bf25c2992de6a21bac00a3252dcf98becc3f9379c8070ef1380d5542bbf2e1908c50dab2c7ebb651d13bb97609594fe9fd9f1f079 +DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r1.ebuild new file mode 100644 index 0000000000..09aff21304 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r1.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PATCH_VER=1 +PATCH_DEV=dilfridge + +inherit libtool toolchain-funcs multilib-minimal + +MY_PN="binutils" +MY_P="${MY_PN}-${PV}" +PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} +PATCH_DEV=${PATCH_DEV:-dilfridge} + +DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages" +HOMEPAGE="https://sourceware.org/binutils/" +SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" + +LICENSE="|| ( GPL-3 LGPL-3 )" +SLOT="0/${PV%_p?}" +IUSE="64-bit-bfd cet multitarget nls static-libs" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +BDEPEND="nls? ( sys-devel/gettext )" +DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" +# Need a newer binutils-config that'll reset include/lib symlinks for us. +RDEPEND="${DEPEND} + >=sys-devel/binutils-config-5 +" + +S="${WORKDIR}/${MY_P%_p?}" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/bfd.h +) + +src_prepare() { + if [[ -n ${PATCH_VER} ]] ; then + einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}" + eapply "${WORKDIR}/patch"/*.patch + fi + + # Fix cross-compile relinking issue, bug #626402 + elibtoolize + + if [[ ${CHOST} == *-darwin* ]] ; then + # somehow libtool/configure is messed up and (custom patch at + # upstream?) and misdetects (basically assumes) nm can be called + # with -B arg -- can't run eautoreconf (fails), so patch up + # manually, this would break any target that needs -B to nm + sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \ + libctf/configure || die + fi + + # See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html + # Avoid really confusing logs from subconfigure spam, makes logs far + # more legible. + export MAKEOPTS="--output-sync=line ${MAKEOPTS}" + + default +} + +pkgversion() { + printf "Gentoo ${PVR}" + [[ -n ${PATCHVER} ]] && printf " p${PATCHVER}" +} + +multilib_src_configure() { + local myconf=( + --enable-obsolete + --enable-shared + --enable-threads + # Newer versions (>=2.24) make this an explicit option. #497268 + --enable-install-libiberty + --disable-werror + --with-bugurl="https://bugs.gentoo.org/" + --with-pkgversion="$(pkgversion)" + $(use_enable static-libs static) + # The binutils eclass enables this flag for all bi-arch builds, + # but other tools often don't care about that support. Put it + # beyond a flag if people really want it, but otherwise leave + # it disabled as it can slow things down on 32bit arches. #438522 + $(use_enable 64-bit-bfd) + # This only disables building in the zlib subdir. + # For binutils itself, it'll use the system version. #591516 + --without-zlib + --with-system-zlib + # We only care about the libs, so disable programs. #528088 + --disable-{binutils,etc,ld,gas,gold,gprof,gprofng} + # Disable modules that are in a combined binutils/gdb tree. #490566 + --disable-{gdb,libdecnumber,readline,sim} + # Strip out broken static link flags. + # https://gcc.gnu.org/PR56750 + --without-stage1-ldflags + # We pull in all USE-flags that change ABI in an incompatible + # way. #666100 + # USE=multitarget change size of global arrays + # USE=64-bit-bfd changes data structures of exported API + --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def) + + # avoid automagic dependency on (currently prefix) systems + # systems with debuginfod library, bug #754753 + --without-debuginfod + + # Revisit if it's useful, we do have binutils[zstd] though + --without-zstd + + # Allow user to opt into CET for host libraries. + # Ideally we would like automagic-or-disabled here. + # But the check does not quite work on i686: bug #760926. + $(use_enable cet) + ) + + # mips can't do hash-style=gnu ... + if [[ $(tc-arch) != mips ]] ; then + myconf+=( --enable-default-hash-style=gnu ) + fi + + use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) + + use nls \ + && myconf+=( --without-included-gettext ) \ + || myconf+=( --disable-nls ) + + if [[ ${CHOST} == *-darwin* ]] && use nls ; then + # fix underlinking in opcodes + sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \ + "${S}"/opcodes/Makefile.in || die + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + # Prevent makeinfo from running as we don't build docs here. + # bug #622652 + sed -i \ + -e '/^MAKEINFO/s:=.*:= true:' \ + Makefile || die +} + +multilib_src_compile() { + emake V=1 +} + +multilib_src_install() { + emake V=1 DESTDIR="${D}" install + + # Provided by sys-devel/gdb instead + rm "${ED}"/usr/share/info/sframe-spec.info || die + + # Provide libiberty.h directly. + dosym libiberty/libiberty.h /usr/include/libiberty.h +} + +multilib_src_install_all() { + use static-libs || find "${ED}"/usr -name '*.la' -delete +} From f33cd037618dddefe985ff74d72d7ba44f76e440 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:23:06 +0000 Subject: [PATCH 73/76] sys-libs/libseccomp: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild | 4 ++-- .../sys-libs/libseccomp/libseccomp-2.5.4.ebuild | 4 ++-- .../portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild index bd94a086c7..acb0a0f1e6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 multilib-minimal diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4.ebuild index b47ea79882..2651fadc3e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 multilib-minimal diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild index e97b661f1b..7450759339 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 multilib-minimal From e4272f37595e91ff49ba124bcd4e9360b9b6ae78 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:23:06 +0000 Subject: [PATCH 74/76] sys-libs/zlib: Sync with Gentoo It's from Gentoo commit 5fe0054b3e6a55983086d25284fd7e7a25506f13. --- .../sys-libs/zlib/zlib-1.2.13-r1.ebuild | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild index 50b767a0ef..30d4a7c1a3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.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 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 # Worth keeping an eye on 'develop' branch upstream for possible backports. AUTOTOOLS_AUTO_DEPEND="no" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc -inherit autotools multilib-minimal flag-o-matic usr-ldscript verify-sig +inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript verify-sig CYGWINPATCHES=( "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch" @@ -92,6 +92,13 @@ multilib_src_configure() { # because it would pass it even for older binutils. use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments) + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + case ${CHOST} in *-mingw*|mingw*|*-cygwin*) ;; From 650f6b2bd1833b75c57ddf5d0a1c0cfede962a2f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Jan 2023 07:23:21 +0000 Subject: [PATCH 75/76] x11-libs/pixman: Sync with Gentoo It's from Gentoo commit 5b86df4fdf4c864e1023f60e838f194c42fadfa2. --- .../portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild | 4 ++-- .../portage-stable/x11-libs/pixman/pixman-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild index a374ef666c..2e5fa64a85 100644 --- a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.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 EAPI=7 @@ -34,7 +34,7 @@ pkg_setup() { } multilib_src_configure() { - if use arm && tc-is-clang ; then + if ( use arm || use arm64 ) && tc-is-clang ; then # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 append-cflags $(test-flags-CC -fno-integrated-as) fi diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild index 1cd3dd3a43..e4c0e9e9a0 100644 --- a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-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 EAPI=7 @@ -34,7 +34,7 @@ pkg_setup() { } multilib_src_configure() { - if use arm && tc-is-clang ; then + if ( use arm || use arm64 ) && tc-is-clang ; then # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 append-cflags $(test-flags-CC -fno-integrated-as) fi From 8f6fde1c5f4d161c78c995d7af9b3841d7e6f976 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 6 Feb 2023 17:25:23 +0100 Subject: [PATCH 76/76] changelog: Add entries --- .../changelog/security/2023-02-06-weekly-updates.md | 3 +++ .../changelog/updates/2023-02-06-weekly-updated.md | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/changelog/security/2023-02-06-weekly-updates.md create mode 100644 sdk_container/src/third_party/portage-stable/changelog/updates/2023-02-06-weekly-updated.md diff --git a/sdk_container/src/third_party/portage-stable/changelog/security/2023-02-06-weekly-updates.md b/sdk_container/src/third_party/portage-stable/changelog/security/2023-02-06-weekly-updates.md new file mode 100644 index 0000000000..f0fd8df801 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/security/2023-02-06-weekly-updates.md @@ -0,0 +1,3 @@ +- vim ([CVE-2023-0049](https://nvd.nist.gov/vuln/detail/CVE-2023-0049), [CVE-2023-0051](https://nvd.nist.gov/vuln/detail/CVE-2023-0051), [CVE-2023-0054](https://nvd.nist.gov/vuln/detail/CVE-2023-0054)) +- SDK: qemu ([CVE-2022-4172](https://nvd.nist.gov/vuln/detail/CVE-2022-4172)) +- curl ([CVE-2022-43551](https://nvd.nist.gov/vuln/detail/CVE-2022-43551), [CVE-2022-43552](https://nvd.nist.gov/vuln/detail/CVE-2022-43552)) diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2023-02-06-weekly-updated.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2023-02-06-weekly-updated.md new file mode 100644 index 0000000000..337c799055 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2023-02-06-weekly-updated.md @@ -0,0 +1,10 @@ +- XZ utils ([5.4.1](https://github.com/tukaani-project/xz/releases/tag/v5.4.1) (includes [5.4.0](https://github.com/tukaani-project/xz/releases/tag/v5.4.0))) +- vim ([9.0.1157](https://github.com/vim/vim/releases/tag/v9.0.1157)) +- SDK: qemu ([7.2.0](https://wiki.qemu.org/ChangeLog/7.2)) +- SDK: boost ([1.81.0](https://www.boost.org/users/history/version_1_81_0.html)) +- bpftool ([5.19.12](https://lwn.net/Articles/909678/)) +- git ([2.39.1](https://github.com/git/git/blob/v2.39.1/Documentation/RelNotes/2.39.1.txt) (includes [2.39.0](https://github.com/git/git/blob/v2.39.0/Documentation/RelNotes/2.39.0.txt))) +- bind tools ([9.16.36](https://bind9.readthedocs.io/en/v9_16_36/notes.html#notes-for-bind-9-16-36) (includes [9.16.34](https://bind9.readthedocs.io/en/v9_16_35/notes.html#notes-for-bind-9-16-34) and [9.16.35](https://bind9.readthedocs.io/en/v9_16_34/notes.html#notes-for-bind-9-16-35))) +- curl ([7.87.0](https://curl.se/changes.html#7_87_0)) +- SDK: file ([5.44](https://github.com/file/file/blob/FILE5_44/ChangeLog)) +- SDK: portage ([3.0.43](https://github.com/gentoo/portage/blob/portage-3.0.43/NEWS) (includes [3.0.42](https://github.com/gentoo/portage/blob/portage-3.0.42/NEWS)))