From 416e19374d37b4dbe60452d5d55e3a55ee99d1c9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:04:56 +0000 Subject: [PATCH 001/153] app-admin/eselect: Sync with Gentoo It's from Gentoo commit ab4fa5f13df954019eed259e37d10450e4a93ce6. --- .../portage-stable/app-admin/eselect/Manifest | 1 - .../app-admin/eselect/eselect-1.4.28.ebuild | 61 ------------------- .../app-admin/eselect/eselect-1.4.29.ebuild | 2 +- 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.28.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-admin/eselect/Manifest b/sdk_container/src/third_party/portage-stable/app-admin/eselect/Manifest index 0ef181823e..b5d1ee3d2d 100644 --- a/sdk_container/src/third_party/portage-stable/app-admin/eselect/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-admin/eselect/Manifest @@ -1,3 +1,2 @@ DIST eselect-1.4.27.tar.xz 184464 BLAKE2B 718874f4d0651194f361ca3202e5140982812bf486c8efe82354944d55206b0113fa135992203e8baa00019c3fd773a90ddaf67157c16f4ac2d69965d9822fbd SHA512 f534785fc1f79869840f420b4ab2b2bf35593c504cce878a6d3d07f75012cf32288009ea9ac2a5607dba216a794110a64c5f2c54d5d8a3c641328489cecc024b -DIST eselect-1.4.28.tar.xz 184692 BLAKE2B 86d1bbc0cb618f6edf49753c9f2be0f67670590ae55b8d2a8824940a5efa8462e395e1ee7f42379bd4ea64ea74f775a78e0a3a23ed565c67c3485f7e4e2d7a83 SHA512 26ac77465e2d6ab5193083c350cfd027d73ecd6d2702fc5f3db90373e92bf3722aead99c9b00b540c7972761620a485941c897854fe110454a4c6897f3f92868 DIST eselect-1.4.29.tar.xz 185948 BLAKE2B bb387a14c81d5ff5bf2e6e703465b24140b047f1464dee3c7fc0a125c9d94544a9afd801b42d2902dd6dee1af705f7dcfad854286d7e243a0f654cec35ab8eea SHA512 0466be2634f9d632d628cb11793d604002d989c222758ed33259c6b1dede80765d80f782242b22704e890bde84b2e1e3b3fb3d31574812cc803aad64ba8e7cf6 diff --git a/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.28.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.28.ebuild deleted file mode 100644 index 47ff93c8ba..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.28.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Packages sharing a common release tarball: -# app-admin/eselect -# app-emacs/eselect-mode -# Please bump and mark them stable together! - -inherit bash-completion-r1 - -DESCRIPTION="Gentoo's multi-purpose configuration and management tool" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect" -SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz" - -LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc emacs vim-syntax" - -# coreutils for realpath -DEPEND="sys-apps/coreutils - sys-apps/sed" -RDEPEND="${DEPEND} - sys-apps/file - sys-libs/ncurses:0" -BDEPEND="doc? ( dev-python/docutils )" -PDEPEND="emacs? ( app-emacs/eselect-mode ) - vim-syntax? ( app-vim/eselect-syntax )" - -src_compile() { - emake - use doc && emake html -} - -src_install() { - emake DESTDIR="${D}" install - newbashcomp misc/${PN}.bashcomp ${PN} - dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt - if use doc; then - docinto html - dodoc *.html doc/*.html doc/*.css - fi - - # needed by news module - keepdir /var/lib/gentoo/news - if ! use prefix; then - fowners root:portage /var/lib/gentoo/news - fperms g+w /var/lib/gentoo/news - fi -} - -pkg_postinst() { - # fowners in src_install doesn't work for the portage group: - # merging changes the group back to root - if ! use prefix; then - chgrp portage "${EROOT}/var/lib/gentoo/news" \ - && chmod g+w "${EROOT}/var/lib/gentoo/news" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.29.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.29.ebuild index 2755cd4663..e8e9ad47d8 100644 --- a/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.29.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.29.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz" LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc emacs vim-syntax" # coreutils for realpath From 0c93cf536bd5305fd958a13b3f480502b53dc43c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:10 +0000 Subject: [PATCH 002/153] app-arch/ncompress: Sync with Gentoo It's from Gentoo commit 2aee709e7119636b53eeb34a08700508471783c1. --- .../portage-stable/app-arch/ncompress/ncompress-5.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r2.ebuild index d257d90209..ed5c409da6 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r2.ebuild @@ -11,7 +11,7 @@ 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" PATCHES=( "${FILESDIR}"/${PN}-5.0-c23.patch From e22bd50dffe5195d400f1a3b496f0c26eaa8d51a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:15 +0000 Subject: [PATCH 003/153] app-arch/xz-utils: Sync with Gentoo It's from Gentoo commit ad4a2d8b96e0365cc95301df3f61af940cbb4ad6. --- .../portage-stable/app-arch/xz-utils/Manifest | 6 +- .../xz-utils/xz-utils-5.6.2-r1.ebuild | 203 ------------------ .../app-arch/xz-utils/xz-utils-5.6.4.ebuild | 2 +- ...lpha.ebuild => xz-utils-5.7.2_beta.ebuild} | 2 +- .../app-arch/xz-utils/xz-utils-9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 210 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.2-r1.ebuild rename sdk_container/src/third_party/portage-stable/app-arch/xz-utils/{xz-utils-5.7.1_alpha.ebuild => xz-utils-5.7.2_beta.ebuild} (99%) 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 1a4437e1b9..14da6a9ba5 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,10 +1,8 @@ DIST xz-5.4.7.tar.gz 2798247 BLAKE2B e02f3a62c81882c83254e1c94f002aadcd59479dbd031a4d5ea68ce3303c066c298c2709845f2d4ef436511b21d35ab66a080542ac70aaf6c0a0daf448a47d02 SHA512 82c3e5d39fbaa5dcd61b45d5db99d740d811323456a9af3b1acfccbe66b074d1650bc810ee8272a8ae0a1bcf116fc73fc09297b8acb4c6568cf912708306e8ea DIST xz-5.4.7.tar.gz.sig 566 BLAKE2B 525eeeddb219c6e46ef2079af0cd28c8514969ce33b2ab61ccae59ae26289e7ddbd29dd492f88f4e4da9db750dd60ce1831a23a0275cdac39bd5b29c663d1a72 SHA512 00e9004739a168fd8a1ca4bb8b8a9de456bbef2576565722158140f341e94f461dab05c6e457f62a1613229419a978898e878007872571afdc1bb8a9582fa00a -DIST xz-5.6.2.tar.gz 2355785 BLAKE2B d2d5f9772714b5b5993ec26c313bd27dc10d88928d9d3a1c71b78f80797e376cf065dcdd0c2c7977a83b67cbe2558140c74c5df44a9408e5a72529212c2205ad SHA512 c32c32c95e3541b906e0284e66a953ace677e0ce6af2084e7b122600047bf7542c1b0fabb5909b19ff79fba6def530be674df1c675b22a47a8d57f3f0b736a82 -DIST xz-5.6.2.tar.gz.sig 566 BLAKE2B 9b1f19d0449de18057eb5bd3cceaa073fc245e9a05fb19fabdac98b1d2e708b39c8070130c522b78ff75df724e207f978d8da65e2ccb1c6fa295aa892eda0d23 SHA512 f3d1055a2a6e96eec2fd5c0b733f2ab5e150bac9645f1fe9a7558ed6f34a241b4f57e17fd4504f311be26cf1e2b9b797f2e78b1b9d2db02e9cd0c1548cb6160b DIST xz-5.6.3.tar.gz 2279396 BLAKE2B 9f09926f1ec7d72e6564f5816101512717bcb37610b551616117818d4e6a3b6c00b4ac74bf13a06cd299ff199a0561f2c05a3884a6f6b7e94951de2c1c2e6dc3 SHA512 b07b45e18615d1946e9d12157af99b54700d757832a638fccab70549574dcd7f28e69e71cc4c0b9c808959f818e79b668a5ccf108429ea0f40b6125bfd55d274 DIST xz-5.6.3.tar.gz.sig 566 BLAKE2B b59899d9ddc3325bd0de084dac420440ccdeb5f57f3656300f235fdae997a8943c2dc44edc3b83150b78717a7bf761152f09b41035d245fa536c45b8c06dd00d SHA512 65a0eb674b804309417d736b3ec9edb9c9bf39485593d81f352ee847662f5a95b3d5084fab21451e3510d74e4e2ee8f9cf4e8615d1128b6e16d5c211481481db DIST xz-5.6.4.tar.gz 2280985 BLAKE2B 3d27c143f4856589d501bc47ff5c86c1c49b1d0b8c8fd2143bcbfe86b860ca93f6a103f628e06ce5c2839ce1941cecc7552d91b1aac5c11def40fd9182d93eee SHA512 b966950eb9206e31f284c9dc3bb0a79f2fabbaf515e88c89da53d3da41ddfeebd2fc6d3d3f8fcd150c70caaaefa43dec0bce84aa183e08bf339d1aebbe041751 DIST xz-5.6.4.tar.gz.sig 566 BLAKE2B 475b576431f573b9ce390ae2c43fc4f307f00ef523a741ec6795f182f5ff2c30f2049b1b4d2a3a7e61769bb7dc568de0f5af89661cb09341a58bbcdcdda3c877 SHA512 1ece59b7a540f6d215206ced14759aa971f192433705f8803b6ad8db0857e246145300c853cb571d8750b8152483d13736c478a7c0abb40d7ed25305d80a841c -DIST xz-5.7.1alpha.tar.gz 2334409 BLAKE2B 98e98ebde9175fe8b135fa59f8e8acff1b8c6278f75a3ea997ebbe9aac25cb1a6a1f1bde163af4788ca0532bc270fe5baaf6cd89ba4c81ed3e3f7a6f08e741eb SHA512 40349652f3903e1d37e1cdc0b0b6f5479db0bc5bcbdc371f34b7cf7de730b1781748e1a6cad3dcc9e721243a0bd6f1c062a5ae54e966d23ff80ae0f0c9371246 -DIST xz-5.7.1alpha.tar.gz.sig 566 BLAKE2B 33c23b3aace6856f67b927d2f5b46f60f1e96eedde6a7e2cf5085e44b96da6503a8c38d5977a1dd7b068d9cb9ae652d457e9344eb40b482979d810afeb38f888 SHA512 f3fce937be1753b94110f2cf8ea1da52905133f8a62f9b2f91f6b5c91d2400ae63e000b392a0b992cd16495227077c0f26f1e36349b048e84a6bb8d3e618fd28 +DIST xz-5.7.2beta.tar.gz 2568902 BLAKE2B e7474e89bb628ea1a4a906ecad19be6b2bef30f2a674f9a384d20a5f1536cd8db0486f953de828ab327cef22a50dc23786e925b266b4f7398510c06707184699 SHA512 a9f373dcbfbfa0badac78f51678c078b455fc977744b80e04ae1f1dc19b1df681adb4097a4dfe2f50c7811e8f89287ab9d3bc28c00a8b48549adfe9bbc3f00a1 +DIST xz-5.7.2beta.tar.gz.sig 566 BLAKE2B 477e29d86a8dd76ea4eede8da223031ae36110d859afd46f18cd9fe67af6bc64cd0d80501d83c5fbd044d01b5307a69d634fe15a244096d2278a28c576628148 SHA512 cbbe79a2e00af78aeecb959fcda4dfe6d178f0a11cb9f64407b8850e586dcd50a386de41a675a9274b9be3d2122facf1377271a5fc6f9f3288e7b1f2598e5999 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.2-r1.ebuild deleted file mode 100644 index 3f799e1eed..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.2-r1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Remember: we cannot leverage autotools in this ebuild in order -# to avoid circular deps with autotools - -EAPI=8 - -inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs - -if [[ ${PV} == 9999 ]] ; then - # 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 - BDEPEND="sys-devel/gettext >=dev-build/libtool-2" -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lassecollin.asc - inherit verify-sig - - MY_P="${PN/-utils}-${PV/_}" - SRC_URI=" - https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz - https://downloads.sourceforge.net/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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - fi - - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Utils for managing LZMA compressed files" -HOMEPAGE="https://tukaani.org/xz/" - -# See top-level COPYING file as it outlines the various pieces and their licenses. -LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )" -SLOT="0" -IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs" - -if [[ ${PV} != 9999 ]] ; then - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )" -fi - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautopoint - eautoreconf - else - # Allow building shared libs on Solaris/x64 - elibtoolize - fi -} - -multilib_src_configure() { - # Workaround for bug #934370 (libtool-2.5.0), drop when dist tarball - # uses newer libtool with the fix. - export ac_cv_prog_ac_ct_FILECMD='file' FILECMD='file' - - local myconf=( - --enable-threads - $(multilib_native_use_enable doc) - $(use_enable nls) - $(use_enable static-libs static) - $(use_enable cpu_flags_arm_crc32 arm64-crc32) - ) - - if ! multilib_is_native_abi ; then - myconf+=( - --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} - ) - fi - - if ! use extra-filters ; then - myconf+=( - # LZMA1 + LZMA2 for standard .lzma & .xz files - --enable-encoders=lzma1,lzma2 - --enable-decoders=lzma1,lzma2 - - # those are used by default, depending on preset - --enable-match-finders=hc3,hc4,bt4 - - # CRC64 is used by default, though some (old?) files use CRC32 - --enable-checks=crc32,crc64 - ) - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - export gl_cv_posix_shell="${EPREFIX}"/bin/sh - - # Undo Solaris-based defaults pointing to /usr/xpg5/bin - myconf+=( --disable-path-for-script ) - fi - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_compile() { - # -fprofile-partial-training because upstream note the test suite isn't super comprehensive - # TODO: revisit that now we have the tar/xz loop below? - # See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo - local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") - local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") - - emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" - - if use pgo ; then - emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check - - local tar_pgo_args=() - - if has_version -b "app-alternatives/tar[gnu]" ; then - tar_pgo_args+=( - --mtime=@2718281828 - --sort=name - ) - fi - - if multilib_is_native_abi ; then - ( - shopt -s globstar - - tar \ - "${tar_pgo_args[@]}" \ - -cf xz-pgo-test-01.tar \ - {"${S}","${BUILD_DIR}"}/**/*.[cho] \ - {"${S}","${BUILD_DIR}"}/**/.libs/* \ - {"${S}","${BUILD_DIR}"}/**/**.txt \ - {"${S}","${BUILD_DIR}"}/tests/files - - stat --printf="xz-pgo-test-01.tar.tar size: %s\n" xz-pgo-test-01.tar || die - md5sum xz-pgo-test-01.tar || die - ) - - local test_variants=( - # Borrowed from ALT Linux - # https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80 - '-0 -C none' - '-2 -C crc32' - "$(usev extra-filters '-6 --arm --lzma2 -C crc64')" - "$(usev extra-filters '-6 --x86 --lzma2=lc=4 -C sha256')" - '-7e --format=lzma' - - # Our own variants - '' - '-9e' - "$(usev extra-filters '--x86 --lzma2=preset=9e')" - ) - local test_variant - for test_variant in "${test_variants[@]}" ; do - "${BUILD_DIR}"/src/xz/xz -c ${test_variant} xz-pgo-test-01.tar | "${BUILD_DIR}"/src/xz/xz -c -d - > /dev/null - assert "Testing '${test_variant}' variant failed" - done - fi - - if tc-is-clang; then - llvm-profdata merge "${T}"/${ABI}-pgo --output="${T}"/${ABI}-pgo/default.profdata || die - fi - - emake clean - emake CFLAGS="${CFLAGS} ${pgo_use_flags}" - fi -} - -multilib_src_install() { - default - - # bug #934370 and bug #450436 (and bug #934515) - if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/liblzma$(get_libname)" ]] ; then - eerror "Sanity check for liblzma$(get_libname) failed." - eerror "Shared library wasn't built, possible libtool bug" - [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "liblzma$(get_libname) not found in build, aborting" - fi -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die - - if use doc ; then - rm "${ED}"/usr/share/doc/${PF}/COPYING* || die - fi -} - -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0) -} - -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0) -} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.4.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.4.ebuild index 9ee03ab5b7..b5e36a0511 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.4.ebuild @@ -35,7 +35,7 @@ else " if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.7.1_alpha.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.7.2_beta.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.7.1_alpha.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.7.2_beta.ebuild index 9ee03ab5b7..b4b85808bc 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.7.1_alpha.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.7.2_beta.ebuild @@ -50,7 +50,7 @@ SLOT="0" IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs" if [[ ${PV} != 9999 ]] ; then - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20250313 )" fi src_prepare() { 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 9ee03ab5b7..b4b85808bc 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 @@ -50,7 +50,7 @@ SLOT="0" IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs" if [[ ${PV} != 9999 ]] ; then - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )" + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20250313 )" fi src_prepare() { From f5c59e24efc22f67ced6c878170ae0d6dd11645c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:16 +0000 Subject: [PATCH 004/153] app-arch/zstd: Sync with Gentoo It's from Gentoo commit 2ad4ad308e454b53feb07b8a184dc1d90940e553. --- .../third_party/portage-stable/app-arch/zstd/zstd-1.5.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.7.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.7.ebuild index e64deb3eb4..6d1fa6b838 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.7.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson LICENSE="|| ( BSD GPL-2 )" SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+lzma lz4 static-libs test zlib" RESTRICT="!test? ( test )" From 515058f927ddd9cc8de475a544efb2c4105f6370 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:18 +0000 Subject: [PATCH 005/153] app-containers/containerd: Sync with Gentoo It's from Gentoo commit cb793709180c5cf2e6a356b9a43a8731fa756419. --- .../portage-stable/app-containers/containerd/Manifest | 2 +- .../app-containers/containerd/containerd-2.0.2.ebuild | 2 +- .../{containerd-2.0.1.ebuild => containerd-2.0.3.ebuild} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/portage-stable/app-containers/containerd/{containerd-2.0.1.ebuild => containerd-2.0.3.ebuild} (92%) diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containerd/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/containerd/Manifest index 237fcc5c6a..1a06b858fa 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/containerd/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/containerd/Manifest @@ -1,2 +1,2 @@ -DIST containerd-2.0.1.tar.gz 10423945 BLAKE2B 7f77678557bf649c71475d3ff08a57579b8959ef19a5f8fc1c27b8e8eacea01572d44d3f6dff1f53b72c1b7cf153413a5152391a78b0d5bd624a4c5267381144 SHA512 7875eee0fb274545acb4d62f5bca808105580177db6007e59164fd57830ea3e8ab646b8e227027016bf8dd4816341d38a620bfef48bb0fd83de006b1a91826b7 DIST containerd-2.0.2.tar.gz 10379986 BLAKE2B aee39f749f056965b899f6525bebe00d46b72b6c437efbd01ed890c5ae9c5d812464bc6d10e32aea20fd0c6df00d98cd30502dd73f9a27b0d8d143a5542976d9 SHA512 86eb24acfa5d4d87ae396f8888e2484693823fad897a29f1a5ada78e2318640927cfcff1e85415bfd6c66f5417e582203eb94976d52e3dd373997e6e2cbae354 +DIST containerd-2.0.3.tar.gz 10450757 BLAKE2B 5dec56a40dc2874fb0b6fd4d72704f6417858eefd983c8ec5dfb2c9ef8be1e9e309cff83395e03c2d5fef30ed5c0561329ffbcd3dfba91e40d8017f7a605771b SHA512 9528a65d9d9f13d15d861f7ce71ab483958020bda83947d18868b477204e9e2e33eccc69280502c54b2be9ce577724e3e2b1772229c99636099b04bac1079ac1 diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containerd/containerd-2.0.2.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containerd/containerd-2.0.2.ebuild index 37fb931e51..f205a48da4 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/containerd/containerd-2.0.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/containerd/containerd-2.0.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86" IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" COMMON_DEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containerd/containerd-2.0.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containerd/containerd-2.0.3.ebuild similarity index 92% rename from sdk_container/src/third_party/portage-stable/app-containers/containerd/containerd-2.0.1.ebuild rename to sdk_container/src/third_party/portage-stable/app-containers/containerd/containerd-2.0.3.ebuild index 82e4dbe7a8..e7315295f1 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/containerd/containerd-2.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/containerd/containerd-2.0.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 inherit go-module systemd -GIT_REVISION=88aa2f531d6c2922003cc7929e51daf1c14caa0a +GIT_REVISION=06b99ca80cdbfbc6cc8bd567021738c9af2b36ce DESCRIPTION="A daemon to control runC" HOMEPAGE="https://containerd.io/" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test" COMMON_DEPEND=" @@ -26,7 +26,7 @@ ${COMMON_DEPEND} # recommended minimum version of runc is found in script/setup/runc-version RDEPEND=" ${COMMON_DEPEND} - >=app-containers/runc-1.2.1[apparmor?,seccomp?] + >=app-containers/runc-1.2.5[apparmor?,seccomp?] " BDEPEND=" From ebfc7502fdd14d4bf897b7f8601a984d38ccbce3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:21 +0000 Subject: [PATCH 006/153] app-containers/crun: Sync with Gentoo It's from Gentoo commit a870a3a8a6e29caafb3f9ae57f928a8e0267606c. --- .../app-containers/crun/Manifest | 1 + .../app-containers/crun/crun-1.19.1.ebuild | 2 +- .../app-containers/crun/crun-1.20.ebuild | 74 +++++++++++++++++++ 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.20.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-containers/crun/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/crun/Manifest index 1623112afe..dbc943f3d1 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/crun/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/crun/Manifest @@ -2,3 +2,4 @@ DIST crun-1.14.3.tar.xz 750456 BLAKE2B 5a63b5da2f85ff1a83d4589be224c5b7a1123b6d7 DIST crun-1.16.tar.gz 1759549 BLAKE2B 1dfdf9177ae52e627c92e70e48a558bb355c87f629e95f1debaf6b7d8c38802110bd796545d5b2dbe3cac7f8de1f9c94e9b5f046cc618e73afd4c434188d585c SHA512 718e17abdb8c2a9e1fdd39f09e7e3e435d88c5785cc13c1e67f492847d7d938cf399aecc055ecf88720fa8f73b8539f057e3b0e53f10f4e382f5664a2243b959 DIST crun-1.17.tar.gz 1773153 BLAKE2B 9f75cb6879e0b8cd47bb8939c1cf6f88d5e13e6d8932c652ea20c64501bc69fbda84dd061866a9c08e353848f39d1022bf67fbc0d160d5ef7fdc08c1edec03f9 SHA512 7556467c5e0e93bb7321e2e88de8a2f537340e3e0acaa5501eab8deb0f4bb93c4561f8d063156789d3ee98fdd49069fc52c0ed0c773bd44db476eeeccc16aa1a DIST crun-1.19.1.tar.gz 1786019 BLAKE2B 555f7c917c9e9ed80919b708cd711890d47c395b5b6fa1c2b542d311176941c5ece23bd7ff0cb4c3dcf81be4f46fec21fa8127da57092657157707537771dfe1 SHA512 6cb6148a3b6e18b4dbb0178ea23eaaa57c040781a34b5c5c5dac71be513941717011fe996a7400b9dee0a73f7f0dd2fc36544fe72382a3f2543e4de90589fe6a +DIST crun-1.20.tar.gz 1787750 BLAKE2B 4f31c21056c6c764c76021d3121dfaa4dd9b91f17def977238df831af02f27aff267cf22c3f1ade4f332d757ffc50cc98a480aea7cd67b3552f19ba5c810c3f8 SHA512 759326768a9a141ecaec5824e3c30cade0a0c7d848935d434cada4fdc5a59a992f1916515141a84387cdb95ee1307f5bec471679d7ff9b403b0cb2b10c7dfd74 diff --git a/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.19.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.19.1.ebuild index f1b4ab0666..b543813618 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.19.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.19.1.ebuild @@ -15,7 +15,7 @@ if [[ "$PV" == *9999* ]]; then EGIT_REPO_URI="https://github.com/containers/${PN}.git" else SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv" + KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv" fi LICENSE="GPL-2+ LGPL-2.1+" diff --git a/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.20.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.20.ebuild new file mode 100644 index 0000000000..2e67a51ee6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.20.ebuild @@ -0,0 +1,74 @@ +# Copyright 2019-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit python-any-r1 + +DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C" +HOMEPAGE="https://github.com/containers/crun" + +if [[ "$PV" == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/${PN}.git" +else + SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv" +fi + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +IUSE="+bpf +caps criu +seccomp selinux systemd static-libs" + +DEPEND=" + dev-libs/yajl:= + sys-kernel/linux-headers + caps? ( sys-libs/libcap ) + criu? ( >=sys-process/criu-3.15 ) + seccomp? ( sys-libs/libseccomp ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-container )" +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +src_configure() { + local myeconfargs=( + --cache-file="${S}"/config.cache + $(use_enable bpf) + $(use_enable caps) + $(use_enable criu) + $(use_enable seccomp) + $(use_enable systemd) + --enable-shared + $(use_enable static-libs static) + ) + econf "${myeconfargs[@]}" +} + +src_test() { + emake check-TESTS -C ./libocispec + + # the crun test suite is comprehensive to the extent that tests will fail + # within a sandbox environment, due to the nature of the privileges + # required to create linux "containers". + local supported_tests=( + "tests/tests_libcrun_utils" + "tests/tests_libcrun_errors" + "tests/tests_libcrun_intelrdt" + ) + emake check-TESTS TESTS="${supported_tests[*]}" +} + +src_install() { + emake "DESTDIR=${D}" install-exec + doman crun.1 + einstalldocs + + find "${ED}" -name '*.la' -type f -delete || die +} From e0d1d092c8e1134f6b97378a11357f431a34283e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:21 +0000 Subject: [PATCH 007/153] app-containers/docker: Sync with Gentoo It's from Gentoo commit c93ae41478342596ba0b9fe9d33f99979515135e. --- .../app-containers/docker/Manifest | 3 - .../docker/docker-27.4.1-r1.ebuild | 331 ------------------ .../docker/docker-27.5.0.ebuild | 331 ------------------ .../docker/docker-27.5.1.ebuild | 331 ------------------ .../docker/docker-28.0.1.ebuild | 4 +- 5 files changed, 2 insertions(+), 998 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.4.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.5.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.5.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest index 28925755b1..2a0ba14294 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/docker/Manifest @@ -1,4 +1 @@ -DIST docker-27.4.1.tar.gz 16837429 BLAKE2B da2e915944a0260619b1e036b43d40f5cbff66f07182153c0ae238ecbcecdfe2066473887882fdaaffa5ef29e2328211f1d07ba3a5239381f9e82d34d9da43fe SHA512 3d77708f7373c1b58b1c46428c2cfc9e8985076e494e40ab86709f37a686cf92b9e2c9db5aa34293f728bb7ccd6a7e08e0cbb1c6d20acfd025c4c787d5908dc0 -DIST docker-27.5.0.tar.gz 17076981 BLAKE2B 20dfdb9fb3d594520f063352c28ccc7a936ec2dc0cd6d04737c2d8c78c54db024ac33fc986ddf06cbe4f496b27bd6e63cc3a2532f3c36b83cf8f9eca0dbae3a2 SHA512 89245805edebd7d43d5b47a38aba115239c20448fc10bce5a1605f99951a303ba360456a54815ffc5346cdd97ddd08657df1881c97f79066e9e2bd075af542da -DIST docker-27.5.1.tar.gz 17077765 BLAKE2B dc6bfa960fc5c8c45629284dcdaddd6df3295dea2259ebf003900efbb24a4f4719030b5e12baaa87e4c1e3ecf27e1c4ef9e3f9b2fccef1541908fbee4ebecbc8 SHA512 6080fa59efa5b35b23bbd363569df7261783ab2527cda9c391f0853b58b55e34824b4a6019e0366aaed5cfaba5ff70b253dcc90b1b77149a85eea0c282d05bdf DIST docker-28.0.1.tar.gz 17553228 BLAKE2B 8c172d58fb75d307983ace06b509e86ed533729d75a27af114939cad9022980f692368249f6ef514912aa90f1fa09998fd658377e28d2e2577d53b6f745cf5db SHA512 58c77ae139e5d32c4c263fa14ec4457f50240a15cd7934b4d2576af0295bfb5b62abbeef0ba78815f9041a01dbe3a8b35351eaebea1f584f54ef0d4192734048 diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.4.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.4.1-r1.ebuild deleted file mode 100644 index c3992cb0f3..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.4.1-r1.ebuild +++ /dev/null @@ -1,331 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -MY_PV=${PV/_/-} -inherit go-module linux-info optfeature systemd toolchain-funcs udev -GIT_COMMIT=c710b88579fcb5e0d53f96dcae976d79323b9166 - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://www.docker.com/" -SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/moby-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86" -IUSE="apparmor btrfs +container-init cuda +overlay2 seccomp selinux systemd" - -DEPEND=" - acct-group/docker - >=dev-db/sqlite-3.7.9:3 - apparmor? ( sys-libs/libapparmor ) - btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) - systemd? ( sys-apps/systemd ) -" - -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - >=app-containers/containerd-1.7.24[apparmor?,btrfs?,seccomp?] - >=app-containers/runc-1.2.2[apparmor?,seccomp?] - !app-containers/docker-proxy - !=sys-process/tini-0.19.0[static] ) - cuda? ( app-containers/nvidia-container-toolkit ) - selinux? ( sec-policy/selinux-docker ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig -" -# tests require running dockerd as root and downloading containers -RESTRICT="installsources strip test" - -# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552 -pkg_setup() { - # this is based on "contrib/check-config.sh" from upstream's sources - # required features. - CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NETFILTER_XT_MATCH_CONNTRACK - ~NETFILTER_XT_MATCH_IPVS - ~NETFILTER_XT_MARK - ~IP_NF_NAT ~NF_NAT - ~POSIX_MQUEUE - " - WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers" - - if kernel_is lt 4 8; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if kernel_is le 5 1; then - CONFIG_CHECK+=" - ~NF_NAT_IPV4 - " - fi - - if kernel_is le 5 2; then - CONFIG_CHECK+=" - ~NF_NAT_NEEDED - " - fi - - if kernel_is ge 4 15; then - CONFIG_CHECK+=" - ~CGROUP_BPF - " - fi - - # optional features - CONFIG_CHECK+=" - ~USER_NS - " - - if use seccomp; then - CONFIG_CHECK+=" - ~SECCOMP ~SECCOMP_FILTER - " - fi - - CONFIG_CHECK+=" - ~CGROUP_PIDS - " - - if kernel_is lt 6 1; then - CONFIG_CHECK+=" - ~MEMCG_SWAP - " - fi - - if kernel_is le 5 8; then - CONFIG_CHECK+=" - ~MEMCG_SWAP_ENABLED - " - fi - - CONFIG_CHECK+=" - ~!LEGACY_VSYSCALL_NATIVE - " - if kernel_is lt 5 19; then - CONFIG_CHECK+=" - ~LEGACY_VSYSCALL_EMULATE - " - fi - CONFIG_CHECK+=" - ~!LEGACY_VSYSCALL_NONE - " - WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \ - Containers with <=glibc-2.13 will not work" - - if kernel_is le 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - fi - - if kernel_is lt 5; then - CONFIG_CHECK+=" - ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED - " - fi - - CONFIG_CHECK+=" - ~BLK_CGROUP ~BLK_DEV_THROTTLING - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP ~CGROUP_NET_PRIO - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED - ~IP_NF_TARGET_REDIRECT - ~IP_VS - ~IP_VS_NFCT - ~IP_VS_PROTO_TCP - ~IP_VS_PROTO_UDP - ~IP_VS_RR - " - - if use selinux; then - CONFIG_CHECK+=" - ~SECURITY_SELINUX - " - fi - - if use apparmor; then - CONFIG_CHECK+=" - ~SECURITY_APPARMOR - " - fi - - # if ! is_set EXT4_USE_FOR_EXT2; then - # check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY - # if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then - # echo " $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)" - # fi - # fi - - CONFIG_CHECK+=" - ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - - # if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then - # if is_set EXT4_USE_FOR_EXT2; then - # echo " $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)" - # else - # echo " $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)" - # fi - # fi - - # network drivers - CONFIG_CHECK+=" - ~VXLAN ~BRIDGE_VLAN_FILTERING - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH - ~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP - " - if kernel_is le 5 3; then - CONFIG_CHECK+=" - ~INET_XFRM_MODE_TRANSPORT - " - fi - - CONFIG_CHECK+=" - ~IPVLAN - " - CONFIG_CHECK+=" - ~MACVLAN ~DUMMY - " - CONFIG_CHECK+=" - ~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP - " - - # storage drivers - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - CONFIG_CHECK+=" - ~OVERLAY_FS - " - - linux-info_pkg_setup -} - -src_unpack() { - default - cd "${S}" - [[ -f go.mod ]] || ln -s vendor.mod go.mod || die - [[ -f go.sum ]] || ln -s vendor.sum go.sum || die -} - -src_compile() { - export DOCKER_GITCOMMIT="${GIT_COMMIT}" - export VERSION=${PV} - tc-export PKG_CONFIG - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" - CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in btrfs overlay2; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor seccomp; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - export AUTO_GOPATH=1 - export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y') - export GO_MD2MAN=/usr/bin/go-md2man - - # build binaries - ./hack/make.sh dynbinary || die 'dynbinary failed' - - # build man page - cd man || die - emake || die -} - -src_install() { - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim-runc-v2 /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - dobin bundles/dynbinary-daemon/dockerd - dobin bundles/dynbinary-daemon/docker-proxy - for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do - dosym ../share/docker/contrib/${f} /usr/bin/${f} - done - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md NOTICE README.md - dodoc -r docs/* - doman man/man8/dockerd.8 - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot:" - if systemd_is_booted || has_version sys-apps/systemd; then - elog " systemctl enable docker.service" - else - elog " rc-update add docker default" - fi - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog ' usermod -aG docker ' - elog - - if has_version sys-fs/zfs; then - elog " ZFS storage driver is available" - elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" - elog - fi - - optfeature "rootless mode support" sys-apps/shadow - optfeature "rootless mode support" sys-apps/rootlesskit - optfeature_header "for rootless mode you also need a network stack" - optfeature "rootless mode network stack" app-containers/slirp4netns -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.5.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.5.0.ebuild deleted file mode 100644 index 852b70a8ce..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.5.0.ebuild +++ /dev/null @@ -1,331 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -MY_PV=${PV/_/-} -inherit go-module linux-info optfeature systemd toolchain-funcs udev -GIT_COMMIT=38b84dce32c45732606fe09ffebef8b29a783644 - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://www.docker.com/" -SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/moby-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="apparmor btrfs +container-init cuda +overlay2 seccomp selinux systemd" - -DEPEND=" - acct-group/docker - >=dev-db/sqlite-3.7.9:3 - apparmor? ( sys-libs/libapparmor ) - btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) - systemd? ( sys-apps/systemd ) -" - -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - >=app-containers/containerd-1.7.24[apparmor?,btrfs?,seccomp?] - >=app-containers/runc-1.2.2[apparmor?,seccomp?] - !app-containers/docker-proxy - !=sys-process/tini-0.19.0[static] ) - cuda? ( app-containers/nvidia-container-toolkit ) - selinux? ( sec-policy/selinux-docker ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig -" -# tests require running dockerd as root and downloading containers -RESTRICT="installsources strip test" - -# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552 -pkg_setup() { - # this is based on "contrib/check-config.sh" from upstream's sources - # required features. - CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NETFILTER_XT_MATCH_CONNTRACK - ~NETFILTER_XT_MATCH_IPVS - ~NETFILTER_XT_MARK - ~IP_NF_NAT ~NF_NAT - ~POSIX_MQUEUE - " - WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers" - - if kernel_is lt 4 8; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if kernel_is le 5 1; then - CONFIG_CHECK+=" - ~NF_NAT_IPV4 - " - fi - - if kernel_is le 5 2; then - CONFIG_CHECK+=" - ~NF_NAT_NEEDED - " - fi - - if kernel_is ge 4 15; then - CONFIG_CHECK+=" - ~CGROUP_BPF - " - fi - - # optional features - CONFIG_CHECK+=" - ~USER_NS - " - - if use seccomp; then - CONFIG_CHECK+=" - ~SECCOMP ~SECCOMP_FILTER - " - fi - - CONFIG_CHECK+=" - ~CGROUP_PIDS - " - - if kernel_is lt 6 1; then - CONFIG_CHECK+=" - ~MEMCG_SWAP - " - fi - - if kernel_is le 5 8; then - CONFIG_CHECK+=" - ~MEMCG_SWAP_ENABLED - " - fi - - CONFIG_CHECK+=" - ~!LEGACY_VSYSCALL_NATIVE - " - if kernel_is lt 5 19; then - CONFIG_CHECK+=" - ~LEGACY_VSYSCALL_EMULATE - " - fi - CONFIG_CHECK+=" - ~!LEGACY_VSYSCALL_NONE - " - WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \ - Containers with <=glibc-2.13 will not work" - - if kernel_is le 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - fi - - if kernel_is lt 5; then - CONFIG_CHECK+=" - ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED - " - fi - - CONFIG_CHECK+=" - ~BLK_CGROUP ~BLK_DEV_THROTTLING - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP ~CGROUP_NET_PRIO - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED - ~IP_NF_TARGET_REDIRECT - ~IP_VS - ~IP_VS_NFCT - ~IP_VS_PROTO_TCP - ~IP_VS_PROTO_UDP - ~IP_VS_RR - " - - if use selinux; then - CONFIG_CHECK+=" - ~SECURITY_SELINUX - " - fi - - if use apparmor; then - CONFIG_CHECK+=" - ~SECURITY_APPARMOR - " - fi - - # if ! is_set EXT4_USE_FOR_EXT2; then - # check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY - # if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then - # echo " $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)" - # fi - # fi - - CONFIG_CHECK+=" - ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - - # if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then - # if is_set EXT4_USE_FOR_EXT2; then - # echo " $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)" - # else - # echo " $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)" - # fi - # fi - - # network drivers - CONFIG_CHECK+=" - ~VXLAN ~BRIDGE_VLAN_FILTERING - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH - ~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP - " - if kernel_is le 5 3; then - CONFIG_CHECK+=" - ~INET_XFRM_MODE_TRANSPORT - " - fi - - CONFIG_CHECK+=" - ~IPVLAN - " - CONFIG_CHECK+=" - ~MACVLAN ~DUMMY - " - CONFIG_CHECK+=" - ~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP - " - - # storage drivers - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - CONFIG_CHECK+=" - ~OVERLAY_FS - " - - linux-info_pkg_setup -} - -src_unpack() { - default - cd "${S}" - [[ -f go.mod ]] || ln -s vendor.mod go.mod || die - [[ -f go.sum ]] || ln -s vendor.sum go.sum || die -} - -src_compile() { - export DOCKER_GITCOMMIT="${GIT_COMMIT}" - export VERSION=${PV} - tc-export PKG_CONFIG - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" - CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in btrfs overlay2; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor seccomp; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - export AUTO_GOPATH=1 - export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y') - export GO_MD2MAN=/usr/bin/go-md2man - - # build binaries - ./hack/make.sh dynbinary || die 'dynbinary failed' - - # build man page - cd man || die - emake || die -} - -src_install() { - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim-runc-v2 /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - dobin bundles/dynbinary-daemon/dockerd - dobin bundles/dynbinary-daemon/docker-proxy - for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do - dosym ../share/docker/contrib/${f} /usr/bin/${f} - done - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md NOTICE README.md - dodoc -r docs/* - doman man/man8/dockerd.8 - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot:" - if systemd_is_booted || has_version sys-apps/systemd; then - elog " systemctl enable docker.service" - else - elog " rc-update add docker default" - fi - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog ' usermod -aG docker ' - elog - - if has_version sys-fs/zfs; then - elog " ZFS storage driver is available" - elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" - elog - fi - - optfeature "rootless mode support" sys-apps/shadow - optfeature "rootless mode support" sys-apps/rootlesskit - optfeature_header "for rootless mode you also need a network stack" - optfeature "rootless mode network stack" app-containers/slirp4netns -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.5.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.5.1.ebuild deleted file mode 100644 index 917f65bb2a..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-27.5.1.ebuild +++ /dev/null @@ -1,331 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -MY_PV=${PV/_/-} -inherit go-module linux-info optfeature systemd toolchain-funcs udev -GIT_COMMIT=4c9b3b011ae4c30145a7b344c870bdda01b454e2 - -DESCRIPTION="The core functions you need to create Docker images and run Docker containers" -HOMEPAGE="https://www.docker.com/" -SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/moby-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="apparmor btrfs +container-init cuda +overlay2 seccomp selinux systemd" - -DEPEND=" - acct-group/docker - >=dev-db/sqlite-3.7.9:3 - apparmor? ( sys-libs/libapparmor ) - btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) - seccomp? ( >=sys-libs/libseccomp-2.2.1 ) - systemd? ( sys-apps/systemd ) -" - -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies -# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies -RDEPEND=" - ${DEPEND} - >=net-firewall/iptables-1.4 - sys-process/procps - >=dev-vcs/git-1.7 - >=app-arch/xz-utils-4.9 - >=app-containers/containerd-1.7.24[apparmor?,btrfs?,seccomp?] - >=app-containers/runc-1.2.2[apparmor?,seccomp?] - !app-containers/docker-proxy - !=sys-process/tini-0.19.0[static] ) - cuda? ( app-containers/nvidia-container-toolkit ) - selinux? ( sec-policy/selinux-docker ) -" - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig -" -# tests require running dockerd as root and downloading containers -RESTRICT="installsources strip test" - -# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552 -pkg_setup() { - # this is based on "contrib/check-config.sh" from upstream's sources - # required features. - CONFIG_CHECK=" - ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~KEYS - ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE - ~NETFILTER_XT_MATCH_ADDRTYPE - ~NETFILTER_XT_MATCH_CONNTRACK - ~NETFILTER_XT_MATCH_IPVS - ~NETFILTER_XT_MARK - ~IP_NF_NAT ~NF_NAT - ~POSIX_MQUEUE - " - WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers" - - if kernel_is lt 4 8; then - CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES - " - fi - - if kernel_is le 5 1; then - CONFIG_CHECK+=" - ~NF_NAT_IPV4 - " - fi - - if kernel_is le 5 2; then - CONFIG_CHECK+=" - ~NF_NAT_NEEDED - " - fi - - if kernel_is ge 4 15; then - CONFIG_CHECK+=" - ~CGROUP_BPF - " - fi - - # optional features - CONFIG_CHECK+=" - ~USER_NS - " - - if use seccomp; then - CONFIG_CHECK+=" - ~SECCOMP ~SECCOMP_FILTER - " - fi - - CONFIG_CHECK+=" - ~CGROUP_PIDS - " - - if kernel_is lt 6 1; then - CONFIG_CHECK+=" - ~MEMCG_SWAP - " - fi - - if kernel_is le 5 8; then - CONFIG_CHECK+=" - ~MEMCG_SWAP_ENABLED - " - fi - - CONFIG_CHECK+=" - ~!LEGACY_VSYSCALL_NATIVE - " - if kernel_is lt 5 19; then - CONFIG_CHECK+=" - ~LEGACY_VSYSCALL_EMULATE - " - fi - CONFIG_CHECK+=" - ~!LEGACY_VSYSCALL_NONE - " - WARNING_LEGACY_VSYSCALL_NONE="CONFIG_LEGACY_VSYSCALL_NONE enabled: \ - Containers with <=glibc-2.13 will not work" - - if kernel_is le 4 5; then - CONFIG_CHECK+=" - ~MEMCG_KMEM - " - fi - - if kernel_is lt 5; then - CONFIG_CHECK+=" - ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED - " - fi - - CONFIG_CHECK+=" - ~BLK_CGROUP ~BLK_DEV_THROTTLING - ~CGROUP_PERF - ~CGROUP_HUGETLB - ~NET_CLS_CGROUP ~CGROUP_NET_PRIO - ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED - ~IP_NF_TARGET_REDIRECT - ~IP_VS - ~IP_VS_NFCT - ~IP_VS_PROTO_TCP - ~IP_VS_PROTO_UDP - ~IP_VS_RR - " - - if use selinux; then - CONFIG_CHECK+=" - ~SECURITY_SELINUX - " - fi - - if use apparmor; then - CONFIG_CHECK+=" - ~SECURITY_APPARMOR - " - fi - - # if ! is_set EXT4_USE_FOR_EXT2; then - # check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY - # if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then - # echo " $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)" - # fi - # fi - - CONFIG_CHECK+=" - ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY - " - - # if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then - # if is_set EXT4_USE_FOR_EXT2; then - # echo " $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)" - # else - # echo " $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)" - # fi - # fi - - # network drivers - CONFIG_CHECK+=" - ~VXLAN ~BRIDGE_VLAN_FILTERING - ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH - ~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP - " - if kernel_is le 5 3; then - CONFIG_CHECK+=" - ~INET_XFRM_MODE_TRANSPORT - " - fi - - CONFIG_CHECK+=" - ~IPVLAN - " - CONFIG_CHECK+=" - ~MACVLAN ~DUMMY - " - CONFIG_CHECK+=" - ~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP - " - - # storage drivers - if use btrfs; then - CONFIG_CHECK+=" - ~BTRFS_FS - ~BTRFS_FS_POSIX_ACL - " - fi - - CONFIG_CHECK+=" - ~OVERLAY_FS - " - - linux-info_pkg_setup -} - -src_unpack() { - default - cd "${S}" - [[ -f go.mod ]] || ln -s vendor.mod go.mod || die - [[ -f go.sum ]] || ln -s vendor.sum go.sum || die -} - -src_compile() { - export DOCKER_GITCOMMIT="${GIT_COMMIT}" - export VERSION=${PV} - tc-export PKG_CONFIG - - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" - CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" - - # let's set up some optional features :) - export DOCKER_BUILDTAGS='' - for gd in btrfs overlay2; do - if ! use $gd; then - DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" - fi - done - - for tag in apparmor seccomp; do - if use $tag; then - DOCKER_BUILDTAGS+=" $tag" - fi - done - - export AUTO_GOPATH=1 - export EXCLUDE_AUTO_BUILDTAG_JOURNALD=$(usex systemd '' 'y') - export GO_MD2MAN=/usr/bin/go-md2man - - # build binaries - ./hack/make.sh dynbinary || die 'dynbinary failed' - - # build man page - cd man || die - emake || die -} - -src_install() { - dosym containerd /usr/bin/docker-containerd - dosym containerd-shim-runc-v2 /usr/bin/docker-containerd-shim - dosym runc /usr/bin/docker-runc - use container-init && dosym tini /usr/bin/docker-init - dobin bundles/dynbinary-daemon/dockerd - dobin bundles/dynbinary-daemon/docker-proxy - for f in dockerd-rootless-setuptool.sh dockerd-rootless.sh; do - dosym ../share/docker/contrib/${f} /usr/bin/${f} - done - - newinitd contrib/init/openrc/docker.initd docker - newconfd contrib/init/openrc/docker.confd docker - - systemd_dounit contrib/init/systemd/docker.{service,socket} - - udev_dorules contrib/udev/*.rules - - dodoc AUTHORS CONTRIBUTING.md NOTICE README.md - dodoc -r docs/* - doman man/man8/dockerd.8 - - # note: intentionally not using "doins" so that we preserve +x bits - dodir /usr/share/${PN}/contrib - cp -R contrib/* "${ED}/usr/share/${PN}/contrib" -} - -pkg_postinst() { - udev_reload - - elog - elog "To use Docker, the Docker daemon must be running as root. To automatically" - elog "start the Docker daemon at boot:" - if systemd_is_booted || has_version sys-apps/systemd; then - elog " systemctl enable docker.service" - else - elog " rc-update add docker default" - fi - elog - elog "To use Docker as a non-root user, add yourself to the 'docker' group:" - elog ' usermod -aG docker ' - elog - - if has_version sys-fs/zfs; then - elog " ZFS storage driver is available" - elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" - elog - fi - - optfeature "rootless mode support" sys-apps/shadow - optfeature "rootless mode support" sys-apps/rootlesskit - optfeature_header "for rootless mode you also need a network stack" - optfeature "rootless mode network stack" app-containers/slirp4netns -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-28.0.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-28.0.1.ebuild index d8ee083521..3fdc9f584e 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-28.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/docker/docker-28.0.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/moby-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86" IUSE="apparmor btrfs +container-init cuda +overlay2 seccomp selinux systemd" DEPEND=" @@ -61,7 +61,7 @@ pkg_setup() { ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG ~KEYS ~VETH ~BRIDGE ~BRIDGE_NETFILTER - ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~IP_NF_FILTER ~IP_NF_RAW ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS From e85eeba430ba102e8f0bc749ef40b4e05d649f6a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:21 +0000 Subject: [PATCH 008/153] app-containers/docker-buildx: Sync with Gentoo It's from Gentoo commit 8b5b838a550e0d1339dd04886be606a4aea8a3b3. --- .../app-containers/docker-buildx/Manifest | 1 + .../docker-buildx/docker-buildx-0.21.2.ebuild | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-containers/docker-buildx/docker-buildx-0.21.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-buildx/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/docker-buildx/Manifest index 5f648abe0f..9b8df572a7 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-buildx/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/docker-buildx/Manifest @@ -2,3 +2,4 @@ DIST docker-buildx-0.11.2.tar.gz 10342565 BLAKE2B 1e034e9a07f36b46096f8f035869ad DIST docker-buildx-0.14.0.tar.gz 11120356 BLAKE2B 01fec6b29665088a4778cb6a926f071c1beacb22d7a50593d55afff1225d0e74d083a82eaab4ae96ffee8a6f653ce048fd81b3410e7113bc29da210d77042b64 SHA512 bc09f29096cfd08c60efd8fca7976a1db896f0ed08d33dfc64dfca2c6487a1dc1722b3fe80b6a175ebebeacf8b460bcc214806d0c7a637f17ed5d09793d8c9d8 DIST docker-buildx-0.19.1.tar.gz 11691424 BLAKE2B 40cc5e68eb85e8693bc6cd7bf91fe3a6300644d9934a3ff84b89c79dba31d475dce5ac4366075127391c5230905591a83bd59c762cf9f9f4bde0931834633473 SHA512 cc811eb93910bfb5a4668cc3dc59ab6c13a1308c0fa49707a81d1d733e834d209677502786e951ce3c8f098c387b559054dd3cd9933edafbecae610d1ef321e6 DIST docker-buildx-0.20.1.tar.gz 12049522 BLAKE2B cc370f8a6bc82d9358cb59f99645447e83a4c84c656ae75409a504d0e0a973027791129d6eeb55827eb98904300d04c34685be993309e80f547514b76566fb2e SHA512 75c47204a2f11773ed978678735637fb8248ad87bb745e0b878ad7db161dea4d000dbfb98c83b03225efed126cc04b31d3a9ca500f8d3ac414620c7f980fa9cc +DIST docker-buildx-0.21.2.tar.gz 13608048 BLAKE2B 8229fe6d8d1b2b9f35213ae0ae879d90d7f96ca4688c787e7dcbb88e0aaa4444519c4e5fca51acf9e9d6f2bf697adf74b2c2d8440eec1660dbf10496eb76c243 SHA512 a90a9af1a9b986f99a08f3e53ca06cfac64378a92ab887653d3aa9e1538ef87fec4fbd719c5087782cf7dc5eb8845c9c0786605e7386d759c0e33ef5f121fbba diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-buildx/docker-buildx-0.21.2.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker-buildx/docker-buildx-0.21.2.ebuild new file mode 100644 index 0000000000..ed49cae7bf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-containers/docker-buildx/docker-buildx-0.21.2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="Docker CLI plugin for extended build capabilities with BuildKit" +HOMEPAGE="https://github.com/docker/buildx" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/docker/buildx.git" +else + SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + S=${WORKDIR}/${P#docker-} +fi + +LICENSE="Apache-2.0" +# Dependent licenses +LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" +SLOT="0" + +RDEPEND="app-containers/docker-cli" + +src_compile() { + local _buildx_r='github.com/docker/buildx' + local version=${PV} + if [[ ${PV} == 9999 ]]; then + version="$(git rev-parse --short HEAD)" + fi + local go_ldflags=( + "-linkmode=external" + -X "${_buildx_r}/version.Version=${version}" + -X "${_buildx_r}/version.Revision=$(date -u +%FT%T%z)" + -X "${_buildx_r}/version.Package=${_buildx_r}" + ) + ego build -o docker-buildx -ldflags "${go_ldflags[*]}" ./cmd/buildx +} + +src_test() { + # TestGit can't work in a source tarball; TestReadTargets fails seemingly due to parallelism. + if [[ ${PV} == 9999 ]]; then + ego test ./... -skip "TestReadTargets|TestIntegration" + else + ego test ./... -skip "TestGit|TestReadTargets|TestIntegration" + fi +} + +src_install() { + exeinto /usr/libexec/docker/cli-plugins + doexe docker-buildx + + einstalldocs +} From c3a03fd9f7e0e6ebb436a121cd0a43e3d95c61e9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:22 +0000 Subject: [PATCH 009/153] app-containers/docker-cli: Sync with Gentoo It's from Gentoo commit d2a1ed5b6daae1d9258b4f40a0a87c006ebd7142. --- .../app-containers/docker-cli/Manifest | 6 -- .../docker-cli/docker-cli-27.4.1.ebuild | 68 ------------------- .../docker-cli/docker-cli-27.5.0.ebuild | 68 ------------------- .../docker-cli/docker-cli-27.5.1.ebuild | 68 ------------------- .../docker-cli/docker-cli-28.0.1.ebuild | 2 +- 5 files changed, 1 insertion(+), 211 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.4.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/Manifest index 839bedb526..9b854c8d3b 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/Manifest @@ -1,8 +1,2 @@ -DIST docker-cli-27.4.1-man.tar.xz 70252 BLAKE2B 3fbefe359b39cfb7eda125830dc6c8e9e49685a833f7f46b111e9e7c0ed4d0009ab5a6ccdd27a97a1885453a7e43ae4f557c63f9201fc2604d0146f20f14763c SHA512 ddd7017fb0d5193e6f7b39e67f047edf3c98e86f299d0a7ab318efc3fb8b712a71ee5ac933ccf33945f846e2b20d2b1efc7fa9fcbd12f9a56b9d519bec4bcee1 -DIST docker-cli-27.4.1.tar.gz 7273057 BLAKE2B 3ebebe0e0918dd54d45c058c2922107fc2e82170c6e00540fde2c884c8f88945ceb5428fd5917014af5d35a554a0d9e83306d173ceea9c7461508b902f0023f8 SHA512 5880053d44e169b93fe50f3d4b13fa2f8f60de32a96f8ee2923a3291385532c1903027f0654a65a8eab51f29caf7b805857b491c0bfeee2e1983f822e579851e -DIST docker-cli-27.5.0-man.tar.xz 70224 BLAKE2B 4c2a4025721fbfbb63c24e20bdbc68f3a8b2d355d57060a86190ea30ec4dc1e01eae1265a3de6077c3952e1c9d859c1c28c707caccf07260f6dabe8bf3ef5439 SHA512 4450669971503665ca644899a657c587e86edaf4462ef47bd49b09da961111e8bc27a61caf8a8dbf9a617427bb2ebf92ab8d7adb6c4f33001383e590b59cfff3 -DIST docker-cli-27.5.0.tar.gz 7462649 BLAKE2B 89ae65834c606d9ef4f8ebc9fee5052d3e12b8aa6d9f4df7c0415157b24a55e89d0758b4f5cf0e4f3f5b6ea2f9c46bfc010c604995cb5cf1d162c068ba679787 SHA512 3c7c709f38fffd4d4e134d2abd7e6dc606e1cba765d36924a53f9470d6077be2282983eb23995bd56d772da253a69a854fe3112fea1a7ed2c9a1b70d2cc45b57 -DIST docker-cli-27.5.1-man.tar.xz 70236 BLAKE2B 82bf35e1b2ec149aa64ee5c72691a1af790e02e85c02c7078f6d2cff0c52143f64270467b00cf6410b6b80cf5088b15dc0bf87b98df0091bc61fa000b4dcec29 SHA512 6cec8418851dd4226e38319038b621e4697458b18496a0a4bacf1473007d5242a56af66d2a0d90f64bd5a9ccce1777c6c0788bc649c0e6cc38be1ecf63bd64da -DIST docker-cli-27.5.1.tar.gz 7462515 BLAKE2B cd2970ac46092bc040ebb663d1dc3bcd488f1c2e8dfc81b36f937c22cb4becbf79f8d4f537cf482d59fa032e86a183b3c4c781ccda09de68be217347320ad9d6 SHA512 165bd5984786fe6fa6398d6e2b1757ce013a91434317339b360721327d4f74bd52fe0ec3936ae3a0665f0fbbf2cd2c49bd2c503783c25651f8d91a172e1c2d3e DIST docker-cli-28.0.1-man.tar.xz 70360 BLAKE2B 395736a74b314530fbbd6bf4016f7f211a3ee4754179cde0d8edf16f489c3fd92565cf73033defb80fd8280e4ef1e2add15541102944401123cfb251b06492f9 SHA512 b72e4f35a80d72d18f701edcace46eb11fbcf1ba40a1ab8efa913edc74e265dafbdc58c7c0d442293d71ce2cfc952fcbed5afee5d5f3ba52d9d25741d5a12593 DIST docker-cli-28.0.1.tar.gz 7413092 BLAKE2B 69075ba24eb7c46593d7c4ab80499b67994119af8096409f55eec9524173cb8d37263159cd834e3cfaf4e8d169b568232d400633b2d9b08112ced05c78338f92 SHA512 c3d7ca21b88c5f6925f6c99519a67581fd6c264cc96e6c0bc00751f87de6580a2d443cbe59b2e36771e37a78fe05ea054e292675e19bc4d73fcacfda047e0490 diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.4.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.4.1.ebuild deleted file mode 100644 index 88442539b2..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.4.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 go-module -MY_PV=${PV/_/-} - -# update this on every bump -GIT_COMMIT=b9d17eaebb55b7652ce37ae5c7c52fcb34194956 - -DESCRIPTION="the command line binary for docker" -HOMEPAGE="https://www.docker.com/" -SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz" -S="${WORKDIR}/cli-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86" -IUSE="hardened selinux" - -RDEPEND="selinux? ( sec-policy/selinux-docker )" - -RESTRICT="installsources strip test" - -src_unpack() { - default - cd "${S}" - ln -s vendor.mod go.mod - ln -s vendor.sum go.sum -} - -src_prepare() { - default - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die -} - -src_compile() { - export DISABLE_WARN_OUTSIDE_CONTAINER=1 - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" - CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" - emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="${PV}" \ - GITCOMMIT="${GIT_COMMIT}" \ - dynbinary -} - -src_install() { - dobin build/docker - doman "${WORKDIR}"/man/man?/* - dobashcomp contrib/completion/bash/docker - bashcomp_alias docker dockerd - insinto /usr/share/fish/vendor_completions.d/ - doins contrib/completion/fish/docker.fish - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* -} - -pkg_postinst() { - has_version "app-containers/docker-buildx" && return - ewarn "the 'docker build' command is deprecated and will be removed in a" - ewarn "future release. If you need this functionality, install" - ewarn "app-containers/docker-buildx." -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.0.ebuild deleted file mode 100644 index 1ea57a7694..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 go-module -MY_PV=${PV/_/-} - -# update this on every bump -GIT_COMMIT=a187fa5d2d0d5f12db920734e425afc758e98ead - -DESCRIPTION="the command line binary for docker" -HOMEPAGE="https://www.docker.com/" -SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz" -S="${WORKDIR}/cli-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="hardened selinux" - -RDEPEND="selinux? ( sec-policy/selinux-docker )" - -RESTRICT="installsources strip test" - -src_unpack() { - default - cd "${S}" - ln -s vendor.mod go.mod - ln -s vendor.sum go.sum -} - -src_prepare() { - default - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die -} - -src_compile() { - export DISABLE_WARN_OUTSIDE_CONTAINER=1 - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" - CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" - emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="${PV}" \ - GITCOMMIT="${GIT_COMMIT}" \ - dynbinary -} - -src_install() { - dobin build/docker - doman "${WORKDIR}"/man/man?/* - dobashcomp contrib/completion/bash/docker - bashcomp_alias docker dockerd - insinto /usr/share/fish/vendor_completions.d/ - doins contrib/completion/fish/docker.fish - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* -} - -pkg_postinst() { - has_version "app-containers/docker-buildx" && return - ewarn "the 'docker build' command is deprecated and will be removed in a" - ewarn "future release. If you need this functionality, install" - ewarn "app-containers/docker-buildx." -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.1.ebuild deleted file mode 100644 index dfa0303d06..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-27.5.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 go-module -MY_PV=${PV/_/-} - -# update this on every bump -GIT_COMMIT=9f9e4058019a37304dc6572ffcbb409d529b59d8 - -DESCRIPTION="the command line binary for docker" -HOMEPAGE="https://www.docker.com/" -SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz" -S="${WORKDIR}/cli-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="hardened selinux" - -RDEPEND="selinux? ( sec-policy/selinux-docker )" - -RESTRICT="installsources strip test" - -src_unpack() { - default - cd "${S}" - ln -s vendor.mod go.mod - ln -s vendor.sum go.sum -} - -src_prepare() { - default - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die -} - -src_compile() { - export DISABLE_WARN_OUTSIDE_CONTAINER=1 - # setup CFLAGS and LDFLAGS for separate build target - # see https://github.com/tianon/docker-overlay/pull/10 - CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" - CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" - emake \ - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ - VERSION="${PV}" \ - GITCOMMIT="${GIT_COMMIT}" \ - dynbinary -} - -src_install() { - dobin build/docker - doman "${WORKDIR}"/man/man?/* - dobashcomp contrib/completion/bash/docker - bashcomp_alias docker dockerd - insinto /usr/share/fish/vendor_completions.d/ - doins contrib/completion/fish/docker.fish - insinto /usr/share/zsh/site-functions - doins contrib/completion/zsh/_* -} - -pkg_postinst() { - has_version "app-containers/docker-buildx" && return - ewarn "the 'docker build' command is deprecated and will be removed in a" - ewarn "future release. If you need this functionality, install" - ewarn "app-containers/docker-buildx." -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-28.0.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-28.0.1.ebuild index 540abf0655..98528da006 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-28.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/docker-cli/docker-cli-28.0.1.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/cli-${PV}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86" IUSE="hardened selinux" RDEPEND="selinux? ( sec-policy/selinux-docker )" From 05b53ce12ab9dd0fec8bf95d6007c212e069d6bd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:25 +0000 Subject: [PATCH 010/153] app-crypt/gnupg: Sync with Gentoo It's from Gentoo commit 6c968f4512dc5f984d32653523c39545bc68cc1e. --- .../portage-stable/app-crypt/gnupg/Manifest | 2 - ...g-2.2.45.ebuild => gnupg-2.2.45-r1.ebuild} | 1 - .../app-crypt/gnupg/gnupg-2.4.6-r1.ebuild | 199 ------------------ ...upg-2.4.7.ebuild => gnupg-2.4.7-r1.ebuild} | 1 - ...upg-2.5.1.ebuild => gnupg-2.5.1-r1.ebuild} | 1 - 5 files changed, 204 deletions(-) rename sdk_container/src/third_party/portage-stable/app-crypt/gnupg/{gnupg-2.2.45.ebuild => gnupg-2.2.45-r1.ebuild} (99%) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild rename sdk_container/src/third_party/portage-stable/app-crypt/gnupg/{gnupg-2.4.7.ebuild => gnupg-2.4.7-r1.ebuild} (99%) rename sdk_container/src/third_party/portage-stable/app-crypt/gnupg/{gnupg-2.5.1.ebuild => gnupg-2.5.1-r1.ebuild} (99%) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest index 17d33d43c1..84af256d78 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/Manifest @@ -1,7 +1,5 @@ DIST gnupg-2.2.45.tar.bz2 7447141 BLAKE2B 8fe2036325e31332166c0477ce9514152c8417a9f61b3edc43487340d5b52e6a4d4c2b104ca9fe7ce6893e6d2977e2cd9c9ccfb52c0b1ea18dae3304ec6ec7f3 SHA512 086bb2a96ff4a681451b357495c8b435229e6526e1121d8faee3cb2ecc9c14965c92c9b1ccbbf3a03f6c59c215cca85a5c4f740f2df7c008a9fa672b370bf33c DIST gnupg-2.2.45.tar.bz2.sig 119 BLAKE2B 6656747b2d640a95c4172a221952fa75f7d03c231b7c6d40ea57b43a5bcfbceb800023ca2f352ca09325aaf186a7bf31fcfe7104129c5d6628f0e1256994df76 SHA512 181195a76eede8113bd8f2a7f5bc20674226f6327cf8263389e3d178c205ed2d817b28f2d3b504dd9f852f22fc283d2c14e809ba1c05cfe88b66103845ff114c -DIST gnupg-2.4.6.tar.bz2 8011304 BLAKE2B 3b0deb3da1ec404e8f0aa50c424c7072727f933228de732d661a17ca15785b7430700e7b88afba69538f9794863cb218c90ae3d43469541fb9152fbabd3bc909 SHA512 192ae6cb18547e9c5fc4263dc968b548c1ce563ceb8cc2e651b264d4e5afa1cd99a2c1cdd80906faf5e0b0ca99cef76e003b1f7e73238f311a74a1de6c35b5cb -DIST gnupg-2.4.6.tar.bz2.sig 119 BLAKE2B f22b9488a46e585eaa4ed6434c37603756de2a0136a6e8a44d974304d31299f64dee5065a0c1f8ed6aff24555e369ffa213558027698a7e7b2244cef7c9eff76 SHA512 699f99d5aedbb1adef0fc46fbfb4184996ebaeb08e3c5a4d64195cd14e628a17a234ff9d990ad63c32119cbab24bcba802590eaf69f030a0a0addf9928172221 DIST gnupg-2.4.7.tar.bz2 8010244 BLAKE2B 4cdc6be4330b0c8f150d9d1a9ce9c7d34232ecf9b980b15fbd20e96ff6fcd8665688456d66f1c862b816472034eaa0796444357b1f36e75e8520a603a0e6b298 SHA512 3e84f1679904bf0efb789df6466e468bd2be9149d52561f35e2380038133479bebf1c61ee7adf6d3564b370915f32111098c052be6e6acaf3083a807f9f36019 DIST gnupg-2.4.7.tar.bz2.sig 119 BLAKE2B e97012f433c2818dda953ccaa2f5e8e94492b306a7815b16d7a9f8bf165f11972114d94a1aaba6156baed0ee3566ad998ed74a9521c71464268f4c6f8f14306c SHA512 d944a57b21fa7a4058fb4f00e3c164220be038037010a07a43e48c881dd66d901f8ea249f5df183a1c7de811ecc3aa9ed1591c18baf201e338129eb7e28bddc4 DIST gnupg-2.5.1.tar.bz2 8126739 BLAKE2B 46955d2eebe14395adc0fdf81e89a32f3f9baaabfe1eee78f256a1fab25ce6fdb96b873678cfeb5e4abf4894c7ab4908359ed04cc6571ff442dcc5325b3ccd66 SHA512 733a11ff24145e23dd7d34d954a70c25bf70ecb1d517b8e15cc34bf690786c9f7007e4e99cde573500ac012852e91b29568fed00491f8c8254b3fb63ca5777cd diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.45.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.45-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.45.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.45-r1.ebuild index bf482df1cd..b40578d0a7 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.45.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.2.45-r1.ebuild @@ -35,7 +35,6 @@ DEPEND=" >=dev-libs/libgpg-error-1.38 >=dev-libs/libksba-1.4.0 >=dev-libs/npth-1.2 - >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild deleted file mode 100644 index 39e2c7f19a..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintainers should: -# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/ -# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159 -# (find the one for the current release then subscribe to it + -# any subsequent ones linked within so you're covered for a while.) - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc -# in-source builds are not supported: https://dev.gnupg.org/T6313#166339 -inherit flag-o-matic out-of-source multiprocessing systemd toolchain-funcs verify-sig - -MY_P="${P/_/-}" - -DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" -HOMEPAGE="https://gnupg.org/" -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" -SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( tofu )" - -# Existence of executables is checked during configuration. -# Note: On each bump, update dep bounds on each version from configure.ac! -DEPEND=" - >=dev-libs/libassuan-2.5.0:= - >=dev-libs/libgcrypt-1.9.1:= - >=dev-libs/libgpg-error-1.46 - >=dev-libs/libksba-1.6.3 - >=dev-libs/npth-1.2 - >=net-misc/curl-7.10 - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - ldap? ( net-nds/openldap:= ) - readline? ( sys-libs/readline:0= ) - smartcard? ( usb? ( virtual/libusb:1 ) ) - tofu? ( >=dev-db/sqlite-3.27 ) - tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) - ssl? ( >=net-libs/gnutls-3.2:0= ) -" -RDEPEND=" - ${DEPEND} - nls? ( virtual/libintl ) - selinux? ( sec-policy/selinux-gpg ) - wks-server? ( virtual/mta ) -" -PDEPEND=" - app-crypt/pinentry -" -BDEPEND=" - virtual/pkgconfig - doc? ( sys-apps/texinfo ) - nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-gnupg ) -" - -DOCS=( - ChangeLog NEWS README THANKS TODO VERSION - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch - "${FILESDIR}"/${PN}-2.4.5-revert-rfc4880bis.patch # bug #926186 - "${FILESDIR}"/${PN}-2.4.6-c99.patch -) - -src_prepare() { - default - - GNUPG_SYSTEMD_UNITS=( - dirmngr.service - dirmngr.socket - gpg-agent-browser.socket - gpg-agent-extra.socket - gpg-agent.service - gpg-agent.socket - gpg-agent-ssh.socket - ) - - cp "${GNUPG_SYSTEMD_UNITS[@]/#/${FILESDIR}/}" "${T}" || die - - # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode, - # idea borrowed from libdbus, see - # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6 - # - # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl', - # which in turn requires discovery in Autoconf, something that upstream deeply resents. - sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \ - -i "${T}"/gpg-agent-ssh.socket || die -} - -my_src_configure() { - # Upstream don't support LTO, bug #854222. - filter-lto - - local myconf=( - $(use_enable bzip2) - $(use_enable nls) - $(use_enable smartcard scdaemon) - $(use_enable ssl gnutls) - $(use_enable test all-tests) - $(use_enable test tests) - $(use_enable tofu) - $(use_enable tofu keyboxd) - $(use_enable tofu sqlite) - $(usex tpm '--with-tss=intel' '--disable-tpm2d') - $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') - $(use_enable wks-server wks-tools) - $(use_with ldap) - $(use_with readline) - - # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist. - # As of GnuPG 2.3, the mailprog substitution is used for the binary called - # by wks-client & wks-server; and if it's autodetected but not not exist at - # build time, then then 'gpg-wks-client --send' functionality will not - # work. This has an unwanted side-effect in stage3 builds: there was a - # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating - # the build where the install guide previously make the user chose the - # logger & mta early in the install. - --with-mailprog=/usr/libexec/sendmail - - --disable-ntbtls - --enable-gpgsm - --enable-large-secmem - - CC_FOR_BUILD="$(tc-getBUILD_CC)" - GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config" - - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - - if use prefix && use usb; then - # bug #649598 - append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0" - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # https://dev.gnupg.org/T7368 - append-cppflags -D_XOPEN_SOURCE=500 - fi - - # bug #663142 - if use user-socket; then - myconf+=( --enable-run-gnupg-user-socket ) - fi - - # glib fails and picks up clang's internal stdint.h causing weird errors - tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h - - econf "${myconf[@]}" -} - -my_src_compile() { - default - - use doc && emake -C doc html -} - -my_src_test() { - export TESTFLAGS="--parallel=$(makeopts_jobs)" - - default -} - -my_src_install() { - emake DESTDIR="${D}" install - - use tools && dobin tools/{gpgconf,gpgsplit,gpg-check-pattern} tools/make-dns-cert - - dosym gpg /usr/bin/gpg2 - dosym gpgv /usr/bin/gpgv2 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die - - dodir /etc/env.d - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die - - use doc && dodoc doc/gnupg.html/* -} - -my_src_install_all() { - einstalldocs - - use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot} - use doc && dodoc doc/*.png - - # Dropped upstream in https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=eae28f1bd4a5632e8f8e85b7248d1c4d4a10a5ed. - dodoc "${FILESDIR}"/README-systemd - systemd_douserunit "${GNUPG_SYSTEMD_UNITS[@]/#/${T}/}" -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.4.7.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.4.7-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.4.7.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.4.7-r1.ebuild index 37ce5d63a2..45838b58ac 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.4.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.4.7-r1.ebuild @@ -36,7 +36,6 @@ DEPEND=" >=dev-libs/libgpg-error-1.46 >=dev-libs/libksba-1.6.3 >=dev-libs/npth-1.2 - >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.5.1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.5.1-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.5.1.ebuild rename to sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.5.1-r1.ebuild index af4b2cee9a..167bb5e3c1 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.5.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/gnupg/gnupg-2.5.1-r1.ebuild @@ -36,7 +36,6 @@ DEPEND=" >=dev-libs/libgpg-error-1.46 >=dev-libs/libksba-1.6.3 >=dev-libs/npth-1.2 - >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) From f9d54d1821b7a9378cf4f38277a470982088c1d8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:28 +0000 Subject: [PATCH 011/153] app-crypt/rhash: Sync with Gentoo It's from Gentoo commit a301c605ccf48493c68d5abf35ecae5692d3d7d3. --- .../portage-stable/app-crypt/rhash/Manifest | 1 - .../rhash/files/rhash-1.4.4-prefix.patch | 22 ----- .../app-crypt/rhash/rhash-1.4.4-r1.ebuild | 96 ------------------- .../app-crypt/rhash/rhash-1.4.5.ebuild | 2 +- 4 files changed, 1 insertion(+), 120 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.4.4-prefix.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest index 58a3cd60a8..9944edb4ef 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/Manifest @@ -1,2 +1 @@ -DIST rhash-1.4.4-src.tar.gz 435691 BLAKE2B f3d42f333ad9a82fe4a8ef5af5d8008abf526c05c06a00c7033881d5a27ba663c3cc5cefb73ea8157ac24cb10a50a4e500706d489e61a03dbaee74a4735d1722 SHA512 00a7e5e058b53ce20ae79509815452ed9cb699d1322b678220b72c61dea3ea2f8fa131acfade8bb6d9f6af913f0c3c472330841181b22314b8755166310c946f DIST rhash-1.4.5-src.tar.gz 444526 BLAKE2B 11021119e8af28e12491eabd55232e24a056bce79b624c970e4806c28fe707ea1395eb390572dba3453900d4512e5896d70642370d0c9340359e2fee95d62c8d SHA512 49bd6aa2497efc4871ae31eaca51d2dc78ceb7126311557d5280b14fafe9355eaecad37f0f78f865e4e1dd1aeb506d3301989cd2f9fff7b0091c81978e8c2f2e diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.4.4-prefix.patch b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.4.4-prefix.patch deleted file mode 100644 index ce2e72bf14..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.4.4-prefix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c804982d1b24c6533118b3068d2cfdca685076f3 Mon Sep 17 00:00:00 2001 -From: Aleksey Kravchenko -Date: Mon, 7 Aug 2023 01:00:37 +0300 -Subject: [PATCH] Fix #243: Incorrect assigment in the configure script - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 39ef8c1b..63cbd8d0 100755 ---- a/configure -+++ b/configure -@@ -877,7 +877,7 @@ if test "$OPT_STATIC" = "no"; then - RHASH_TEST_OPTIONS=--shared - test "$INSTALL_LIB_SHARED" = "auto" && INSTALL_LIB_SHARED=yes - test "$INSTALL_LIB_STATIC" = "yes" && RHASH_BUILD_TARGETS="$RHASH_BUILD_TARGETS \$(LIBRHASH_STATIC)" -- RHASH_LDFLAGS=$RHASH_LDFLAGS $GETTEXT_LDFLAGS -+ RHASH_LDFLAGS=$(join_params $RHASH_LDFLAGS $GETTEXT_LDFLAGS) - else - LIBRHASH_TYPE=static - LIBRHASH_PATH="\$(LIBRHASH_STATIC)" diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4-r1.ebuild deleted file mode 100644 index 0c1b26eeb3..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs multilib-minimal - -DESCRIPTION="Console utility and library for computing and verifying file hash sums" -HOMEPAGE="https://rhash.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz" - -LICENSE="0BSD" -SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="debug nls ssl static-libs" - -RDEPEND=" - ssl? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] -)" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - nls? ( sys-devel/gettext ) -" - -S="${WORKDIR}/RHash-${PV}" - -PATCHES=( - "${FILESDIR}"/${P}-prefix.patch -) - -src_prepare() { - default - - if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then - # we lack posix_memalign - sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \ - librhash/util.h || die - fi - - # upstream fix for BSD and others, but was only applied for BSD - # we need support for Solaris, where we use a GNU toolchain, so use - # the original hack, hopefully next release has this fixed - # https://github.com/rhash/RHash/issues/238 - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/^elif linux; then/else/' configure || die - fi - - multilib_copy_sources -} - -multilib_src_configure() { - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - - set -- \ - ./configure \ - --target="${CHOST}" \ - --cc="$(tc-getCC)" \ - --ar="$(tc-getAR)" \ - --extra-cflags="${CFLAGS}" \ - --extra-ldflags="${LDFLAGS}" \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --sysconfdir="${EPREFIX}"/etc \ - --disable-openssl-runtime \ - --disable-static \ - --enable-lib-shared \ - $(use_enable debug) \ - $(use_enable nls gettext) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs lib-static) - - echo "${@}" - "${@}" || die "configure failed" -} - -multilib_src_compile() { - emake all \ - $(multilib_is_native_abi && use nls && echo compile-gmo) -} - -multilib_src_install() { - # -j1 needed due to race condition. - emake DESTDIR="${D}" -j1 \ - install{,-lib-headers,-pkg-config} \ - $(multilib_is_native_abi && use nls && echo install-gmo) \ - install-lib-so-link -} - -multilib_src_test() { - emake test -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.5.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.5.ebuild index 8df81edec4..c0532bd23d 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.5.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/RHash-${PV}" LICENSE="0BSD" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="debug nls ssl static-libs" RDEPEND=" From 05f4f2d66b947d160c456eb4a141ea655a744931 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:30 +0000 Subject: [PATCH 012/153] app-editors/nano: Sync with Gentoo It's from Gentoo commit 2e17603d5b3913cddb393e7f7c4f536656e3b6ee. --- .../portage-stable/app-editors/nano/Manifest | 3 - .../app-editors/nano/nano-8.0.ebuild | 105 ------------------ .../app-editors/nano/nano-8.1.ebuild | 105 ------------------ .../app-editors/nano/nano-8.2-r1.ebuild | 105 ------------------ 4 files changed, 318 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.2-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/Manifest b/sdk_container/src/third_party/portage-stable/app-editors/nano/Manifest index 4df711635f..f2c9beb8fa 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/Manifest @@ -1,4 +1 @@ -DIST nano-8.0.tar.xz 1666272 BLAKE2B ba36182da059a3ee4c1fc60a200dee26f47cc6b1441b7ff665b82871f2f8fcac054f6adf82966d353234141bf9c521518da8fa967aca28307bccf43e015ddaea SHA512 86c484428b8805768fd580d0f62aa32ce8f588f4beedcdd35a4014506b562928c7a2fa6487aa0d853b4c9c1639a4d186f46b4e96721568ff81191d5098403ca8 -DIST nano-8.1.tar.xz 1667392 BLAKE2B e454f6e5ef86afbab3b2cf6707954d8821bf47ebc89bdad8cc6c70e2d4bb9fac27614069140f40140bca156b14605d286b0dca42469901c6559051089645cab8 SHA512 cb7d696bd18322ba1e713282e3156934e2c7f2a8abc17c99b2d5ae91fa40ea1478758853d4ad391f72039f01cfe0db79fd7302f3e67ed2afeff3a447b6f975ec -DIST nano-8.2.tar.xz 1672076 BLAKE2B 08e078f8f5acc8d70ad50a0a402d06a12bcf836c8161f803e2b674375abaa16d663000f02cd1fa1e0b4aad2f127a85ee3b2f60d725a761ab375ae00c905408fd SHA512 07c69d6894f87cb386afa89e984ded7e11fe7575cf3af1c18237e3b2c00de371015c9ea126e505c7c0e7200f7359d5ae7c3779198e188fbbc617154d09c4ba14 DIST nano-8.3.tar.xz 1681216 BLAKE2B 39c400483f79f11da0f959fed769462b65007f9235cb76d38e71d0a63919b659dc553d44f5d13dd13db801ec361fd7a3ad68b68bfa456ac6c169c861e80c6067 SHA512 9f57bb16a30240fdfc8fc31f5a55f681b80dd72de66fa143ef36c59ab696cc672d8fa054f5a4a547324db3deb2fe2f777cd7c1c023b571e2bb36c86a783ff1d6 diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.0.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.0.ebuild deleted file mode 100644 index 63b2294bfe..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit autotools git-r3 -else - MY_P="${PN}-${PV/_}" - SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Guide" - -LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" -SLOT="0" -IUSE="debug justify magic minimal ncurses nls +spell unicode" - -RDEPEND=" - >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] - magic? ( sys-apps/file ) - nls? ( virtual/libintl ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -REQUIRED_USE=" - magic? ( !minimal ) -" - -# gnulib FPs -QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN static_assert ) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - fi -} - -src_configure() { - local myconfargs=( - --bindir="${EPREFIX}"/bin - --htmldir=/trash - $(use_enable !minimal color) - $(use_enable !minimal multibuffer) - $(use_enable !minimal nanorc) - $(use_enable magic libmagic) - $(use_enable spell speller) - $(use_enable justify) - $(use_enable debug) - $(use_enable nls) - $(use_enable unicode utf8) - $(use_enable minimal tiny) - ) - - econf "${myconfargs[@]}" -} - -src_install() { - default - - # Don't use "${ED}" here or things break (#654534) - rm -r "${D}"/trash || die - - dodoc doc/sample.nanorc - docinto html - dodoc doc/faq.html - insinto /etc - newins doc/sample.nanorc nanorc - - if ! use minimal ; then - # Enable colorization by default. - sed -i \ - -e '/^# include /s:# *::' \ - "${ED}"/etc/nanorc || die - - # Since nano-5.0 these are no longer being "enabled" by default - # (bug #736848) - local rcdir="/usr/share/nano" - mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die - rmdir "${ED}"${rcdir}/extra || die - - insinto "${rcdir}" - newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc - fi -} - -pkg_postrm() { - [[ -n ${REPLACED_BY_VERSION} ]] && return - - local e - e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") - if [[ ${e##*/} == nano ]]; then - ewarn "The EDITOR variable is still set to ${e}." - ewarn "You can update it with \"eselect editor\"." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.1.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.1.ebuild deleted file mode 100644 index 63b2294bfe..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit autotools git-r3 -else - MY_P="${PN}-${PV/_}" - SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Guide" - -LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" -SLOT="0" -IUSE="debug justify magic minimal ncurses nls +spell unicode" - -RDEPEND=" - >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] - magic? ( sys-apps/file ) - nls? ( virtual/libintl ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -REQUIRED_USE=" - magic? ( !minimal ) -" - -# gnulib FPs -QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN static_assert ) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - fi -} - -src_configure() { - local myconfargs=( - --bindir="${EPREFIX}"/bin - --htmldir=/trash - $(use_enable !minimal color) - $(use_enable !minimal multibuffer) - $(use_enable !minimal nanorc) - $(use_enable magic libmagic) - $(use_enable spell speller) - $(use_enable justify) - $(use_enable debug) - $(use_enable nls) - $(use_enable unicode utf8) - $(use_enable minimal tiny) - ) - - econf "${myconfargs[@]}" -} - -src_install() { - default - - # Don't use "${ED}" here or things break (#654534) - rm -r "${D}"/trash || die - - dodoc doc/sample.nanorc - docinto html - dodoc doc/faq.html - insinto /etc - newins doc/sample.nanorc nanorc - - if ! use minimal ; then - # Enable colorization by default. - sed -i \ - -e '/^# include /s:# *::' \ - "${ED}"/etc/nanorc || die - - # Since nano-5.0 these are no longer being "enabled" by default - # (bug #736848) - local rcdir="/usr/share/nano" - mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die - rmdir "${ED}"${rcdir}/extra || die - - insinto "${rcdir}" - newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc - fi -} - -pkg_postrm() { - [[ -n ${REPLACED_BY_VERSION} ]] && return - - local e - e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") - if [[ ${e##*/} == nano ]]; then - ewarn "The EDITOR variable is still set to ${e}." - ewarn "You can update it with \"eselect editor\"." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.2-r1.ebuild deleted file mode 100644 index 087f82b40d..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-8.2-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit autotools git-r3 -else - MY_P="${PN}-${PV/_}" - SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Guide" - -LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" -SLOT="0" -IUSE="debug justify magic minimal ncurses nls +spell unicode" - -RDEPEND=" - >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] - magic? ( sys-apps/file ) - nls? ( virtual/libintl ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) - virtual/pkgconfig -" - -REQUIRED_USE=" - magic? ( !minimal ) -" - -# gnulib FPs -QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN static_assert ) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - fi -} - -src_configure() { - local myconfargs=( - --bindir="${EPREFIX}"/bin - --htmldir=/trash - $(use_enable !minimal color) - $(use_enable !minimal multibuffer) - $(use_enable !minimal nanorc) - $(use_enable magic libmagic) - $(use_enable spell speller) - $(use_enable justify) - $(use_enable debug) - $(use_enable nls) - $(use_enable unicode utf8) - $(use_enable minimal tiny) - ) - - econf "${myconfargs[@]}" -} - -src_install() { - default - - # Don't use "${ED}" here or things break (#654534) - rm -r "${D}"/trash || die - - dodoc doc/sample.nanorc - docinto html - dodoc doc/faq.html - insinto /etc - newins doc/sample.nanorc nanorc - - if ! use minimal ; then - # Enable colorization by default. - sed -i \ - -e '/^# include /s:# *::' \ - "${ED}"/etc/nanorc || die - - # Since nano-5.0 these are no longer being "enabled" by default - # (bug #736848) - local rcdir="/usr/share/nano" - mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die - rmdir "${ED}"${rcdir}/extra || die - - insinto "${rcdir}" - newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc - fi -} - -pkg_postrm() { - [[ -n ${REPLACED_BY_VERSION} ]] && return - - local e - e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") - if [[ ${e##*/} == nano ]]; then - ewarn "The EDITOR variable is still set to ${e}." - ewarn "You can update it with \"eselect editor\"." - fi -} From 9f0cbfee87ffdfe0c0c4752c373c8d94f2f2db1b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:31 +0000 Subject: [PATCH 013/153] app-emulation/qemu: Sync with Gentoo It's from Gentoo commit d69d1a77d505f35f9142b71a8d9411c4a2216010. --- .../app-emulation/qemu/Manifest | 2 - .../app-emulation/qemu/qemu-8.2.8.ebuild | 1000 ----------------- .../app-emulation/qemu/qemu-9.2.0.ebuild | 995 ---------------- 3 files changed, 1997 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.8.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.2.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest index f82cf755de..de059f878d 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest @@ -6,11 +6,9 @@ DIST qemu-7.2.15.tar.xz 124418604 BLAKE2B 629cb5158cdd790947687a06f4c16bf838ae7b DIST qemu-7.2.16.tar.xz 124427328 BLAKE2B 25b69d3f47eef164b5bcb990edad7634f4602d08867cf62470b05005c5de496126064ad2eedfdf9b2d78eb724ae7832b93bc4d302140f14e5d77246cd04086eb SHA512 75623733f39396222e549498fd5dbbc1430593033f7480aa3a34c7e1c765eb5f7776d8827ee47b4b9c52cc1061232637742a8e31c5e5a9019945171d0c65ca7e DIST qemu-8.2.0-docs.tar.xz 2233352 BLAKE2B 22b9499fdf4ff93e72399dab3803f3171c855859dc7fe111612e2f9146db244ca6d2e0aad16aefdf29b231d2b3a2fbc22171fe6bac13b03445d54555ce798d16 SHA512 f57e78c28277c153fff00b25097d0df5c6ad36cb4e9f3acf30382bfb1c99508503c186c1bbecf266810ef24fd618428fdf3e0eee41c715a552918c9e6ef9e8e5 DIST qemu-8.2.7.tar.xz 132676368 BLAKE2B 92235f1a30e1d44cf9f7e40e71e9df0375c5eb2d8b267c35df51e102e560f399e4d3f70c674d7b9e206728d9c4a1bafee5ae8f1a91cda900b422f9a6a48c15a8 SHA512 9806bae62d2bdf0781b6bd1c4d7e88bb97019ca5e85140714d7818912603aed1d522a5d29f3434888974ab73e0cfae8b4136ea018b05dcc2d6f6c8b6252075cd -DIST qemu-8.2.8.tar.xz 132682628 BLAKE2B 04ed01c70e0b786f513b0cc7f4db572f93b65ec2a94368d7175efd8eeca62262bcd4dec66f9e0971a1be3ac6686e8cf59479d1ba35b686aee31f2a1840d21b44 SHA512 b89f0939c4b381c5b7d1d23be48e0319c02552f9a1bf2a2399671bc33fd6855d48901ffe26d97c1a547dd50431a0b9c998d4ae1f0c90b2cd990b00c42b711d0b DIST qemu-8.2.9.tar.xz 132695608 BLAKE2B 0c10feba46e917cd3110bd5926223068d635be0eea7d3f76ae96d631b7fd4cace9d9023aa589d26a6d4ea27d052f7f0a1c27f47175853cd558e5744d10d20aa6 SHA512 3981ff1f58cb88c9325b0c89d7a5f38e069b2a1d14e2cbd887b39382310a004bcd75c5c601fa0f60eba3e1c020b9f3d56000af0be9fbe99546237c30e3277e54 DIST qemu-9.1.0-docs.tar.xz 2376072 BLAKE2B 31d13133b3a2e21a7d9b5af028407610ae8f2fa61dd296fc35e57fc12eb66cfd1a39ec5e3b5a3852095d10a388f424f8a38417b3ab58ca30d0817ece779328cf SHA512 5b705b577daad6aa010d5c713db9dc314114334b89901840ebcecc9032595a969f5ad9054e42b36b2be5ef9f5d6dc1159841ff46dbb08314b5c48491aa631040 DIST qemu-9.1.2.tar.xz 132481332 BLAKE2B 2cbc55e09a8d46fe0c9e3e7e54b6cf4490bef01e8d6fc295158e8f823678cfaedf2f95b8256205cdb14db6e11b932378dee9f653c35c2f1d7e843304336aa2e0 SHA512 ff6ed9bc784f1aa7cf06604d0e38e26ebb2685885893a2cb7d044297f26d7efd0fa6cbb034dc1c422b58504ca1081b46ffe00dd8f9fab928cafa8cfc0d7d1747 DIST qemu-9.1.3.tar.xz 132492084 BLAKE2B 268c8fb91dd5fc4e393a46a578537338861e5d2a92c381517447c6c2fe67604ed9aacc96371c864dc7f4a800cc9b9f94118d17c5dcc24f3fac5be0a18ca553e5 SHA512 e7b938e72eb4a8a4a6680ce3b282a4e5cbd1ad30003bed959e51ea2621acea7434b4366ef6559e3622fac8865ad212702f393ba7698be38cf2fc8f264b951318 DIST qemu-9.2.0-docs.tar.xz 2431076 BLAKE2B 420148b9d7cafbdc9aea21b0d0a84a53ca0d17fb99fc34ae4c0786fa7d4ce40838f4b3173508b90742d6dfbfd4b58dda25b2e5cd1394241b0b56a64fe5705d9b SHA512 88816e326e9eac9acf0a1c73e677552845d6885e220b55e795241c40d2c1bd1b1994a22e56f95046e420225e0b7dc839d459f1c1e5318c8c36392727a86b3008 -DIST qemu-9.2.0.tar.xz 135188800 BLAKE2B 5800556f356e4324124e250c02a07857eef3a6f22995a819fe972061fa750ebf7233da64ae4c0a3e775b1639c870be4b7312d86d9866fedf2bc99074aad0a10a SHA512 f92548623e4e31400c823a2d78417a8a4ecfccb07f3ee4883e2f2ad33054539d2a37d076dbc64df42c6c86c08fa7c2c975cd6e823aa14d5f20cef83348006813 DIST qemu-9.2.2.tar.xz 134756816 BLAKE2B fe341d25010b02c47c263e6b1bf1a64f72226e188bd79901ec0072005994e305f5c75b8e5b3f36af1e3b3f776a04cd18b4084dc044952f34b131f3b94134f5b8 SHA512 b010876da9f91da01dbb9e06705a1358d5f062d0fdd4ad5c8cd8ce3fd43adcefcf72a61216eb8d415281f6607b945ce1cfb6b5fc5692ada9163e8f05b7fb5533 diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.8.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.8.ebuild deleted file mode 100644 index 6b1b71c8db..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.8.ebuild +++ /dev/null @@ -1,1000 +0,0 @@ -# Copyright 1999-2025 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-qemu-docs -# Set to 1 if prebuilt, 0 if not -# (the construct below is to allow overriding from env for script) -QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1} -QEMU_DOCS_PREBUILT_DEV=sam -QEMU_DOCS_VERSION=$(ver_cut 1-2).0 -# Default to generating docs (inc. man pages) if no prebuilt; overridden later -# bug #830088 -QEMU_DOC_USEFLAG="+doc" - -PYTHON_COMPAT=( python3_{11..12} ) -PYTHON_REQ_USE="ensurepip(-),ncurses,readline" - -FIRMWARE_ABI_VERSION="7.2.0" - -inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ - pax-utils xdg-utils - -if [[ ${PV} == *9999* ]]; then - QEMU_DOCS_PREBUILT=0 - - EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/" - EGIT_SUBMODULES=() - inherit git-r3 - SRC_URI="" - declare -A SUBPROJECTS=( - [keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6" - [berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037" - [berkeley-testfloat-3]="40619cbb3bf32872df8c53cc457039229428a263" - ) - - for proj in "${!SUBPROJECTS[@]}"; do - c=${SUBPROJECTS[${proj}]} - SRC_URI+=" https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2" - done -else - MY_P="${PN}-${PV/_rc/-rc}" - SRC_URI="https://download.qemu.org/${MY_P}.tar.xz" - - if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )" - fi - - S="${WORKDIR}/${MY_P}" - [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" - -[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc" - -IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG} - +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring - jack jemalloc +jpeg keyutils - lzo multipath - ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire - plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux - +slirp - smartcard snappy spice ssh static-user systemtap test udev usb - usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen - zstd" - -COMMON_TARGETS=" - aarch64 - alpha - arm - cris - hppa - i386 - loongarch64 - m68k - microblaze - microblazeel - mips - mips64 - mips64el - mipsel - nios2 - or1k - ppc - ppc64 - riscv32 - riscv64 - s390x - sh4 - sh4eb - sparc - sparc64 - x86_64 - xtensa - xtensaeb -" -IUSE_SOFTMMU_TARGETS=" - ${COMMON_TARGETS} - avr - rx - tricore -" -IUSE_USER_TARGETS=" - ${COMMON_TARGETS} - aarch64_be - armeb - hexagon - mipsn32 - mipsn32el - ppc64le - sparc32plus -" - -use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) -use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -RESTRICT="!test? ( test )" - -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_mips64el? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_riscv32? ( fdt ) - qemu_softmmu_targets_riscv64? ( fdt ) - qemu_softmmu_targets_x86_64? ( fdt ) - sdl-image? ( sdl ) - static-user? ( !plugins ) - virgl? ( opengl ) - virtfs? ( xattr ) - vnc? ( gnutls ) - vte? ( gtk ) - multipath? ( udev ) - plugins? ( !static-user ) -" -for smname in ${IUSE_SOFTMMU_TARGETS} ; do - REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )" -done - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# and user/softmmu targets (qemu-*, qemu-system-*). -# -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# 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[static-libs(+)] - sys-libs/zlib[static-libs(+)] - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-debug/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] ) -" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# softmmu targets (qemu-system-*). -SOFTMMU_TOOLS_DEPEND=" - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( - app-accessibility/brltty[api] - app-accessibility/brltty[static-libs(+)] - ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bpf? ( dev-libs/libbpf:= ) - bzip2? ( app-arch/bzip2[static-libs(+)] ) - capstone? ( dev-libs/capstone:=[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) - fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - >=net-libs/gnutls-3.0:=[static-libs(+)] - dev-libs/nettle:=[static-libs(+)] - ) - gtk? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) - infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) - iscsi? ( net-libs/libiscsi ) - io-uring? ( sys-libs/liburing:=[static-libs(+)] ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc ) - jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) - kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] ) - keyutils? ( sys-apps/keyutils[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - multipath? ( sys-fs/multipath-tools ) - ncurses? ( - sys-libs/ncurses:=[unicode(+)] - sys-libs/ncurses:=[static-libs(+)] - ) - nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl(+),gbm(+)] - ) - pam? ( sys-libs/pam ) - pipewire? ( >=media-video/pipewire-0.3.60 ) - png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] ) - pulseaudio? ( media-libs/libpulse ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - media-libs/libsdl2[video] - media-libs/libsdl2[static-libs(+)] - ) - sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) - slirp? ( net-libs/libslirp[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy:= ) - spice? ( - >=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:= ) - 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(+)] ) - virtfs? ( sys-libs/libcap ) - xen? ( app-emulation/xen-tools:= ) - zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) -" - -EDK2_OVMF_VERSION="202202" -SEABIOS_VERSION="1.16.3" - -X86_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} - ~sys-firmware/ipxe-1.21.1[binary,qemu] - ~sys-firmware/seabios-bin-${SEABIOS_VERSION} - ~sys-firmware/sgabios-0.1_pre10[binary] - ) - !pin-upstream-blobs? ( - || ( - >=sys-firmware/edk2-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} - ) - sys-firmware/ipxe[qemu] - || ( - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - >=sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - sys-firmware/sgabios - ) -" -PPC_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - !pin-upstream-blobs? ( - || ( - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - >=sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - ) -" - -# See bug #913084 for pip dep -BDEPEND=" - $(python_gen_impl_dep) - dev-lang/perl - >=dev-build/meson-0.63.0 - app-alternatives/ninja - virtual/pkgconfig - doc? ( - >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] - ) - gtk? ( nls? ( sys-devel/gettext ) ) - test? ( - dev-libs/glib[utils] - app-alternatives/bc - ) -" -CDEPEND=" - ${ALL_DEPEND//\[static-libs(+)]} - ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) -" -DEPEND=" - ${CDEPEND} - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - static-user? ( ${ALL_DEPEND} ) -" -RDEPEND=" - ${CDEPEND} - acct-group/kvm - selinux? ( - sec-policy/selinux-qemu - sys-libs/libselinux - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch - "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch - "${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch - "${FILESDIR}"/${PN}-8.1.0-skip-tests.patch - "${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch -) - -QA_PREBUILT=" - usr/share/qemu/hppa-firmware.img - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf - usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500 -" - -QA_WX_LOAD=" - usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or1k - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32 -" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the -kernel module loaded before running kvm. The easiest way to ensure that the -kernel module is loaded is to load it on boot. - For AMD CPUs the module is called 'kvm-amd'. - For Intel CPUs the module is called 'kvm-intel'. -Please review /etc/conf.d/modules for how to load these. - -Make sure your user is in the 'kvm' group. Just run - $ gpasswd -a kvm -then have re-login. - -For brand new installs, the default permissions on /dev/kvm might not let -you access it. You can tell udev to reset ownership/perms: - $ udevadm trigger -c add /dev/kvm - -If you want to register binfmt handlers for qemu user targets: -For openrc: - # rc-update add qemu-binfmt -For systemd: - # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requires a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/configs/targets/ >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - for file in ${A}; do - unpack "${file}" - done - cd "${WORKDIR}" || die - for proj in "${!SUBPROJECTS[@]}"; do - mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" || die - done - cd "${S}" || die - meson subprojects packagefiles --apply || die - else - default - fi -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - default - - # Use correct toolchain to fix cross-compiling - tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS - export WINDRES=${CHOST}-windres - - # Workaround for bug #938302 - if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then - cat >> "${S}"/configs/meson/linux.txt <<-EOF || die - [binaries] - dtrace='stap-dtrace' - EOF - fi - - # Verbose builds - MAKEOPTS+=" V=1" - - # Remove bundled modules - rm -r roms/*/ || die -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - - mkdir "${builddir}" || die - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --bindir=/usr/bin - --libdir=/usr/$(get_libdir) - --datadir=/usr/share - --docdir=/usr/share/doc/${PF}/html - --mandir=/usr/share/man - --localstatedir=/var - --disable-bsd-user - --disable-containers # bug #732972 - --disable-guest-agent - --disable-strip - --disable-download - --python="${PYTHON}" - - # bug #746752: TCG interpreter has a few limitations: - # - it does not support FPU - # - it's generally slower on non-self-modifying code - # It's advantage is support for host architectures - # where native codegeneration is not implemented. - # Gentoo has qemu keyworded only on targets with - # native code generation available. Avoid the interpreter. - --disable-tcg-interpreter - - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --objcc="$(tc-getCC)" - --host-cc="$(tc-getBUILD_CC)" - - $(use_enable alsa) - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - $(use_enable jack) - $(use_enable nls gettext) - $(use_enable oss) - $(use_enable pipewire) - $(use_enable plugins) - $(use_enable pulseaudio pa) - $(use_enable selinux) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets. This simplifies building - # static user targets (USE=static-user) considerably. - conf_notuser() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - # Enable option only for softmmu build, but not 'user' or 'tools' - conf_softmmu() { - if [[ ${buildtype} == "softmmu" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Enable option only for tools build, but not 'user' or 'softmmu' - conf_tools() { - if [[ ${buildtype} == "tools" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Special case for the malloc flag, because the --disable flag does - # not exist and trying like above will break configuring. - conf_malloc() { - if [[ ! ${buildtype} == "user" ]] ; then - usex "${1}" "--enable-malloc=${1}" "" - fi - } - conf_opts+=( - $(conf_notuser accessibility brlapi) - $(conf_notuser aio linux-aio) - $(conf_softmmu bpf) - $(conf_notuser bzip2) - $(conf_notuser capstone) - $(conf_notuser curl) - $(conf_tools doc docs) - $(conf_notuser fdt) - $(conf_notuser fuse) - $(conf_notuser glusterfs) - $(conf_notuser gnutls) - $(conf_notuser gnutls nettle) - $(conf_notuser gtk) - $(conf_notuser infiniband rdma) - $(conf_notuser iscsi libiscsi) - $(conf_notuser io-uring linux-io-uring) - $(conf_malloc jemalloc) - $(conf_notuser jpeg vnc-jpeg) - $(conf_notuser kernel_linux kvm) - $(conf_notuser keyutils libkeyutils) - $(conf_notuser lzo) - $(conf_notuser multipath mpath) - $(conf_notuser ncurses curses) - $(conf_notuser nfs libnfs) - $(conf_notuser numa) - $(conf_notuser opengl) - $(conf_notuser pam auth-pam) - $(conf_notuser png) - $(conf_notuser rbd) - $(conf_notuser sasl vnc-sasl) - $(conf_notuser sdl) - $(conf_softmmu sdl-image) - $(conf_notuser seccomp) - $(conf_notuser slirp) - $(conf_notuser smartcard) - $(conf_notuser snappy) - $(conf_notuser spice) - $(conf_notuser ssh libssh) - $(conf_notuser udev libudev) - $(conf_notuser usb libusb) - $(conf_notuser usbredir usb-redir) - $(conf_notuser vde) - $(conf_notuser vhost-net) - $(conf_notuser virgl virglrenderer) - $(conf_softmmu virtfs) - $(conf_notuser vnc) - $(conf_notuser vte) - $(conf_notuser xen) - $(conf_notuser xen xen-pci-passthrough) - # use prebuilt keymaps, bug #759604 - --disable-xkbcommon - $(conf_notuser zstd) - ) - - if [[ ! ${buildtype} == "user" ]] ; then - # audio options - local audio_opts=( - # Note: backend order matters here: #716202 - # We iterate from higher-level to lower level. - $(usex pulseaudio pa "") - $(usev pipewire) - $(usev jack) - $(usev sdl) - $(usev alsa) - $(usev oss) - ) - conf_opts+=( - --audio-drv-list=$(IFS=,; echo "${audio_opts[*]}") - ) - fi - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-tools - --disable-cap-ng - --disable-seccomp - ) - local static_flag="static-user" - ;; - softmmu) - conf_opts+=( - --disable-linux-user - --enable-system - --disable-tools - --enable-cap-ng - --enable-seccomp - ) - local static_flag="none" - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --enable-tools - --enable-cap-ng - ) - local static_flag="none" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTap - use systemtap && conf_opts+=( --enable-trace-backends="dtrace" ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if [[ ${static_flag} != "none" ]] && use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - tc-enables-pie && conf_opts+=( --enable-pie ) - fi - - # Meson will not use a cross-file unless cross_prefix is set. - tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) - - # Plumb through equivalent of EXTRA_ECONF to allow experiments - # like bug #747928. - conf_opts+=( ${EXTRA_CONF_QEMU} ) - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" || die - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" || die - default - fi - - cd "${S}/tools-build" || die - default -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" || die - pax-mark m */qemu-system-* #515550 - emake check - fi -} - -qemu_python_install() { - python_domodule "${S}/python/qemu" - - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -# Generate binfmt support files. -# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) -# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) -generate_initd() { - local out="${T}/qemu-binfmt" - local out_systemd="${T}/qemu.conf" - local d="${T}/binfmt.d" - - einfo "Generating qemu binfmt scripts and configuration files" - - # Generate the debian fragments first. - mkdir -p "${d}" - "${S}"/scripts/qemu-binfmt-conf.sh \ - --debian \ - --exportdir "${d}" \ - --qemu-path "${EPREFIX}/usr/bin" \ - || die - # Then turn the fragments into a shell script we can source. - sed -E -i \ - -e 's:^([^ ]+) (.*)$:\1="\2":' \ - "${d}"/* || die - - # Generate the init.d script by assembling the fragments from above. - local f qcpu package interpreter magic mask - cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die - for f in "${d}"/qemu-* ; do - source "${f}" - - # Normalize the cpu logic like we do in the init.d for the native cpu. - qcpu=${package#qemu-} - case ${qcpu} in - arm*) qcpu="arm";; - mips*) qcpu="mips";; - ppc*) qcpu="ppc";; - s390*) qcpu="s390";; - sh*) qcpu="sh";; - sparc*) qcpu="sparc";; - esac - - # we use 'printf' here to be portable across 'sh' - # implementations: #679168 - cat <>"${out}" - if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register - fi -EOF - - echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" - - done - cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets. - generate_initd - doinitd "${T}/qemu-binfmt" - - # Install binfmt/qemu.conf. - insinto "/usr/share/qemu/binfmt.d" - doins "${T}/qemu.conf" - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dodoc check-report.html - - if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - cd "${S}/tools-build" || die - emake DESTDIR="${ED}" install - - # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8] - fi - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null || die - pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 - popd >/dev/null || die - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - cd "${S}" || die - dodoc MAINTAINERS - newdoc pc-bios/README README.pc-bios - - # Disallow stripping of prebuilt firmware files. - dostrip -x ${QA_PREBUILT} - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin - fi - - # Remove vgabios since we're using the seavgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-virtio.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - - # PPC/PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then - dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin - dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin - dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -firmware_abi_change() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then - return 0 - fi - done - return 1 -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - xdg_icon_cache_update - - [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ - fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper - - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog - - if use pin-upstream-blobs && firmware_abi_change; then - ewarn "This version of qemu pins new versions of firmware blobs:" - - if has_version 'sys-firmware/edk2-bin'; then - ewarn " $(best_version sys-firmware/edk2-bin)" - else - ewarn " $(best_version sys-firmware/edk2)" - fi - - if has_version 'sys-firmware/seabios-bin'; then - ewarn " $(best_version sys-firmware/seabios-bin)" - else - ewarn " $(best_version sys-firmware/seabios)" - fi - - ewarn " $(best_version sys-firmware/ipxe)" - ewarn " $(best_version sys-firmware/sgabios)" - ewarn "This might break resume of hibernated guests (started with a different" - ewarn "firmware version) and live migration to/from qemu versions with different" - ewarn "firmware. Please (cold) restart all running guests. For functional" - ewarn "guest migration ensure that all" - ewarn "hosts run at least" - ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." - fi -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - - if has_version 'sys-firmware/edk2-bin'; then - echo " $(best_version sys-firmware/edk2-bin)" - else - echo " $(best_version sys-firmware/edk2)" - fi - - if has_version 'sys-firmware/seabios-bin'; then - echo " $(best_version sys-firmware/seabios-bin)" - else - echo " $(best_version sys-firmware/seabios)" - fi - - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/sgabios)" -} - -pkg_postrm() { - xdg_icon_cache_update - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.2.0.ebuild deleted file mode 100644 index 3fda0219f1..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.2.0.ebuild +++ /dev/null @@ -1,995 +0,0 @@ -# Copyright 1999-2025 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-qemu-docs -# Set to 1 if prebuilt, 0 if not -# (the construct below is to allow overriding from env for script) -QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1} -QEMU_DOCS_PREBUILT_DEV=sam -QEMU_DOCS_VERSION=$(ver_cut 1-3) -# Default to generating docs (inc. man pages) if no prebuilt; overridden later -# bug #830088 -QEMU_DOC_USEFLAG="+doc" - -PYTHON_COMPAT=( python3_{11..13} ) -PYTHON_REQ_USE="ensurepip(-),ncurses,readline" - -FIRMWARE_ABI_VERSION="7.2.0" - -inherit eapi9-ver linux-info toolchain-funcs python-r1 udev fcaps \ - readme.gentoo-r1 pax-utils xdg-utils - -if [[ ${PV} == *9999* ]]; then - QEMU_DOCS_PREBUILT=0 - - EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/" - EGIT_SUBMODULES=() - inherit git-r3 - SRC_URI="" - declare -A SUBPROJECTS=( - [keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6" - [berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037" - [berkeley-testfloat-3]="e7af9751d9f9fd3b47911f51a5cfd08af256a9ab" - ) - - for proj in "${!SUBPROJECTS[@]}"; do - c=${SUBPROJECTS[${proj}]} - SRC_URI+=" https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2" - done -else - MY_P="${PN}-${PV/_rc/-rc}" - SRC_URI="https://download.qemu.org/${MY_P}.tar.xz" - - if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )" - fi - - S="${WORKDIR}/${MY_P}" - [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" - -[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc" - -IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG} - +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring - jack jemalloc +jpeg keyutils - lzo multipath - ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire - plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux - +slirp - smartcard snappy spice ssh static-user systemtap test udev usb - usbredir vde +vhost-net virgl virtfs +vnc vte xattr xdp xen - zstd" - -COMMON_TARGETS=" - aarch64 - alpha - arm - hppa - i386 - loongarch64 - m68k - microblaze - microblazeel - mips - mips64 - mips64el - mipsel - or1k - ppc - ppc64 - riscv32 - riscv64 - s390x - sh4 - sh4eb - sparc - sparc64 - x86_64 - xtensa - xtensaeb -" -IUSE_SOFTMMU_TARGETS=" - ${COMMON_TARGETS} - avr - rx - tricore -" -IUSE_USER_TARGETS=" - ${COMMON_TARGETS} - aarch64_be - armeb - hexagon - mipsn32 - mipsn32el - ppc64le - sparc32plus -" - -use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) -use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -RESTRICT="!test? ( test )" - -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_mips64el? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_riscv32? ( fdt ) - qemu_softmmu_targets_riscv64? ( fdt ) - qemu_softmmu_targets_x86_64? ( fdt ) - sdl-image? ( sdl ) - static-user? ( !plugins ) - virgl? ( opengl ) - virtfs? ( xattr ) - vnc? ( gnutls ) - vte? ( gtk ) - multipath? ( udev ) - plugins? ( !static-user ) - xdp? ( bpf ) -" -for smname in ${IUSE_SOFTMMU_TARGETS} ; do - REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )" -done - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# and user/softmmu targets (qemu-*, qemu-system-*). -# -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# 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[static-libs(+)] - sys-libs/zlib[static-libs(+)] - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-debug/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] ) -" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# softmmu targets (qemu-system-*). -SOFTMMU_TOOLS_DEPEND=" - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( - app-accessibility/brltty[api] - app-accessibility/brltty[static-libs(+)] - ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bpf? ( dev-libs/libbpf:= ) - bzip2? ( app-arch/bzip2[static-libs(+)] ) - capstone? ( dev-libs/capstone:=[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) - fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - >=net-libs/gnutls-3.0:=[static-libs(+)] - dev-libs/nettle:=[static-libs(+)] - ) - gtk? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) - infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) - iscsi? ( net-libs/libiscsi ) - io-uring? ( sys-libs/liburing:=[static-libs(+)] ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc ) - jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) - kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] ) - keyutils? ( sys-apps/keyutils[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - multipath? ( sys-fs/multipath-tools ) - ncurses? ( - sys-libs/ncurses:=[unicode(+)] - sys-libs/ncurses:=[static-libs(+)] - ) - nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl(+),gbm(+)] - ) - pam? ( sys-libs/pam ) - pipewire? ( >=media-video/pipewire-0.3.60 ) - png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] ) - pulseaudio? ( media-libs/libpulse ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - media-libs/libsdl2[video] - media-libs/libsdl2[static-libs(+)] - ) - sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) - slirp? ( net-libs/libslirp[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy:= ) - spice? ( - >=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:= ) - 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(+)] ) - virtfs? ( sys-libs/libcap ) - xdp? ( net-libs/xdp-tools ) - xen? ( app-emulation/xen-tools:= ) - zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) -" - -EDK2_OVMF_VERSION="202202" -SEABIOS_VERSION="1.16.3" - -X86_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} - ~sys-firmware/ipxe-1.21.1[binary,qemu] - ~sys-firmware/seabios-bin-${SEABIOS_VERSION} - ~sys-firmware/sgabios-0.1_pre10[binary] - ) - !pin-upstream-blobs? ( - || ( - >=sys-firmware/edk2-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} - ) - sys-firmware/ipxe[qemu] - || ( - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - >=sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - sys-firmware/sgabios - ) -" -PPC_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - !pin-upstream-blobs? ( - || ( - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - >=sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - ) -" - -# See bug #913084 for pip dep -BDEPEND=" - $(python_gen_impl_dep) - dev-lang/perl - >=dev-build/meson-0.63.0 - app-alternatives/ninja - virtual/pkgconfig - doc? ( - >=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] - ) - gtk? ( nls? ( sys-devel/gettext ) ) - test? ( - dev-libs/glib[utils] - app-alternatives/bc - ) -" -CDEPEND=" - ${ALL_DEPEND//\[static-libs(+)]} - ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) -" -DEPEND=" - ${CDEPEND} - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - static-user? ( ${ALL_DEPEND} ) -" -RDEPEND=" - ${CDEPEND} - acct-group/kvm - selinux? ( - sec-policy/selinux-qemu - sys-libs/libselinux - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-9.0.0-disable-keymap.patch - "${FILESDIR}"/${PN}-9.2.0-capstone-include-path.patch - "${FILESDIR}"/${PN}-8.1.0-skip-tests.patch - "${FILESDIR}"/${PN}-8.1.0-find-sphinx.patch - "${FILESDIR}"/${PN}-9.0.0-glibc-2.41.patch -) - -QA_PREBUILT=" - usr/share/qemu/hppa-firmware.img - usr/share/qemu/hppa-firmware64.img - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf - usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500 -" - -QA_WX_LOAD=" - usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or1k - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32 -" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the -kernel module loaded before running kvm. The easiest way to ensure that the -kernel module is loaded is to load it on boot. - For AMD CPUs the module is called 'kvm-amd'. - For Intel CPUs the module is called 'kvm-intel'. -Please review /etc/conf.d/modules for how to load these. - -Make sure your user is in the 'kvm' group. Just run - $ gpasswd -a kvm -then have re-login. - -For brand new installs, the default permissions on /dev/kvm might not let -you access it. You can tell udev to reset ownership/perms: - $ udevadm trigger -c add /dev/kvm - -If you want to register binfmt handlers for qemu user targets: -For openrc: - # rc-update add qemu-binfmt -For systemd: - # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requires a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - use test && CONFIG_CHECK+=" IP_MULTICAST" - ERROR_IP_MULTICAST="Test suite requires IP_MULTICAST" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/configs/targets/ >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - for file in ${A}; do - unpack "${file}" - done - cd "${WORKDIR}" || die - for proj in "${!SUBPROJECTS[@]}"; do - mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" || die - done - cd "${S}" || die - meson subprojects packagefiles --apply || die - else - default - fi -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - default - - # Use correct toolchain to fix cross-compiling - tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS - export WINDRES=${CHOST}-windres - - # Workaround for bug #938302 - if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then - cat >> "${S}"/configs/meson/linux.txt <<-EOF || die - [binaries] - dtrace='stap-dtrace' - EOF - fi - - # Verbose builds - MAKEOPTS+=" V=1" - - # Remove bundled modules - rm -r roms/*/ || die -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - - mkdir "${builddir}" || die - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --bindir=/usr/bin - --libdir=/usr/$(get_libdir) - --datadir=/usr/share - --docdir=/usr/share/doc/${PF}/html - --mandir=/usr/share/man - --localstatedir=/var - --disable-bsd-user - --disable-containers # bug #732972 - --disable-guest-agent - --disable-strip - --disable-download - --python="${PYTHON}" - - # bug #746752: TCG interpreter has a few limitations: - # - it does not support FPU - # - it's generally slower on non-self-modifying code - # It's advantage is support for host architectures - # where native codegeneration is not implemented. - # Gentoo has qemu keyworded only on targets with - # native code generation available. Avoid the interpreter. - --disable-tcg-interpreter - - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --objcc="$(tc-getCC)" - --host-cc="$(tc-getBUILD_CC)" - - $(use_enable alsa) - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - $(use_enable jack) - $(use_enable nls gettext) - $(use_enable oss) - $(use_enable pipewire) - $(use_enable plugins) - $(use_enable pulseaudio pa) - $(use_enable selinux) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets. This simplifies building - # static user targets (USE=static-user) considerably. - conf_notuser() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - # Enable option only for softmmu build, but not 'user' or 'tools' - conf_softmmu() { - if [[ ${buildtype} == "softmmu" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Enable option only for tools build, but not 'user' or 'softmmu' - conf_tools() { - if [[ ${buildtype} == "tools" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Special case for the malloc flag, because the --disable flag does - # not exist and trying like above will break configuring. - conf_malloc() { - if [[ ! ${buildtype} == "user" ]] ; then - usex "${1}" "--enable-malloc=${1}" "" - fi - } - conf_opts+=( - $(conf_notuser accessibility brlapi) - $(conf_notuser aio linux-aio) - $(conf_softmmu bpf) - $(conf_notuser bzip2) - $(conf_notuser capstone) - $(conf_notuser curl) - $(conf_tools doc docs) - $(conf_notuser fdt) - $(conf_notuser fuse) - $(conf_notuser glusterfs) - $(conf_notuser gnutls) - $(conf_notuser gnutls nettle) - $(conf_notuser gtk) - $(conf_notuser infiniband rdma) - $(conf_notuser iscsi libiscsi) - $(conf_notuser io-uring linux-io-uring) - $(conf_malloc jemalloc) - $(conf_notuser jpeg vnc-jpeg) - $(conf_notuser kernel_linux kvm) - $(conf_notuser keyutils libkeyutils) - $(conf_notuser lzo) - $(conf_notuser multipath mpath) - $(conf_notuser ncurses curses) - $(conf_notuser nfs libnfs) - $(conf_notuser numa) - $(conf_notuser opengl) - $(conf_notuser pam auth-pam) - $(conf_notuser png) - $(conf_notuser rbd) - $(conf_notuser sasl vnc-sasl) - $(conf_notuser sdl) - $(conf_softmmu sdl-image) - $(conf_notuser seccomp) - $(conf_notuser slirp) - $(conf_notuser smartcard) - $(conf_notuser snappy) - $(conf_notuser spice) - $(conf_notuser ssh libssh) - $(conf_notuser udev libudev) - $(conf_notuser usb libusb) - $(conf_notuser usbredir usb-redir) - $(conf_notuser vde) - $(conf_notuser vhost-net) - $(conf_notuser virgl virglrenderer) - $(conf_softmmu virtfs) - $(conf_notuser vnc) - $(conf_notuser vte) - $(conf_softmmu xdp af-xdp) - $(conf_notuser xen) - $(conf_notuser xen xen-pci-passthrough) - # use prebuilt keymaps, bug #759604 - --disable-xkbcommon - $(conf_notuser zstd) - ) - - if [[ ! ${buildtype} == "user" ]] ; then - # audio options - local audio_opts=( - # Note: backend order matters here: #716202 - # We iterate from higher-level to lower level. - $(usex pulseaudio pa "") - $(usev pipewire) - $(usev jack) - $(usev sdl) - $(usev alsa) - $(usev oss) - ) - conf_opts+=( - --audio-drv-list=$(IFS=,; echo "${audio_opts[*]}") - ) - fi - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-tools - --disable-cap-ng - --disable-seccomp - ) - local static_flag="static-user" - ;; - softmmu) - conf_opts+=( - --disable-linux-user - --enable-system - --disable-tools - --enable-cap-ng - --enable-seccomp - --disable-libcbor - ) - local static_flag="none" - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --enable-tools - --enable-cap-ng - ) - local static_flag="none" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTap - use systemtap && conf_opts+=( --enable-trace-backends="dtrace" ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if [[ ${static_flag} != "none" ]] && use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - tc-enables-pie && conf_opts+=( --enable-pie ) - fi - - # Meson will not use a cross-file unless cross_prefix is set. - tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) - - # Plumb through equivalent of EXTRA_ECONF to allow experiments - # like bug #747928. - conf_opts+=( ${EXTRA_CONF_QEMU} ) - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" || die - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" || die - default - fi - - cd "${S}/tools-build" || die - default -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" || die - pax-mark m */qemu-system-* #515550 - emake check - fi -} - -qemu_python_install() { - python_domodule "${S}/python/qemu" - - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -# Generate binfmt support files. -# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) -# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) -generate_initd() { - local out="${T}/qemu-binfmt" - local out_systemd="${T}/qemu.conf" - local d="${T}/binfmt.d" - - einfo "Generating qemu binfmt scripts and configuration files" - - # Generate the debian fragments first. - mkdir -p "${d}" - "${S}"/scripts/qemu-binfmt-conf.sh \ - --debian \ - --exportdir "${d}" \ - --qemu-path "${EPREFIX}/usr/bin" \ - || die - # Then turn the fragments into a shell script we can source. - sed -E -i \ - -e 's:^([^ ]+) (.*)$:\1="\2":' \ - "${d}"/* || die - - # Generate the init.d script by assembling the fragments from above. - local f qcpu package interpreter magic mask - cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die - for f in "${d}"/qemu-* ; do - source "${f}" - - # Normalize the cpu logic like we do in the init.d for the native cpu. - qcpu=${package#qemu-} - case ${qcpu} in - arm*) qcpu="arm";; - mips*) qcpu="mips";; - ppc*) qcpu="ppc";; - s390*) qcpu="s390";; - sh*) qcpu="sh";; - sparc*) qcpu="sparc";; - esac - - # we use 'printf' here to be portable across 'sh' - # implementations: #679168 - cat <>"${out}" - if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register - fi -EOF - - echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" - - done - cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets. - generate_initd - doinitd "${T}/qemu-binfmt" - - # Install binfmt/qemu.conf. - insinto "/usr/share/qemu/binfmt.d" - doins "${T}/qemu.conf" - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dodoc check-report.html - - if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - cd "${S}/tools-build" || die - emake DESTDIR="${ED}" install - - # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8] - fi - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null || die - pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 - popd >/dev/null || die - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - cd "${S}" || die - dodoc MAINTAINERS - newdoc pc-bios/README README.pc-bios - - # Disallow stripping of prebuilt firmware files. - dostrip -x ${QA_PREBUILT} - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin - fi - - # Remove vgabios since we're using the seavgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-virtio.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - - # PPC/PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then - dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin - dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin - dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - xdg_icon_cache_update - - [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ - fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper - - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog - - if use pin-upstream-blobs && ver_replacing -lt ${FIRMWARE_ABI_VERSION}; then - ewarn "This version of qemu pins new versions of firmware blobs:" - - if has_version 'sys-firmware/edk2-bin'; then - ewarn " $(best_version sys-firmware/edk2-bin)" - else - ewarn " $(best_version sys-firmware/edk2)" - fi - - if has_version 'sys-firmware/seabios-bin'; then - ewarn " $(best_version sys-firmware/seabios-bin)" - else - ewarn " $(best_version sys-firmware/seabios)" - fi - - ewarn " $(best_version sys-firmware/ipxe)" - ewarn " $(best_version sys-firmware/sgabios)" - ewarn "This might break resume of hibernated guests (started with a different" - ewarn "firmware version) and live migration to/from qemu versions with different" - ewarn "firmware. Please (cold) restart all running guests. For functional" - ewarn "guest migration ensure that all" - ewarn "hosts run at least" - ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." - fi -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - - if has_version 'sys-firmware/edk2-bin'; then - echo " $(best_version sys-firmware/edk2-bin)" - else - echo " $(best_version sys-firmware/edk2)" - fi - - if has_version 'sys-firmware/seabios-bin'; then - echo " $(best_version sys-firmware/seabios-bin)" - else - echo " $(best_version sys-firmware/seabios)" - fi - - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/sgabios)" -} - -pkg_postrm() { - xdg_icon_cache_update - udev_reload -} From dcd2f700e60d11a4f607b88f8943985d3ed5a83f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:31 +0000 Subject: [PATCH 014/153] app-emulation/qemu-guest-agent: Sync with Gentoo It's from Gentoo commit 4332c9d6fce6920811d2fda2d02b4405a88a5ba1. --- .../qemu-guest-agent/qemu-guest-agent-9.2.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-9.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-9.2.0.ebuild index 258d627aa8..75d0e3f000 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-9.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-9.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" RDEPEND="dev-libs/glib" DEPEND="${RDEPEND}" From fee1dd27912152f55ba1a72f3a954681fbd0db20 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:31 +0000 Subject: [PATCH 015/153] app-emulation/virt-firmware: Sync with Gentoo It's from Gentoo commit 80b3dd6c8ed7868b98f0a96ed0b88f998fa7774f. --- .../app-emulation/virt-firmware/virt-firmware-24.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/virt-firmware/virt-firmware-24.11.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/virt-firmware/virt-firmware-24.11.ebuild index d89bf032e6..d4f936ad88 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/virt-firmware/virt-firmware-24.11.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/virt-firmware/virt-firmware-24.11.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" RDEPEND=" dev-python/cryptography[${PYTHON_USEDEP}] From 10490d1dd144794b94ef89aaf80c66acb7e6cede Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:41 +0000 Subject: [PATCH 016/153] app-portage/elt-patches: Sync with Gentoo It's from Gentoo commit 9102b0eae958dc76afba2e7b5210745d4a51b60b. --- .../app-portage/elt-patches/Manifest | 1 + .../elt-patches/elt-patches-20250306.ebuild | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20250306.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest index 39f3c94d19..1c2db580bd 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest @@ -1,2 +1,3 @@ DIST elt-patches-20240912.tar.xz 47436 BLAKE2B 589643e96f83a13fec4553c4ceb14af5993be43e3519678ecfcbd689d7a0016d2cd3c06f131548c90da19188a75cd2828accc5bd516373fa64401bdbad92bce2 SHA512 502347387c594df9ebb453c5258d0d8125694b6170da6136d9579d1535e6d944f9b4eda1a049cdadbb1df29665c00165c1b0f0804413ac4470a082c49272bebd DIST elt-patches-20241121.tar.xz 47760 BLAKE2B e0ac30748586dc5885539d79f29d5283f80cea51fdbd4af44640b7475f6a46d5c4bc30e4b452a495c3bde16d103f5e320667969c30f06cf55824b2fcdab1e45f SHA512 bce7fc40f10f8db568a3a7237daa3ce9e23dd9ea3c41f26e285cdc350c0b7afbd44eed996324ea9b091b7e69990822458e09c486f12deb70b1a5ee917aa43a80 +DIST elt-patches-20250306.tar.xz 47852 BLAKE2B 40b75cbea3f4dc0a1507e82e482dcd6d647eb7de6f4f357c1073aeab1f55d974a673fb69c2cdb76d31fc7dbfa808bbfa81f1c29917dc813d7ca2e26490e9bd42 SHA512 c1d9af54cd582aef558104403ac84ff195746ac1b26ff52aa787b1d95f547da65da74385b2d8465b7b6c6a8c4cb8eb0422e97ae86919be0b3704d98971432a12 diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20250306.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20250306.ebuild new file mode 100644 index 0000000000..c423ad4690 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20250306.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Collection of patches for libtool.eclass" +HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/elt-patches.git + https://github.com/gentoo/elt-patches + " + inherit git-r3 +else + SRC_URI=" + https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz + " + + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +# The 'check' target currently wants network access to fetch libtool tarballs. +RESTRICT="test" + +RDEPEND="sys-apps/gentoo-functions" +BDEPEND="app-arch/xz-utils" + +src_compile() { + emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)" +} + +src_install() { + emake DESTDIR="${D}" rootprefix="${EPREFIX}" install +} From 04bd080d2ae0ce54c325b7c3f5bad906ef4cce58 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:41 +0000 Subject: [PATCH 017/153] app-portage/gentoolkit: Sync with Gentoo It's from Gentoo commit 4fc49b111c23ac4820233e9e021bb24ed90fcf21. --- .../app-portage/gentoolkit/gentoolkit-0.6.8.ebuild | 9 ++++++--- .../app-portage/gentoolkit/gentoolkit-9999.ebuild | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild index b534884eeb..b478ab177c 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.8.ebuild @@ -1,15 +1,18 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..13} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 ) PYTHON_REQ_USE="xml(+),threads(+)" inherit meson python-r1 tmpfiles if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/gentoolkit.git + https://github.com/gentoo/gentoolkit + " inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2" diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild index 30de23241a..e4e8abd6ed 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,10 @@ PYTHON_REQ_USE="xml(+),threads(+)" inherit meson python-r1 tmpfiles if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/gentoolkit.git + https://github.com/gentoo/gentoolkit + " inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2" From bf5bbc34db6ef30a4bdb81fbd4dfcfdec274da00 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:42 +0000 Subject: [PATCH 018/153] app-portage/getuto: Sync with Gentoo It's from Gentoo commit 1f3c6aead0067083de758bd2b5fb0dd63af45430. --- .../portage-stable/app-portage/getuto/getuto-1.15.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/getuto/getuto-1.15.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/getuto/getuto-1.15.ebuild index 07fa69a572..5f8453a0db 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/getuto/getuto-1.15.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/getuto/getuto-1.15.ebuild @@ -15,7 +15,7 @@ else " S=${WORKDIR}/${PN}-${P} - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/23.0/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar -> ${PN}-23.0-libc-1-r1-1.gpkg.tar )" From c513db6628fe1390a303e2bfb6a14625290e078e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:42 +0000 Subject: [PATCH 019/153] app-shells/bash: Sync with Gentoo It's from Gentoo commit f7af9ec88a93891a514385fda0f70a238b1169cd. --- .../portage-stable/app-shells/bash/Manifest | 3 +- .../bash/bash-5.3_beta_p20250212.ebuild | 414 ------------------ ....ebuild => bash-5.3_beta_p20250307.ebuild} | 2 +- 3 files changed, 2 insertions(+), 417 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.3_beta_p20250212.ebuild rename sdk_container/src/third_party/portage-stable/app-shells/bash/{bash-5.3_beta_p20250224.ebuild => bash-5.3_beta_p20250307.ebuild} (99%) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/Manifest b/sdk_container/src/third_party/portage-stable/app-shells/bash/Manifest index 974716429c..19bb4ba47c 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/Manifest @@ -24,8 +24,7 @@ DIST bash-5.2.tar.gz 10950833 BLAKE2B 51b196e710794ebad8eac28c31c93eb99ac1a7db30 DIST bash-5.2.tar.gz.sig 95 BLAKE2B 2991b7c46ef1cdca08062f419be47fca7551f4c5d9aad8a5c1da74974f5e7707d23914b4cecf9b6c9610471146b2c49b611bb62a5d974f1c37cceb77b719851c SHA512 a161664f124f906be32709f66702f8f780e6d52e558ea45e71ec60a959c9435ff68477ee65a0a9f6c0051d5592f5044fb3b410cf3cd3ae5a8a323789b01be258 DIST bash-5.3-beta.tar.gz 10667630 BLAKE2B d6d3a1efd5ed69b131e2831e35c4a620968132e7d9da079de155decb4d3c736cd6c9f1180523e85dd41aeecdb9b380e4768bc551afafaee478168c462ce90929 SHA512 f8f02b4a90312c8e7c589efd1a0a43a4db3bcb47d19cb95190961e4ae254b2d6d26472197ce216868d914fe1adf62741f927552239559a1c3b2c64dfcfaa8cb0 DIST bash-5.3-beta.tar.gz.sig 94 BLAKE2B a4b85d5755e200abddd5669c3d21b1ee6be8036b27934e25473c14b15ffc1bc7cbbd5a94f39a0dc6bf6050908590509f0ba39d28c33947154cc966e11d454c8c SHA512 72184ca2afe3d0c8c2165516499a61da2aecc0c8c83661cab0038c3d849623115729d2ade73c4b5973ea9b5e8169af4bc2aea51f0b70356af26342285adab2f5 -DIST bash-5.3_beta_p20250212-c3ca11424d2ae66cafa2f931b008dfb728e209a5.tar.gz 15731015 BLAKE2B a2409a10d4ee849ba3589a7eb988b99dacf888933d0d05eddda6f4ed44ddffead761d5530c49d732b158cc818569671c9cf5129b617ccf45f9b9e86659d6d1fd SHA512 166e52bfae6c07f6791c11cd80924419f7c4bbd841bfc69565b2ab298d5179ebc4c639c1dd0491136f10e686f9080c6f23b601e8225fe0dc8b633c7f79977c82 -DIST bash-5.3_beta_p20250224-e608233770b0ba5fe20cb46842992b64f7252383.tar.gz 15744147 BLAKE2B 8c9497c8dc0feefe93bac7351973fc6b2663c75d7ee9e7f6ef44687f84c1c2081fe11685c9535cd0d3185c8d3f37180234f5103483e8dedbcd34b86462ec4bac SHA512 e6aadfcb9ab18a7ba2d2d67d04adef3e7bf2ce72091c222b45267ea26e5fd31ab58cdd574c4f8ebb1e6dee60fe8c4912732bb5a4ac5d8b85d255b50e60ef43dd +DIST bash-5.3_beta_p20250307-c3997d51f8ba359eeabb45b90b9cdae4fe599b5a.tar.gz 15761772 BLAKE2B c87d4cac04e910bd9f7441b349233c92c53cfa3e74356c3ffc18d236313f8e9d1c7b49ffaa7435aee8b1ef4ce216a74f2ffe5564e30d448d8ce77895df5a2f75 SHA512 b5802f900a081880ae4f3c799bdf98d4bcc70661921d27ab403dcc4acbececc834ffdb3c02d1ea7d24736e122f6a3e9286a1306c3962c8daef94606e8f999c3c DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071 DIST bash205b-002 755 BLAKE2B 6a6ed5679d451f02f8104b345c1722d11718ce3b4043b581c17786d40d8da69a34786fb56d0c363dba277b8e9dd33f12f70c9cc73a9fc39ba4a8319406f0458d SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883 DIST bash205b-003 2356 BLAKE2B b7887d00d92fd298cd07a15e1c73b516dabd22ecd74c97091636dd97a0cd55024ed698e5cc924c4311d994dd326b1ad074bea35e7650cf9cf4e25c60d2713fa7 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399 diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.3_beta_p20250212.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.3_beta_p20250212.ebuild deleted file mode 100644 index e461a1fa6d..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.3_beta_p20250212.ebuild +++ /dev/null @@ -1,414 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc -inherit flag-o-matic toolchain-funcs prefix verify-sig - -# Uncomment if we have a patchset. -#GENTOO_PATCH_DEV="sam" -#GENTOO_PATCH_VER="${PV}" - -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} -MY_PATCHES=() - -# Determine the patchlevel. -case ${PV} in - 9999|*_alpha*|*_beta*|*_rc*) - # Set a negative patchlevel to indicate that it's a pre-release. - PLEVEL=-1 - ;; - *_p*) - PLEVEL=${PV##*_p} - ;; - *) - PLEVEL=0 -esac - -# The version of readline this bash normally ships with. Note that we only use -# the bundled copy of readline for pre-releases. -READLINE_VER="8.3_alpha" - -DESCRIPTION="The standard GNU Bourne again shell" -HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git" - EGIT_BRANCH=devel - inherit git-r3 -elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then - # It can be useful to have snapshots in the pre-release period once - # the first alpha is out, as various bugs get reported and fixed from - # the alpha, and the next pre-release is usually quite far away. - # - # i.e. if it's worth packaging the alpha, it's worth packaging a followup. - BASH_COMMIT="c3ca11424d2ae66cafa2f931b008dfb728e209a5" - SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.gz -> ${P}-${BASH_COMMIT}.tar.gz" - S=${WORKDIR}/${PN}-${BASH_COMMIT} -else - my_urls=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}.tar.gz" ) - - # bash-5.1 -> bash51 - my_p=${PN}$(ver_cut 1-2) my_p=${my_p/.} - - for (( my_patch_idx = 1; my_patch_idx <= PLEVEL; my_patch_idx++ )); do - printf -v my_patch_ver %s-%03d "${my_p}" "${my_patch_idx}" - my_urls+=( {'mirror://gnu/bash','ftp://ftp.cwru.edu/pub/bash'}/"${MY_P}-patches/${my_patch_ver}" ) - MY_PATCHES+=( "${DISTDIR}/${my_patch_ver}" ) - done - - SRC_URI="${my_urls[*]} verify-sig? ( ${my_urls[*]/%/.sig} )" - S=${WORKDIR}/${MY_P} - - unset -v my_urls my_p my_patch_idx my_patch_ver -fi - -if [[ ${GENTOO_PATCH_VER} ]]; then - SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV:?}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER:?}-patches.tar.xz" -fi - -LICENSE="GPL-3+" -SLOT="0" -if (( PLEVEL >= 0 )); then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi -IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline" - -DEPEND=" - >=sys-libs/ncurses-5.2-r2:= - nls? ( virtual/libintl ) -" -if (( PLEVEL >= 0 )); then - DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )" -fi -RDEPEND=" - ${DEPEND} -" -# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011). -BDEPEND=" - pgo? ( dev-util/gperf ) - verify-sig? ( sec-keys/openpgp-keys-chetramey ) -" - -# EAPI 8 tries to append it but it doesn't exist here. -QA_CONFIGURE_OPTIONS="--disable-static" - -PATCHES=( - #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/ - - # Patches to or from Chet, posted to the bug-bash mailing list. - "${FILESDIR}/${PN}-5.0-syslog-history-extern.patch" -) - -pkg_setup() { - # bug #7332 - if is-flag -malign-double; then - eerror "Detected bad CFLAGS '-malign-double'. Do not use this" - eerror "as it breaks LFS (struct stat64) on x86." - die "remove -malign-double from your CFLAGS mr ricer" - fi - - if use bashlogger; then - ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." - ewarn "This will log ALL output you enter into the shell, you have been warned." - fi -} - -src_unpack() { - local patch - - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then - default - else - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}/${MY_P}.tar.gz"{,.sig} - - for patch in "${MY_PATCHES[@]}"; do - verify-sig_verify_detached "${patch}"{,.sig} - done - fi - - unpack "${MY_P}.tar.gz" - - if [[ ${GENTOO_PATCH_VER} ]]; then - unpack "${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" - fi - fi -} - -src_prepare() { - # Include official patches. - (( PLEVEL > 0 )) && eapply -p0 "${MY_PATCHES[@]}" - - # Clean out local libs so we know we use system ones w/releases. The - # touch utility is invoked for the benefit of config.status. - if (( PLEVEL >= 0 )); then - rm -rf lib/{readline,termcap}/* \ - && touch lib/{readline,termcap}/Makefile.in \ - && sed -i -E 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in \ - || die - fi - - # Prefixify hardcoded path names. No-op for non-prefix. - hprefixify pathnames.h.in - - # Avoid regenerating docs after patches, bug #407985. - sed -i -E '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in \ - && touch -r . doc/* \ - || die - - # Sometimes hangs (more noticeable w/ pgo), bug #907403. - rm tests/run-jobs || die - - eapply -p0 "${PATCHES[@]}" - eapply_user -} - -src_configure() { - local -a myconf - - # Upstream only test with Bison and require GNUisms like YYEOF and - # YYERRCODE. The former at least may be in POSIX soon: - # https://www.austingroupbugs.net/view.php?id=1269. - # configure warns on use of non-Bison but doesn't abort. The result - # may misbehave at runtime. - unset -v YACC - - # wcsnwidth(), substring() issues with -Wlto-type-mismatch, reported - # upstream to Chet by email. - filter-lto - - myconf=( - --disable-profiling - - # Force linking with system curses ... the bundled termcap lib - # sucks bad compared to ncurses. For the most part, ncurses - # is here because readline needs it. But bash itself calls - # ncurses in one or two small places :(. - --with-curses - - $(use_enable mem-scramble) - $(use_enable net net-redirections) - $(use_enable readline) - $(use_enable readline bang-history) - $(use_enable readline history) - $(use_with afs) - $(use_with mem-scramble bash-malloc) - ) - - # For descriptions of these, see config-top.h. - # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 - append-cppflags \ - -DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \ - -DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \ - -DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \ - -DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \ - -DNON_INTERACTIVE_LOGIN_SHELLS \ - -DSSH_SOURCE_BASHRC \ - $(use bashlogger && echo -DSYSLOG_HISTORY) - - use nls || myconf+=( --disable-nls ) - - if (( PLEVEL >= 0 )); then - # Historically, we always used the builtin readline, but since - # our handling of SONAME upgrades has gotten much more stable - # in the PM (and the readline ebuild itself preserves the old - # libs during upgrades), linking against the system copy should - # be safe. - # Exact cached version here doesn't really matter as long as it - # is at least what's in the DEPEND up above. - export ac_cv_rl_version=${READLINE_VER%%_*} - - # Use system readline only with released versions. - myconf+=( --with-installed-readline=. ) - fi - - if use plugins; then - append-ldflags "-Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/bash" - else - # Disable the plugins logic by hand since bash doesn't provide - # a way of doing it. - export ac_cv_func_dl{close,open,sym}=no \ - ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no - - sed -i -e '/LOCAL_LDFLAGS=/s:-rdynamic::' configure || die - fi - - # bug #444070 - tc-export AR - - econf "${myconf[@]}" -} - -src_compile() { - local -a pgo_generate_flags pgo_use_flags - local flag - - # -fprofile-partial-training because upstream notes the test suite isn't - # super comprehensive. - # https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo - if use pgo; then - pgo_generate_flags=( - -fprofile-update=atomic - -fprofile-dir="${T}"/pgo - -fprofile-generate="${T}"/pgo - ) - pgo_use_flags=( - -fprofile-use="${T}"/pgo - -fprofile-dir="${T}"/pgo - ) - if flag=$(test-flags-CC -fprofile-partial-training); then - pgo_generate_flags+=( "${flag}" ) - pgo_use_flags+=( "${flag}" ) - fi - fi - - # builtins/evalstring.c needs y.tab.h but can't (easily) specify the dep on it from above - emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" y.tab.h - emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" - use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" all others - - # Build Bash and run its tests to generate profiles. - if (( ${#pgo_generate_flags[@]} )); then - # Used in test suite. - unset -v A - - emake CFLAGS="${CFLAGS} ${pgo_generate_flags[*]}" -k check - - if tc-is-clang; then - llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die - fi - - # Rebuild Bash using the profiling data we just generated. - emake clean - emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" y.tab.h - emake CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" - use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags[*]}" all others - fi -} - -src_test() { - # Used in test suite. - unset -v A - - default -} - -src_install() { - local d f - - default - - my_prefixify() { - while read -r; do - if [[ $REPLY == *$1* ]]; then - REPLY=${REPLY/"/etc/"/"${EPREFIX}/etc/"} - fi - printf '%s\n' "${REPLY}" || ! break - done < "$2" || die - } - - dodir /bin - mv -- "${ED}"/usr/bin/bash "${ED}"/bin/ || die - dosym bash /bin/rbash - - insinto /etc/bash - doins "${FILESDIR}"/bash_logout - my_prefixify bashrc.d "${FILESDIR}"/bashrc-r1 | newins - bashrc - - insinto /etc/bash/bashrc.d - my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash - newins "${FILESDIR}"/bashrc.d/10-gentoo-title-r1.bash 10-gentoo-title.bash - if [[ ! ${EPREFIX} ]]; then - doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash - fi - - insinto /etc/skel - for f in bash{_logout,_profile,rc}; do - newins "${FILESDIR}/dot-${f}" ".${f}" - done - - if use plugins; then - exeinto "/usr/$(get_libdir)/bash" - set -- examples/loadables/*.o - doexe "${@%.o}" - - insinto /usr/include/bash-plugins - doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} - fi - - if use examples; then - for d in examples/{functions,misc,scripts,startup-files}; do - exeinto "/usr/share/doc/${PF}/${d}" - docinto "${d}" - for f in "${d}"/*; do - if [[ ${f##*/} != @(PERMISSION|*README) ]]; then - doexe "${f}" - else - dodoc "${f}" - fi - done - done - fi - - # Install bash_builtins.1 and rbash.1. - emake -C doc DESTDIR="${D}" install_builtins - sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die - doman "${T}"/rbash.1 - - newdoc CWRU/changelog ChangeLog - dosym bash.info /usr/share/info/bashref.info -} - -pkg_preinst() { - if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]]; then - mkdir -p -- "${EROOT}"/etc/bash \ - && mv -f -- "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ \ - || die - fi -} - -pkg_postinst() { - local old_ver - - # If /bin/sh does not exist, provide it. - if [[ ! -e ${EROOT}/bin/sh ]]; then - ln -sf -- bash "${EROOT}"/bin/sh || die - fi - - read -r old_ver <<<"${REPLACING_VERSIONS}" - if [[ ! $old_ver ]]; then - : - elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r8"; then - return - fi - - while read -r; do ewarn "${REPLY}"; done <<'EOF' -Files under /etc/bash/bashrc.d must now have a suffix of .sh or .bash. - -Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the -characteristics of the operating environment, it may contain a command to set -the terminal's window title. Those who were already choosing to customise the -PROMPT_COMMAND variable are now advised to append their commands like so: - -PROMPT_COMMAND+=('custom command goes here') - -Gentoo no longer defaults to having bash set the window title in the case -that the terminal is controlled by sshd(8), unless screen is launched on the -remote side or the terminal reliably supports saving and restoring the title -(as alacritty, foot and tmux do). Those wanting for the title to be set -regardless may adjust ~/.bashrc - or create a custom /etc/bash/bashrc.d -drop-in - to set PROMPT_COMMMAND like so: - -PROMPT_COMMAND=(genfun_set_win_title) - -Those who would prefer for bash never to interfere with the window title may -now opt out of the default title setting behaviour, either with the "unset -v -PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired. -EOF -} diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.3_beta_p20250224.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.3_beta_p20250307.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.3_beta_p20250224.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.3_beta_p20250307.ebuild index 05ae39cc87..1b010d24a0 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.3_beta_p20250224.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.3_beta_p20250307.ebuild @@ -45,7 +45,7 @@ elif (( PLEVEL < 0 )) && [[ ${PV} == *_p* ]] ; then # the alpha, and the next pre-release is usually quite far away. # # i.e. if it's worth packaging the alpha, it's worth packaging a followup. - BASH_COMMIT="e608233770b0ba5fe20cb46842992b64f7252383" + BASH_COMMIT="c3997d51f8ba359eeabb45b90b9cdae4fe599b5a" SRC_URI="https://git.savannah.gnu.org/cgit/bash.git/snapshot/bash-${BASH_COMMIT}.tar.gz -> ${P}-${BASH_COMMIT}.tar.gz" S=${WORKDIR}/${PN}-${BASH_COMMIT} else From 38178518c20dbd7abe0d38276dcec96abdfc3294 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:51 +0000 Subject: [PATCH 020/153] app-vim/gentoo-syntax: Sync with Gentoo It's from Gentoo commit a7285fd10bf087cf1975a344245b74335256fcc8. --- .../app-vim/gentoo-syntax/Manifest | 1 + .../gentoo-syntax/gentoo-syntax-15.ebuild | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-15.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest index e9c74d9405..58143d6da9 100644 --- a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest @@ -1 +1,2 @@ DIST gentoo-syntax-14.tar.bz2 20988 BLAKE2B 2f11628bec985ef486ad6f04b694df7a2b1e5ef34f5ddb364c7d9dea4a507d9bae4d8de6b00b33358cf651b4fc6816164f22f7760275a1fd0668b89927859cfb SHA512 63914ffb1911d83fa8991a901f9a23ccfc30f0170a6a730cb02919f4adf0ad34c70f4457e006b1c08a004448c6b9e85d97634a8ed8fdf0b4f98ef9fd804eef00 +DIST gentoo-syntax-15.tar.bz2 21018 BLAKE2B 2b0ead6d5701f14f321ad02b1cd3fe426b8e98e4d80e66331387f0543d88a2ac6b5d78a1f8c9125dadf24f3508c34d915fa896dc2fb85a8664984d771b48a29e SHA512 69cdcd58933b4f83da81ecc943e205689591748c283005b2e6cd342e623d8e0643979d913ec6a9464ca2b49431ea2317dfb0e6454143d6757f6ba287286d24f1 diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-15.ebuild b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-15.ebuild new file mode 100644 index 0000000000..2258150d4b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-15.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit vim-plugin + +DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting" +HOMEPAGE="https://github.com/gentoo/gentoo-syntax" +SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2" + +LICENSE="vim" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="ignore-glep31" + +VIM_PLUGIN_HELPFILES="gentoo-syntax" +VIM_PLUGIN_MESSAGES="filetype" + +src_prepare() { + default + if use ignore-glep31 ; then + for f in ftplugin/*.vim ; do + ebegin "Removing UTF-8 rules from ${f} ..." + sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \ + || die "waah! bad sed voodoo. need more goats." + eend $? + done + fi +} + +pkg_postinst() { + vim-plugin_pkg_postinst + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + if use ignore-glep31 1>/dev/null ; then + ewarn "You have chosen to disable the rules which ensure GLEP 31" + ewarn "compliance. When editing ebuilds, please make sure you get" + ewarn "the character set correct." + fi + fi +} From 458958fdd9ce06c790eecc5f091e16fef39313b2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:54 +0000 Subject: [PATCH 021/153] dev-build/cmake: Sync with Gentoo It's from Gentoo commit 8471ec49af94d79ebafca2fb9a0b69e0c4d16518. --- .../portage-stable/dev-build/cmake/Manifest | 4 +- .../dev-build/cmake/cmake-3.31.5.ebuild | 2 +- ....0.0_rc1.ebuild => cmake-3.31.6-r1.ebuild} | 9 +- .../dev-build/cmake/cmake-4.0.0_rc4.ebuild | 321 ++++++++++++++++++ .../dev-build/cmake/cmake-9999.ebuild | 37 +- ...-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch | 28 ++ 6 files changed, 377 insertions(+), 24 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-build/cmake/{cmake-4.0.0_rc1.ebuild => cmake-3.31.6-r1.ebuild} (97%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-4.0.0_rc4.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/cmake/Manifest index ac36fd1546..1702b053e7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/cmake/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/Manifest @@ -13,5 +13,7 @@ DIST cmake-3.31.5.tar.gz 11706495 BLAKE2B 16375229d7344b10db40c76fe2fc8a3f906266 DIST cmake-3.31.6-SHA-256.txt 1646 BLAKE2B f5d3bb67759b4b227bd38eb7de8405052fd55cef528d3a4d4754d77815cdb018831fadcb51e590186faa5e7911bd6d9ceba29d971a7d125435df06132276a00d SHA512 8e3d939ccab2260380fce92c31ba8244c7b4d19c7245d5bc9607e9352f2e7fa1e0e4ecc8555f8418f9659f53c142111dd34aba0739d947f387e5a88345dd6b46 DIST cmake-3.31.6-SHA-256.txt.asc 833 BLAKE2B a99307a7e8011a1df30a2f364ae68b2f5d286d0d98f8a9b5d27283aa109963d6989218a8b3787666d7aa3a7e37e4d6468077c16b6550727efd1295f8c0504caa SHA512 c7a728110790a85ba89dace68c9bd4c22c81ae4482a758297fdb49e7eb11ccf0056d0d4fcf100be71eed7cc2ae3f633722df801dba2d61dd0fafb476d5b09128 DIST cmake-3.31.6.tar.gz 11710589 BLAKE2B ea1bee1a98568407dfc164f82bf0e3ab082124bbbb12cfa18489bdbe9964418ee30fb62b4915bc06645bcd2cf1e17bfb9c210812da070acbba848db186d06044 SHA512 839d06b6ebd0bf78cbe8f7ae3a7c00026e70d759a81ac51aa103f35ad985ac69be9e667aae7b5fe48c5e0c41baec791259279679dbdf2ddd8b63a48382a8a2a0 -DIST cmake-4.0.0-rc1.tar.gz 11822440 BLAKE2B 644177b912908bf54861aae9b01c14512ab02a99a7699e95dd775d9661abff556400dbedd841258211baf86bef68271e019052470a13d06ce8392104eab245a8 SHA512 7b08a425907e5eef820ca4db8732825bbd7880ac8a4566c103b9ebfe8d3407aa048213e2c4bd685c5f728d5aa975f4a46fc4f76509b7484a0e9cd604e2b81973 +DIST cmake-4.0.0-rc4-SHA-256.txt 2099 BLAKE2B 9a902a5ceb3a4c8a1886fc2df05f5b229f76670781e77fc423be723f5455d0b323b5babd242f72bc737ea75e657bae1cbf67e54b50c2ecd385d0e8baa8812ece SHA512 0691a37482e90b27be913c925100c1485768221824e6e91f992671dacf18f6c318c7d2dc67551e391e6c7e0b1ee418ad9b88ed82309456b0bc3c86b53981173b +DIST cmake-4.0.0-rc4-SHA-256.txt.asc 833 BLAKE2B a9118933d4daebe4afd8e0a54afbcdb32f961248fa70c9f468bcf5743a6aa5e30f6083d78b1b51550e6e1388e99926e0f0ef07a1853cf62d7d7d169430e73b3a SHA512 a4db155a0e3df77332420e806e333d9435f927b82a4b03eabb263346cb632f62a44168e45f5a7a0aa2e12ab54fd2edb049544be8796997898734f1ed7454a6f8 +DIST cmake-4.0.0-rc4.tar.gz 11825037 BLAKE2B cca7e01a79bedea65622754c1e920f621b4ce1e4637a11e7d3b880d26fc074d52766593c4441a32898ec9c61a1ed9fd27ac47c95985ec22e8c355bbbc3025e68 SHA512 a2325e22f23bd62a048b6e9e9c2b6c069260b510169686ee69e45fe1596b53947bef449b32c14471ecc94840d8275e5fe3de89dd63b2aa9e7bdcbd7972e5a457 DIST cmake-4.0.0_rc1-docs.tar.xz 577536 BLAKE2B 74a742ffef8e1af1652746e1c177d4198155145a039635e6a0ea40af463f3a2d45b6c6ce7d3a9b1fee24f0c1cfd1c3aa95c27669ca3c6281d54e701fc0ece202 SHA512 74c20067d3b82493024b2f2711b55b93998ce3b5f35ab5a154f33a8268a35a29d01127c55ce6b85b80ff252d15284ed1065e1338422124f6722a4190a984637c diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.31.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.31.5.ebuild index c3e9336a86..6c1223bf9f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.31.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.31.5.ebuild @@ -47,7 +47,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )" fi diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-4.0.0_rc1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.31.6-r1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-4.0.0_rc1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.31.6-r1.ebuild index 1a457fe0e9..91497ec73b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-4.0.0_rc1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.31.6-r1.ebuild @@ -9,8 +9,7 @@ EAPI=8 : ${CMAKE_DOCS_PREBUILT:=1} CMAKE_DOCS_PREBUILT_DEV=sam -CMAKE_DOCS_VERSION=${PV} -#CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 +CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 # Default to generating docs (inc. man pages) if no prebuilt; overridden later # See bug #784815 CMAKE_DOCS_USEFLAG="+doc" @@ -92,7 +91,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch "${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch # Misc - "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch + "${FILESDIR}"/${PN}-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch "${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch "${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch # Cuda @@ -218,10 +217,6 @@ src_prepare() { # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 filter-lto - # 4.0.0_rc1 is missing this, fails to configure - # https://gitlab.kitware.com/cmake/cmake/-/issues/26712 - touch .clang-tidy Utilities/.clang-tidy || die - if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" cmake_src_bootstrap diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-4.0.0_rc4.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-4.0.0_rc4.ebuild new file mode 100644 index 0000000000..41639c300a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-4.0.0_rc4.ebuild @@ -0,0 +1,321 @@ +# Copyright 1999-2025 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=4.0.0_rc1 +#CMAKE_DOCS_VERSION=${PV} +#CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 +# 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 flag-o-matic multiprocessing \ + toolchain-funcs 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 + + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc + inherit verify-sig + + SRC_URI+=" verify-sig? ( + https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt + https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt.asc + https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt + https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt.asc + )" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )" +fi + +[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" + +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/libarchive-3.3.3:= + app-crypt/rhash:0= + >=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 + dap? ( dev-cpp/cppdap ) + gui? ( dev-qt/qtbase:6[gui,widgets] ) + ncurses? ( sys-libs/ncurses:= ) +" +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.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch + # Misc + "${FILESDIR}"/${PN}-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch + # Cuda + "${FILESDIR}/${PN}-3.30.3-cudahostld.patch" + + # 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" +} + +pkg_pretend() { + if [[ -z ${EPREFIX} ]] ; then + local file + local errant_files=() + + # See bug #599684 and bug #753581 (at least) + for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do + if [[ -e ${file} ]]; then + errant_files+=( "${file}" ) + fi + done + + # If errant files exist + if [[ ${#errant_files[@]} -gt 0 ]]; then + eerror "Errant files found!" + eerror "The presence of these files is known to confuse CMake's" + eerror "library path logic. Please (re)move these files:" + + for file in "${errant_files[@]}"; do + eerror " mv ${file} ${file}.bak" + done + + die "Stray files found in /etc/, see above message" + fi + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; 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 system integration, bug #933744 + sed -i -e 's/__APPLE__/__DISABLED__/' \ + Source/cmFindProgramCommand.cxx \ + Source/CPack/cmCPackGeneratorFactory.cxx || die + sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \ + Source/cmMachO.cxx || die + sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \ + Source/CMakeLists.txt || 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" + + ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must* + ## handle them as part of bootstrapping, sadly. + + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + # ODR warnings, bug #858335 + # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 + filter-lto + + # 4.0.0_rc1 is missing this, fails to configure + # https://gitlab.kitware.com/cmake/cmake/-/issues/26712 + touch .clang-tidy Utilities/.clang-tidy || die + + 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() { + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMake_ENABLE_DEBUGGER=$(usex dap) + -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) + -DBUILD_QtDialog=$(usex gui) + ) + + use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 ) + + cmake_src_configure +} + +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 + + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + + pushd "${BUILD_DIR}" > /dev/null || die + + # Excluded tests: + # BootstrapTest: we actually 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)" \ + ) + + local -x QT_QPA_PLATFORM=offscreen + + 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 + + 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() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild index 5a40196b5e..41639c300a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,9 @@ EAPI=8 : ${CMAKE_DOCS_PREBUILT:=1} CMAKE_DOCS_PREBUILT_DEV=sam -CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 +CMAKE_DOCS_VERSION=4.0.0_rc1 +#CMAKE_DOCS_VERSION=${PV} +#CMAKE_DOCS_VERSION=$(ver_cut 1-2).0 # Default to generating docs (inc. man pages) if no prebuilt; overridden later # See bug #784815 CMAKE_DOCS_USEFLAG="+doc" @@ -38,19 +40,21 @@ else SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" fi + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc + inherit verify-sig + + SRC_URI+=" verify-sig? ( + https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt + https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt.asc + https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt + https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt.asc + )" + if [[ ${PV} != *_rc* ]] ; then - VERIFY_SIG_OPENPGP_KEY_PATH=/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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - - BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )" fi + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )" fi [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" @@ -91,7 +95,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch "${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch # Misc - "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch + "${FILESDIR}"/${PN}-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch "${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch "${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch # Cuda @@ -217,6 +221,10 @@ src_prepare() { # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 filter-lto + # 4.0.0_rc1 is missing this, fails to configure + # https://gitlab.kitware.com/cmake/cmake/-/issues/26712 + touch .clang-tidy Utilities/.clang-tidy || die + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" cmake_src_bootstrap @@ -249,8 +257,7 @@ src_test() { "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die - # TODO: Still relevant after https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10070? - unset CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS pushd "${BUILD_DIR}" > /dev/null || die diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch new file mode 100644 index 0000000000..0f86117718 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch @@ -0,0 +1,28 @@ +diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake +index 6d60c9d86a..b6664dfe26 100644 +--- a/Modules/FindBLAS.cmake ++++ b/Modules/FindBLAS.cmake +@@ -7,6 +7,11 @@ FindBLAS + + Find Basic Linear Algebra Subprograms (BLAS) library + ++Version modified for Gentoo Linux. ++If a valid PkgConfig configuration is found, this overrides and cancels ++all further checks. The upstream behavior can be restored by defining ++GENTOO_REMOVE_CMAKE_BLAS_HACK ++ + This module finds an installed Fortran library that implements the + `BLAS linear-algebra interface`_. + +@@ -281,6 +286,11 @@ function(_add_blas_target) + endif() + endfunction() + ++# first, try PkgConfig ++if(NOT DEFINED GENTOO_REMOVE_CMAKE_BLAS_HACK) ++ set(BLA_PREFER_PKGCONFIG ON) ++endif() ++ + if(CMAKE_Fortran_COMPILER_LOADED) + include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) + else() From d3cbe07200fe12f60237f3f23201729405e04028 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:56 +0000 Subject: [PATCH 022/153] dev-build/meson: Sync with Gentoo It's from Gentoo commit 4e801bf584ef94cf49086caee2732bd5d28b199d. --- .../portage-stable/dev-build/meson/Manifest | 6 - .../dev-build/meson/meson-1.5.1.ebuild | 190 ----------------- .../dev-build/meson/meson-1.6.0-r1.ebuild | 191 ------------------ .../dev-build/meson/meson-1.6.1.ebuild | 2 +- .../dev-build/meson/meson-1.7.0.ebuild | 2 +- 5 files changed, 2 insertions(+), 389 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.5.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.6.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/meson/Manifest index e716262fc4..ab8839b0a6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/Manifest @@ -6,19 +6,13 @@ DIST meson-1.3.2.tar.gz 2223798 BLAKE2B 72b061598a0cb22517460de4df25394a9dfbddb5 DIST meson-1.3.2.tar.gz.asc 833 BLAKE2B b11ae2be4e9cb0278be9cafd304146432e606a5fd23379d08116943676286f240fb8cc1d5f897cbd4c2bacfe298802afb1a847e447d71250f58cee5dec38083b SHA512 0cb9575fb599cba4ae77c1954599a24b1f079c46cf255bb8d581ef434598503db6e08af6a95b7c00bc54c165ec8fd9834310e2d4874afe01c5d44e72cef496b3 DIST meson-1.4.2.tar.gz 2227701 BLAKE2B 11d98d8c84545390bd35b393ae02db7876a38dad56c363471b5be59521f08c0b70da5dc5b3f991e5c715d6b59f4752738515bd8dc2412a6dc5ca1fa42e7cd63b SHA512 4aed1a5f133de2c6839bab361a0e911dd5697f5dac2a8f100df69d43a8880a810dcfa1aa6402cdfb9c5e14fdceec76925f0496c301c31ba733a32618c403eaf0 DIST meson-1.4.2.tar.gz.asc 833 BLAKE2B 64ce1fc0fecdd6aa76bb89d88ff7497548d82afc00805c083a0bca7ce4cee41dc50be50368e333649ae7e863c03ea780fe24a48c525281fbbcab679b540f4254 SHA512 51d3245f9443cb398e2e8f225f00a853848bde1bfba02bae6334d47115e36ad96c8ec03244f6169c89d73162b86a73158a7f8d08d5bd6b3d28e8369ce7b55093 -DIST meson-1.5.1.tar.gz 2257106 BLAKE2B 3368b209444d0873217bafee2339b395dca9fa43df68adce19029a41ad5c0eca59426ef681d174ef8b6b89d4a6c5b4f189c1ae219deed78334028d44bdb23a95 SHA512 3239d6f3d64dcedddd456dc451278a37aa6c4460708b0efdff1b04b6e8844c20f5f882060de311c59a678bebd51ee09e1906c9384d4b0c85b28015fd1713ab0a -DIST meson-1.5.1.tar.gz.asc 833 BLAKE2B c099720b102b8fff581f2043000454f5cb3593352a8b69c681cda73dae7172fb7d892dc0500e29fffe4ba7828cdcba418acea230563dc26a7a89139ab526b231 SHA512 f8210dd309a104b4169bc2eae9ff370f3ced6fe2c5dfc8f3477c9fbbed983dd6636ea05822d9345d7570e88bfe7789c6cc075e5a91d578a8376666d16ad550a3 DIST meson-1.5.2.tar.gz 2265788 BLAKE2B bda0742cf053cb235833b347e66b8706983815fda5d62815aa6455980837e061fb0db2f7472966e6e09a199b0850477a3b448b6ad3b7db717da6b43906cbe2ac SHA512 9f601bdadaf2dae312ff02caa9dcd3fe13659a101e601417bdb908d8b91cdd4a12302433b00c188c1562287a06ada656044d79821d0beb0e0e41c63ab5d48112 DIST meson-1.5.2.tar.gz.asc 833 BLAKE2B 0ea6af017430568b2834081a60d0153cc80cb55d835b1f570e27ae6220a163aff9f4607654fe87841df112c78763b4d45dabd45072e398cdf901762095ce52e7 SHA512 7b7c0ee2b872c83d98954079fc27665b3a9ec5464aa8decc5919ff4e1c4134d7006494bd64b901dc2ade408131ea512eefef9416f3c57d1460c9308cb6683fc8 -DIST meson-1.6.0.tar.gz 2277602 BLAKE2B c1d8f143b17fab90c6128a721ac45b9ed6b85d67272149058e74ab827822b6f2c84ebdc261290585e6af38ab5dca52ca013de9b7be70922c96260fc5ee708893 SHA512 8805f07d0cfe2050305eff009b20973bfe3aab808a263479ed98a31fa026c1a378285928c2dd058e4224abc1b347aeee5c1628c964375135e9b4647819a119bc -DIST meson-1.6.0.tar.gz.asc 833 BLAKE2B 4cb8483a0b40330f71c86b9ede2dbccf2eb430138508983232924d70512100a36094974048783d814b9d83c11719f4be5a6541dc0eeaee3044048c38f28106c4 SHA512 4f1f47a5aafc8de8180a47303f2ea2d7dff1b792ee3e1dbf64bd96ea64b2a1696b664fb3ea4169b73c7a950f4371481c083f18ab11fdaf3bccf2b8671e40cd7d DIST meson-1.6.1.tar.gz 2276144 BLAKE2B 7ccdb3bf3f701fc787fabf91413db8301a8658b89e08c1d712711bd35845dc2468211e4b666cf46ad68ad9462e62b12b62d60c3767a2804f9b695b4390bb8235 SHA512 b4ca7a3b667db0ad370110abd8b20467b1c74ae7777a068db33f8974602c123881a7130b2340664abb52e36fe5195989a5cc8fa7de6212c37abf5b0900554425 DIST meson-1.6.1.tar.gz.asc 833 BLAKE2B 6666eca8e5506b8692fc29ba66dc3ee9d725a7d720a7b43db720098f7e00671e71993586606c187d8314e3919474f5733d64a8d052be6552cbcf013a872905ab SHA512 543cf396de0a58998c3587aa05580fa9a56734db40b74fc5fbb22cd56124531804a5360d6b9acb9baa71753ac04c343364da4d78a0d366d8e8bc760030ebf8d3 DIST meson-1.7.0.tar.gz 2293975 BLAKE2B 64465b33c2358fddc3594807ee5d251dc6bcc1030ed3559d2d5dc33b7092a512b8a3d3b75cc7152812dbc62631d3b9fba596cd105654ae3ff38f01be8ada5232 SHA512 a5d1f00b193ca37ae64f85c9dfc29a2661c167d82d9953b9acd1393b222b05fa5fc03ffdf00fd1ae7a2014da3a7366c35f70bf02e3204e929b74f7b00c17c840 DIST meson-1.7.0.tar.gz.asc 833 BLAKE2B 34783968262e5ce54cca7f4878b09e7611670ede620b8588ac915bb55fed7f4051e151d789b10e9bd650241149dc9930c14b356c3ce436682d496eeabc805672 SHA512 85ec14f080d0d1492922c971909dc734ab1cd4914a567afbfeff5dc00d19a9a72e6e0668280fc045f270c49389ea03059b9eeb831788b2154fb39116b38f6e5e DIST meson-reference-1.4.2.3 339324 BLAKE2B 1a4fbd8c27a8cfba773777eabd2ebaa0f76ec0c61dcfe1c7b4483737b348ff9528d68f26e68d7d40b2e1875611eed5b9a31c1cf55fed8eabb42fc1e31d9ef14b SHA512 8b8ec43e812599203ec44c08805eb6818485805c45b9c69802261eaa35efc97846a96f6472c6b1ef5f6c703e7153fd957df7b805f173ca3400a2030dfbe002ca -DIST meson-reference-1.5.1.3 341110 BLAKE2B 5267c2eea1b1281f87e63eb08aa928257dd98088b4d5c27c2785d2d8066c2c28536f7f56bf804ffe37d2f51552c91f31ff7e2729f3b2485d594a9e44a0df9ab1 SHA512 2d36e87e9bc2de0b958f4b20544b0bd9f2b0ffb646768e68fefcd5dfb8f09c24db40f27208b5f2d1f6ba02e7465f68a538ea72be118670c76e0959e090a42cf3 DIST meson-reference-1.5.2.3 341110 BLAKE2B 0d588b796f7f2da2dcb0e7822acde6a9a461930da4bfead3cf9148fa0fac18cd0ccbc6e891f555c973836f1c16b4eae299908a838a0b6843293de8815d30fc23 SHA512 64715ce2113e362e7d67179fe13566bc8f84ce7f4e6d795b836f42455a871173fee06e3e969e2996022d7e6c9b4b5379587a4c0c3d97b4bca527fb8902d3547f -DIST meson-reference-1.6.0.3 343730 BLAKE2B 18704b557298da2ea1f3edb4ed6c421bff3f973a215e56b340de2e78b1330e13eb00830cf44c3a8d04fd685ec6f8e6d078a4b9f03cf5b9e5413cbbfce55a22dd SHA512 2752b51dfa404ebae107f6579acca4268140aba8b1a672762fa4fa66819dc4449560313c5eb6c17433cc2cf273ce57d3d04b846bddf74902825b530de777f4ea DIST meson-reference-1.6.1.3 343730 BLAKE2B 55df822192781a70e4bc44cfe14fb363e3f820406260ca9705d7fdb5fad1bf0117e3f1325d37e58e23477bc075ab6bd84056409355ec694f72eeaa5bf982ecc7 SHA512 553cdcd86a7a600cda05ac970cc285c4c50017d1e7d2925645d7f19a62b34c2f079673cafecf4111aa102afbe9d8e4d56f166d1d9940b740eeec0bb99d6cbc0d DIST meson-reference-1.7.0.3 344764 BLAKE2B 615c70325b6ca3b964bf2827f20f07845150943b6cd95a0599b0392299e2a9338921b52bbe3613fc03fa931c28fb2121801bdb74880f2bd4fecb051b7f1fcb4b SHA512 9d9a3862602251ca780acdf18cee4ab9cd14404481e216b557eafc88b23561ecf481836898b78cbc4ee3539869b5578c649a5c71f32b3074d8125b867ea4751d diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.5.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.5.1.ebuild deleted file mode 100644 index b0568476b6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.5.1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 2016-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} pypy3 ) -DISTUTILS_USE_PEP517=setuptools - -inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/mesonbuild/meson" - inherit ninja-utils git-r3 - - BDEPEND=" - ${NINJA_DEPEND} - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - " - -else - inherit verify-sig - - MY_PV=${PV/_/} - MY_P=${P/_/} - S=${WORKDIR}/${MY_P} - - SRC_URI=" - https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz - verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc ) - https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3 - " - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )" - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - fi -fi - -DESCRIPTION="Open source build system" -HOMEPAGE="https://mesonbuild.com/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - app-alternatives/ninja - dev-vcs/git - sys-libs/zlib[static-libs(+)] - virtual/pkgconfig - ) -" -RDEPEND=" - !/dev/null) - - ${EPYTHON} -u run_tests.py - ) || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - insinto /usr/share/vim/vimfiles - doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} - - insinto /usr/share/zsh/site-functions - doins data/shell-completions/zsh/_meson - - dobashcomp data/shell-completions/bash/meson - - if [[ ${PV} = *9999* ]]; then - DESTDIR="${ED}" eninja -C docs/builddir install - else - newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3 - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.6.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.6.0-r1.ebuild deleted file mode 100644 index 22ac4ec462..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.6.0-r1.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 2016-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} pypy3 ) -DISTUTILS_USE_PEP517=setuptools - -inherit bash-completion-r1 edo distutils-r1 flag-o-matic toolchain-funcs - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/mesonbuild/meson" - inherit ninja-utils git-r3 - - BDEPEND=" - ${NINJA_DEPEND} - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - " - -else - inherit verify-sig - - MY_PV=${PV/_/} - MY_P=${P/_/} - S=${WORKDIR}/${MY_P} - - SRC_URI=" - https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz - verify-sig? ( https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc ) - https://github.com/mesonbuild/meson/releases/download/${MY_PV}/meson-reference.3 -> meson-reference-${MY_PV}.3 - " - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )" - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - fi -fi - -DESCRIPTION="Open source build system" -HOMEPAGE="https://mesonbuild.com/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - dev-libs/glib:2 - dev-libs/gobject-introspection - app-alternatives/ninja - dev-vcs/git - sys-libs/zlib[static-libs(+)] - virtual/pkgconfig - ) -" -RDEPEND=" - !/dev/null) - - ${EPYTHON} -u run_tests.py - ) || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - insinto /usr/share/vim/vimfiles - doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} - - insinto /usr/share/zsh/site-functions - doins data/shell-completions/zsh/_meson - - dobashcomp data/shell-completions/bash/meson - - if [[ ${PV} = *9999* ]]; then - DESTDIR="${ED}" eninja -C docs/builddir install - else - newman "${DISTDIR}"/meson-reference-${MY_PV}.3 meson-reference.3 - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.6.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.6.1.ebuild index db12e34d1b..5d15af9e3c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.6.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.6.1.ebuild @@ -33,7 +33,7 @@ else VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.7.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.7.0.ebuild index bec1d446b8..460fa6edad 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.7.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.7.0.ebuild @@ -33,7 +33,7 @@ else VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi From b6c844b5d2ae630f4ce19952f1ee8f85ddd8bfa2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:05:58 +0000 Subject: [PATCH 023/153] dev-cpp/azure-core: Sync with Gentoo It's from Gentoo commit 08ee86ff9da0064cadb2db04006290e2dacd2bb9. --- .../third_party/portage-stable/dev-cpp/azure-core/Manifest | 2 +- .../{azure-core-1.14.1.ebuild => azure-core-1.15.0.ebuild} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/{azure-core-1.14.1.ebuild => azure-core-1.15.0.ebuild} (90%) diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/Manifest b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/Manifest index b19c03567a..55f2f85823 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/Manifest @@ -1,2 +1,2 @@ -DIST azure-sdk-for-cpp-0180c8ee5cc9f54d4edf8d39415f3733e4296e0f.tar.gz 3147847 BLAKE2B 3a67df60a0098243fdcf577d3bbb7d66b3e090ea10a0dc14b57780802d700aa5f15025158bb32dca558868691e64f4db8d072c92e87abbb9feccf1acd7c7dc32 SHA512 ae9dcbc2c1c4b97045379fe9194ce9ee6f252b980faa62b293ca86c540cc8d21a986aa81f767f80516766f8b10c345aec1d16629cb71e5265c36e05e88f5269d DIST azure-sdk-for-cpp-1289063cc2a7ba01fa7a8c7cd92155ef401c4cba.tar.gz 3130906 BLAKE2B 8fab2710f9c8bc5eb69b5f6bc389cf00cfaba1c6902ffa9a9e67e96bd91e508a9b1c643e57fbe74c68fa840bc707e00672ca0e3979baaabefb021849bb5815bb SHA512 19d122bd153ababd90d238a94b8227e56c17a677dc478fd680c099856fc874367a4c8aa83ccf372139400772951dad69899471970ac18088f901d67047b7755f +DIST azure-sdk-for-cpp-b6e7a28c6200d50080c38a598cf92d96d45cf976.tar.gz 3166921 BLAKE2B 226fcc802050848f915fb125e6921d0957c9eabeb72039b21efe21fe7146d04eba35fee7d82ed1aef32ee103b85cdf0c5e0f5c1d890f60156e3457d97507d220 SHA512 3bc4eafce529157d34d2bdd80fbd302513b082c3a59a5f1b0ffc453a8867401382538ced9887e52b2b998f112ecad960b6146bf7f7cee37110d51ca5801eed82 diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.14.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.15.0.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.14.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.15.0.ebuild index 72868481be..9c59c0b02b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.14.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/azure-core/azure-core-1.15.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit cmake -COMMIT="0180c8ee5cc9f54d4edf8d39415f3733e4296e0f" +COMMIT="b6e7a28c6200d50080c38a598cf92d96d45cf976" MY_P="azure-sdk-for-cpp-${COMMIT}" DESCRIPTION="Azure SDK for C++" HOMEPAGE="https://azure.github.io/azure-sdk-for-cpp/" From 413d60d6b3c5d147079d9f99ed8b08b8aa2f8cb8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:03 +0000 Subject: [PATCH 024/153] dev-debug/strace: Sync with Gentoo It's from Gentoo commit 12382889d5438c291c31d9262e50c71362035ffb. --- .../portage-stable/dev-debug/strace/Manifest | 4 - .../dev-debug/strace/strace-6.11.ebuild | 117 ------------------ .../dev-debug/strace/strace-6.12.ebuild | 2 +- .../dev-debug/strace/strace-6.8.ebuild | 117 ------------------ 4 files changed, 1 insertion(+), 239 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.11.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.8.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/strace/Manifest b/sdk_container/src/third_party/portage-stable/dev-debug/strace/Manifest index 9d5a227147..13c89b56a3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-debug/strace/Manifest @@ -1,10 +1,6 @@ -DIST strace-6.11.tar.xz 2610440 BLAKE2B 5ea511cd0d2f287ec4c979af7306b29ca39975a4a08f6a1123ae562db5331f7ebb1f23ff2a24ce01fd96c000d094c4d810f2b4bca3ce8adac26fbee57da7f92c SHA512 c639ae7097d418f8b815bd008de9423079dad70829a5eb392d3c5def81243b8a9133c10251a7c00a4991f580cff5b62466f8b53b4b8e425a009548fb3582bdb0 -DIST strace-6.11.tar.xz.asc 801 BLAKE2B bc60367dafb08551510bf64c384315aadc3027ed256fbfa5a6e23139800ad01f12b7ebdc09e7845b202260ec38b4a5de70e5701abd9dddc0c5f3c4c32bd6c97b SHA512 bdb86f8fa9b168240b892814037660456ee7beed547e6f5bbcb61431e6fd8d6544b8b169cc794e084c3c11f2f62aff36de410294c609c0a9ea8781fa1ddf57aa DIST strace-6.12.tar.xz 2628804 BLAKE2B 8077a9ae0b05065cf2de7a2bd630a6275735bd77765a5654cb34f17c93b3fda69d77743c5eb8e75efcc1f6ec8707698642d30bd62cc3aa4355bec0d5a00eec89 SHA512 ae28f0b6b6fdc980898f11d1903aacb5a31760a07d63bd7cbc8f9b5f337d9db6b40464d6b61a9b03ba6442b476edb78afc91348f539f7780cdd98b174c6a9a1d DIST strace-6.12.tar.xz.asc 801 BLAKE2B 0c3d81747128039c2304c2c6509f14d868c49b1d7036128ab58a2df7690ea40ab643a54f274c0fecbae4bbc4e90ee5d05037630525db828aa4995199ab415cba SHA512 7b8d6148f3160e39033016d17a54f0b0e0a67fb20ab688486db401521d45ba5197d4a8106f6b173f08a787e59d88147a71ee88435afe0a545fc8f75f621bee79 DIST strace-6.13.tar.xz 2642452 BLAKE2B cdac801dc5b0fe9c165d9d99a41e51aacf13e8bd05baccca26fff360f2a7052a3f1b7016dee85a37d074c4e0f3b9255a29a146e13b6099a2ef8f9d493e3b1079 SHA512 e702238f32882f92a2b2834fb853b5fa3d81decb441b69f0e74ba0205f6a586bfe698e34bfbac6d4f766ebd25d0b99d4679d9eb27845e5129cfd4e34ced6a8d2 DIST strace-6.13.tar.xz.asc 801 BLAKE2B 508286a008213e2bd3e0cba6c339a61abae1460f0f71b885c7bef480431bdf5e190a2cb3e44d236019ed54d3bf3a257ebb94e2161971abe0648f685e7849e3bd SHA512 a59e4aeff491ad62603b0591653e7da5e8a4ef0fedcf2faad3f485993b37b738c0809cefa5753ab7d1b85f3b6c87b423b6416dea36def65e220548ee0b4afb46 -DIST strace-6.8.tar.xz 2457948 BLAKE2B 0897aedc6a1ed162b8967a56d54dd0bc589ce027321c1219e5fc23e6a44103576e0f363f79a03def365a05989173271eb6096a9c48b16cdf8c54033ec6bd6f2a SHA512 c477724a77112a74a5236a38b7dbaa9b6199622a1d21cc6253cac80dc4ddea78aeaf8cddf4a51ee4119e00e1adaf95f64f64e20d9775ec3edd77cd82c8f7b30e -DIST strace-6.8.tar.xz.asc 801 BLAKE2B 544f9a59824f5bd2e682b4df0106c85c90be8eba8fe99fa5a5b6ccc69bd9ced176f4ce3a02253e16a51290dae452426da3827e653d4c38f44eaf06427007e5a5 SHA512 4bcbf6b01440cd94ae2e05cc13220a141a0cc7c3a974d92947e09217fa4c77d7f7c272aaf32107c8974e140da25fd78e45f9f48731406b4dfd4d5a955e663daa DIST strace-6.9.tar.xz 2466252 BLAKE2B 2da51f253ea18f27b5fabafaebdc54805aeca5b750bec6169c269dbcadb98cf76a47bf92dd619458ca86d46ec7a03710e16e0ac4973d89a86edc2d0b853714c8 SHA512 aa80b9b6ec41082f1710f2327f7a22003cdce6d95ab0e5083ada9c5b7b40b8f7cbc7dc6c017878dc0e42c52e405e98ed1488c51d17bc3538989ff4be2c2411e1 DIST strace-6.9.tar.xz.asc 801 BLAKE2B ccb3d026a272bc02d351fd15f8b18a50a8653cda247ea9baa938820fb3c870e1803562d7e17eac3d4f1842911a4e904bc88ba267cb74aeac869185e30cd89d48 SHA512 577a3f5d0bdd51b995755a76b58e6bdf6a0a173966bb1d95ebba0a59df8a8e828eb5eca4cda55c9faf7e31053652911541134107199c073ec24fa877cec393bd diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.11.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.11.ebuild deleted file mode 100644 index 3b7b641211..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.11.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools edo flag-o-matic toolchain-funcs verify-sig - -DESCRIPTION="Useful diagnostic, instructional, and debugging tool" -HOMEPAGE="https://strace.io/" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 -else - SRC_URI=" - https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz.asc ) - " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc - -LICENSE="LGPL-2.1+ test? ( GPL-2+ )" -SLOT="0" -IUSE="aio perl selinux static test unwind elfutils" -RESTRICT="!test? ( test )" -REQUIRED_USE="?? ( unwind elfutils )" - -BDEPEND=" - virtual/pkgconfig - verify-sig? ( >=sec-keys/openpgp-keys-strace-20151021 ) -" -LIB_DEPEND=" - unwind? ( sys-libs/libunwind[static-libs(+)] ) - elfutils? ( dev-libs/elfutils[static-libs(+)] ) - selinux? ( sys-libs/libselinux[static-libs(+)] ) -" -# strace only uses the header from libaio to decode structs -DEPEND=" - static? ( ${LIB_DEPEND} ) - aio? ( >=dev-libs/libaio-0.3.106 ) - sys-kernel/linux-headers -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - perl? ( dev-lang/perl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-6.5-static.patch" -) - -src_prepare() { - default - - if [[ ! -e configure ]] ; then - # git generation - sed /autoreconf/d -i bootstrap || die - edo ./bootstrap - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - eautoreconf - - # Stub out the -k test since it's known to be flaky. bug #545812 - sed -i '1iexit 77' tests*/strace-k.test || die -} - -src_configure() { - # Set up the default build settings, and then use the names strace expects. - tc-export_build_env BUILD_{CC,CPP} - local v bv - for v in CC CPP {C,CPP,LD}FLAGS ; do - bv="BUILD_${v}" - export "${v}_FOR_BUILD=${!bv}" - done - - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - local myeconfargs=( - --disable-gcc-Werror - - # Don't require mpers support on non-multilib systems. #649560 - --enable-mpers=check - - $(use_enable static) - $(use_with unwind libunwind) - $(use_with elfutils libdw) - $(use_with selinux libselinux) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if has usersandbox ${FEATURES} ; then - # bug #643044 - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." - return 0 - fi - - default -} - -src_install() { - default - - if use perl ; then - exeinto /usr/bin - doexe src/strace-graph - fi - - dodoc CREDITS -} diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.12.ebuild index 75849b6af2..b1c0ddf9a6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.12.ebuild @@ -16,7 +16,7 @@ else https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz.asc ) " - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.8.ebuild deleted file mode 100644 index 7c8d69f65c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.8.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools edo flag-o-matic toolchain-funcs verify-sig - -DESCRIPTION="Useful diagnostic, instructional, and debugging tool" -HOMEPAGE="https://strace.io/" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 -else - SRC_URI=" - https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz.asc ) - " - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc - -LICENSE="LGPL-2.1+ test? ( GPL-2+ )" -SLOT="0" -IUSE="aio perl selinux static test unwind elfutils" -RESTRICT="!test? ( test )" -REQUIRED_USE="?? ( unwind elfutils )" - -BDEPEND=" - virtual/pkgconfig - verify-sig? ( >=sec-keys/openpgp-keys-strace-20151021 ) -" -LIB_DEPEND=" - unwind? ( sys-libs/libunwind[static-libs(+)] ) - elfutils? ( dev-libs/elfutils[static-libs(+)] ) - selinux? ( sys-libs/libselinux[static-libs(+)] ) -" -# strace only uses the header from libaio to decode structs -DEPEND=" - static? ( ${LIB_DEPEND} ) - aio? ( >=dev-libs/libaio-0.3.106 ) - sys-kernel/linux-headers -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - perl? ( dev-lang/perl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-6.5-static.patch" -) - -src_prepare() { - default - - if [[ ! -e configure ]] ; then - # git generation - sed /autoreconf/d -i bootstrap || die - edo ./bootstrap - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - eautoreconf - - # Stub out the -k test since it's known to be flaky. bug #545812 - sed -i '1iexit 77' tests*/strace-k.test || die -} - -src_configure() { - # Set up the default build settings, and then use the names strace expects. - tc-export_build_env BUILD_{CC,CPP} - local v bv - for v in CC CPP {C,CPP,LD}FLAGS ; do - bv="BUILD_${v}" - export "${v}_FOR_BUILD=${!bv}" - done - - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - local myeconfargs=( - --disable-gcc-Werror - - # Don't require mpers support on non-multilib systems. #649560 - --enable-mpers=check - - $(use_enable static) - $(use_with unwind libunwind) - $(use_with elfutils libdw) - $(use_with selinux libselinux) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if has usersandbox ${FEATURES} ; then - # bug #643044 - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." - return 0 - fi - - default -} - -src_install() { - default - - if use perl ; then - exeinto /usr/bin - doexe src/strace-graph - fi - - dodoc CREDITS -} From c0fd4348879c4619e4b3b7f7cc425a4a89b74ff1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:03 +0000 Subject: [PATCH 025/153] dev-go/go-md2man: Sync with Gentoo It's from Gentoo commit 009645edaa775be3d5430ab8cd8ade9045c3b8c2. --- .../portage-stable/dev-go/go-md2man/Manifest | 3 +- .../dev-go/go-md2man/go-md2man-2.0.2.ebuild | 32 ------------------- .../dev-go/go-md2man/go-md2man-2.0.6.ebuild | 30 +++++++++++++++++ 3 files changed, 32 insertions(+), 33 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-go/go-md2man/go-md2man-2.0.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-go/go-md2man/go-md2man-2.0.6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-go/go-md2man/Manifest b/sdk_container/src/third_party/portage-stable/dev-go/go-md2man/Manifest index 6a3a3a63a4..5f9909e3d0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-go/go-md2man/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-go/go-md2man/Manifest @@ -1,2 +1,3 @@ -DIST go-md2man-2.0.2.tar.gz 64353 BLAKE2B cc9ce9d14b61e600cf5179b72e08bc7e6ae5fcf31d3e00d6e5f7e5e77a26dd2b2b8a938e168e0053b2a9f9aab734d9beb02f7d95549fbf073125ad42b03cf478 SHA512 c81edfdc0b6647ef699cc908a1a7038d98da34df6d48b223b83a0699de91a7e322e70d67645acf1fc848918f4c1ea310160c7ccb75e6f97b53af7103c7aa18b3 DIST go-md2man-2.0.3.tar.gz 64961 BLAKE2B 790fe7c247e0f934a397d7389be589c6e4d75be3cd533da13ae4e46c927604c3249e3a2f0c975320bac0f21f3040059202434f6fd4b2ea6dd50d6b772fa01842 SHA512 237e8039beea11b4efb7d0c75fb5826c17dea50057b0149b9533e72e2a5198811f9a3a5b264ea3788922d2f03b07cb57914448b2d4325d54d0f946fb42c42f40 +DIST go-md2man-2.0.6-deps.tar.xz 76368 BLAKE2B 010d274d5e5c20e14848e92b210b03447d11c6fe8fd728b0f148a6f2cbc9f0a7cca22217f1920e00b0f7c363bbe2c5f572fb95ce02e67e3e55175c56cbd372d9 SHA512 7abc4eb75b4a168f2269936049eaca68ecb9ed39b29e6885cddf3683daf9b439b1573848192dff98ce67b99da0d1f09ddc27261e97c8cdfeb71e09e0030876b6 +DIST go-md2man-2.0.6.tar.gz 11064 BLAKE2B fec5c061c5d1b85e3ad86563a301afd01d47f2d83ef5b97bf964f77ebbbbb19c58108ecd8caa9df1663396a13c8b178578a9b02c3c30341cea0bb9abe1d196ea SHA512 c6273040edf7e4c97851c0bfb5366ed0298e92ff1f7f4740104979f1cac17d6303b998ff75396a4264b164872886854e7dadfee3f139d76f684c1b6ca5512828 diff --git a/sdk_container/src/third_party/portage-stable/dev-go/go-md2man/go-md2man-2.0.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-go/go-md2man/go-md2man-2.0.2.ebuild deleted file mode 100644 index 8d9a92730d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-go/go-md2man/go-md2man-2.0.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module - -DESCRIPTION="A utility to convert markdown to man pages" - SRC_URI="https://github.com/cpuguy83/go-md2man/archive/v${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://github.com/cpuguy83/go-md2man" - -LICENSE="BSD-2 MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86" - -# restrict tests because they need network-sandbox disabled -# bug https://bugs.gentoo.org/715028 -RESTRICT+=" test" - -src_compile() { - emake BUILD_FLAGS="-mod=vendor" build -} - -src_install() { - "${S}"/bin/go-md2man -in go-md2man.1.md -out go-md2man.1 || - die "Unable to create man page" - dobin bin/go-md2man - doman go-md2man.1 -} - -src_test() { - emake test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-go/go-md2man/go-md2man-2.0.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-go/go-md2man/go-md2man-2.0.6.ebuild new file mode 100644 index 0000000000..bcac703061 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-go/go-md2man/go-md2man-2.0.6.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo go-module + +DESCRIPTION="A utility to convert markdown to man pages" +HOMEPAGE="https://github.com/cpuguy83/go-md2man" +SRC_URI="https://github.com/cpuguy83/go-md2man/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/dev-go/${PN}/${P}-deps.tar.xz" + +LICENSE="BSD-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + +src_compile() { + emake build +} + +src_test() { + emake test +} + +src_install() { + dobin bin/go-md2man + + edo "${S}"/bin/go-md2man -in go-md2man.1.md -out go-md2man.1 + doman go-md2man.1 +} From 1acf395b9953a774af49b2349c63973f634852b5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:05 +0000 Subject: [PATCH 026/153] dev-lang/go: Sync with Gentoo It's from Gentoo commit 5116b3e1ff1a6986cfe5ead3569c9644a7b14df9. --- .../third_party/portage-stable/dev-lang/go/Manifest | 4 ++-- .../dev-lang/go/files/go-1.24-skip-gdb-tests.patch | 12 ++++++++++++ .../portage-stable/dev-lang/go/go-1.23.6.ebuild | 2 +- .../go/{go-1.23.5-r1.ebuild => go-1.23.7.ebuild} | 2 +- .../go/{go-1.24.0.ebuild => go-1.24.1.ebuild} | 3 ++- 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.24-skip-gdb-tests.patch rename sdk_container/src/third_party/portage-stable/dev-lang/go/{go-1.23.5-r1.ebuild => go-1.23.7.ebuild} (97%) rename sdk_container/src/third_party/portage-stable/dev-lang/go/{go-1.24.0.ebuild => go-1.24.1.ebuild} (95%) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest index 2691a0ab08..e36fd25295 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/Manifest @@ -1,3 +1,3 @@ -DIST go1.23.5.src.tar.gz 28179014 BLAKE2B 6fe6101054a0c10ce415aea65367a48ef8397c88d66bad01b7c72107a6c60daf0b9a47f7c1cd6c8da9855ab04309f25941cc867e6a9f90ac51d1ab0c54662313 SHA512 b04317afeab2d0ced7c36b8682dd32ac085d95d874cf3f614daa34859d7f7f2b75138132e7a64e237c6b4d711d5b03a4d20533f92a44840915630f4ea7cfafa2 DIST go1.23.6.src.tar.gz 28179132 BLAKE2B 25c988547604c35de65aedfdee5af9f35f7a1c43f634c0147373d9c86baf2bb10068463f70013ef60acd3088149eb16502958b1ca63d7cee310e32eaddf1578a SHA512 c504476d42cdbcd1b6afe53c0974e82c19eb0efac974bc06d41c1641440676891cfe6416455a0cfc81fe82902a9b82ea0a1d95089c676667d05487e45f5e04e3 -DIST go1.24.0.src.tar.gz 30663922 BLAKE2B 1a74d268ad2bcfd4773eb9d24f0618491680a5347edba60606b3f50144e2d8879509b2640046e5fa535ff126958deb49c4224443210e3bd79523e65208b616e3 SHA512 36ba9a3a541208fd33aa49b969d892578e209570541d2b6ca6ff784250d8b6777597d347b823c6026acf0c2741b4abc9012693004e623a1434b06cfecdbebaa8 +DIST go1.23.7.src.tar.gz 28181215 BLAKE2B d3c9bff18438f90f6730e1ad9580a3f97d266f90533552cd73b63b512c694de76466435f274dc2b190c672cdbd83ffaf735e4e74c12e426cac920b81dbfd88af SHA512 79192b760ab6fcc9512fd879a9484a3566fdeec5eace36c54b728cd9cb033e7ac68065a42fc657b351a106d684b79fdbefbf682cf63209c0191e7e7c8c0a0147 +DIST go1.24.1.src.tar.gz 30777528 BLAKE2B 76217ec25a721183591a434b012bd9cfb6d6206410aafffce4490bff8053440f2aa590bac0cfb839f10c19a3368fe60515a61123a21d187f5289ba0ae1399c1c SHA512 a924d6bdc7e7101917e6d063bc7b471390525394e79224c152997564657c4362b5600e0c8bf6ee857d345129ccf7368bdf4ed2251ab740446ea2abda144e6353 diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.24-skip-gdb-tests.patch b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.24-skip-gdb-tests.patch new file mode 100644 index 0000000000..498483571d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/files/go-1.24-skip-gdb-tests.patch @@ -0,0 +1,12 @@ +diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go +index 9c54d68949..d4eada51af 100644 +--- a/src/runtime/runtime-gdb_test.go ++++ b/src/runtime/runtime-gdb_test.go +@@ -55,6 +55,7 @@ func checkGdbEnvironment(t *testing.T) { + case "plan9": + t.Skip("there is no gdb on Plan 9") + } ++ t.Skip("gdb tests do not work under gentoo portage") + } + + func checkGdbVersion(t *testing.T) { diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.6.ebuild index f0e04aca4a..8e165768f1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.6.ebuild @@ -23,7 +23,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.7.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.5-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.7.ebuild index 8e165768f1..626e7c65d7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.23.7.ebuild @@ -23,7 +23,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm ~arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.1.ebuild similarity index 95% rename from sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.1.ebuild index 733c242415..423eda182b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go/go-1.24.1.ebuild @@ -20,7 +20,7 @@ case ${PV} in *) SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " S="${WORKDIR}"/go - KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac @@ -71,6 +71,7 @@ go_cross_compile() { } PATCHES=( + "${FILESDIR}"/go-1.24-skip-gdb-tests.patch "${FILESDIR}"/go-never-download-newer-toolchains.patch ) From 212f2301e29bb4a09bc5c23e07aa80ef242c96c3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:05 +0000 Subject: [PATCH 027/153] dev-lang/go-bootstrap: Sync with Gentoo It's from Gentoo commit 5f7391127f2cb5dc73307c0b482984d25b02c12c. --- .../dev-lang/go-bootstrap/go-bootstrap-1.22.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/go-bootstrap-1.22.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/go-bootstrap-1.22.12.ebuild index e590f0e854..828daf7be4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/go-bootstrap-1.22.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/go-bootstrap-1.22.12.ebuild @@ -35,7 +35,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" IUSE="abi_mips_n64 abi_mips_o32 big-endian" RESTRICT="strip" QA_PREBUILT="*" From d8e8605ba728914da74f482c175872abfec60664 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:06 +0000 Subject: [PATCH 028/153] dev-lang/perl: Sync with Gentoo It's from Gentoo commit 87045826d5ef438a49a83f54355ad1212b460bcc. --- .../dev-lang/perl/perl-5.40.0.ebuild | 869 ------------------ 1 file changed, 869 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.40.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.40.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.40.0.ebuild deleted file mode 100644 index d96ec3ecfe..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.40.0.ebuild +++ /dev/null @@ -1,869 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing - -PATCH_VER=2 -CROSS_VER=1.6 -PATCH_BASE="perl-5.40.0-patches-${PATCH_VER}" -PATCH_DEV=dilfridge - -DIST_AUTHOR=HAARG - -# 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.40.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" - -HOMEPAGE="https://www.perl.org/" - -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://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 -" - -S="${WORKDIR}/${MY_P}" - -LICENSE="|| ( Artistic GPL-1+ )" - -SLOT="0/${SUBSLOT}" - -if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -IUSE="berkdb perl_features_debug doc gdbm perl_features_ithreads minimal perl_features_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.31 - >=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-Math-BigInt-1.999.842 - virtual/perl-Test-Harness - ) -" - -PATCHES=( - "${FILESDIR}/${P}-fix-compilation-in-eprefix-bug-939014.patch" -) - -# bug 390719, bug 523624 -# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker - -dual_scripts() { - src_remove_dual perl-core/Archive-Tar 3.20.10_rc ptar ptardiff ptargrep - src_remove_dual perl-core/CPAN 2.360.0 cpan - src_remove_dual perl-core/Digest-SHA 6.40.0 shasum - src_remove_dual perl-core/Encode 3.210.0 enc2xs piconv - src_remove_dual perl-core/ExtUtils-MakeMaker 7.700.0 instmodsh - src_remove_dual perl-core/ExtUtils-ParseXS 3.510.0 xsubpp - src_remove_dual perl-core/IO-Compress 2.212.0 zipdetails - src_remove_dual perl-core/JSON-PP 4.160.0 json_pp - src_remove_dual perl-core/Module-CoreList 5.202.406.90 corelist - src_remove_dual perl-core/Pod-Checker 1.770.0 podchecker - src_remove_dual perl-core/Pod-Perldoc 3.280.100 perldoc - src_remove_dual perl-core/Pod-Usage 2.30.0 pod2usage - src_remove_dual perl-core/Test-Harness 3.480.0 prove - src_remove_dual perl-core/podlators 5.10.200_rc pod2man pod2text - src_remove_dual_man perl-core/podlators 5.10.200_rc /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 perl_features_ithreads && ( has_version '=dev-lang/perl-5.38.2-r3[-perl_features_ithreads]' ) ) || \ - ( ! use perl_features_ithreads && ( has_version '=dev-lang/perl-5.38.2-r3[perl_features_ithreads]' ) ) || \ - ( use perl_features_quadmath && ( has_version '=dev-lang/perl-5.38.2-r3[-perl_features_quadmath]' ) ) || \ - ( ! use perl_features_quadmath && ( has_version '=dev-lang/perl-5.38.2-r3[perl_features_quadmath]' ) ) || \ - ( use perl_features_debug && ( has_version '=dev-lang/perl-5.38.2-r3[-perl_features_debug]' ) ) || \ - ( ! use perl_features_debug && ( has_version '=dev-lang/perl-5.38.2-r3[perl_features_debug]' ) ) ; then - echo "" - ewarn "TOGGLED PERL FEATURES WARNING:" - ewarn "You changed one of the PERL_FEATURES flags ithreads, quadmath, or debug." - ewarn "You must rebuild all perl-modules installed. Mostly this should be done automatically" - ewarn "via the flag changes of the packages. If the rebuild fails, use perl-cleaner." - ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl" - ewarn - ewarn "NOTE: Previous to perl-5.38.2-r3, these flags were useflags for dev-lang/perl." - ewarn "If you just upgraded and do not intend to change anything, carry the same settings over" - ewarn "into a global PERL_FEATURES variable set in make.conf. E.g., " - ewarn "dev-lang/perl[ithreads,quadmath] becomes PERL_FEATURES=\"ithreads quadmath\"" - fi -} - -pkg_pretend() { - if \ - ( use perl_features_ithreads && has_version ' "${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" - - # mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patches" "${WORKDIR}/patches" || die - # mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patch-info" "${WORKDIR}/patch-info" || die - - # 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" - - 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${ESYSROOT}/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 - - # Perl relies on -fwrapv semantics - filter-flags -ftrapv - - # This flag makes compiling crash in interesting ways - filter-flags "-malign-double" - - # On musl we dont want to use largefile *64 types, since 1) normal - # types are 64bit / largefile anyway and 2) the *64 types are going - # away in 1.2.4... bug #911233 - use elibc_musl && myconf -Ud_off64_t - - use sparc && myconf -Ud_longdbl - - # This urgently needs debugging - on m68k, miniperl crashes during - # build otherwise.. - use m68k && append-ldflags -Wl,-z,norelro - - export BUILD_BZIP2=0 - export BZIP2_INCLUDE=${ESYSROOT}/usr/include - export BZIP2_LIB=${ESYSROOT}/usr/$(get_libdir) - - export BUILD_ZLIB=False - export ZLIB_INCLUDE=${ESYSROOT}/usr/include - export ZLIB_LIB=${ESYSROOT}/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 need it..." - myconf -Ui_db -Ui_ndbm - fi - - use perl_features_ithreads && myconf -Dusethreads - - use perl_features_quadmath && myconf -Dusequadmath - - if use perl_features_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" - tc-export_build_env - - # Needed for the CHOST build too (bug #932385) - export CFLAGS="${CFLAGS} -D_GNU_SOURCE" - - # bug #913171 - export \ - HOSTCC=$(tc-getBUILD_CC) \ - HOSTCFLAGS="${CFLAGS_FOR_BUILD} -D_GNU_SOURCE" \ - HOSTLDFLAGS="${LDFLAGS_FOR_BUILD}" - 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 - - # 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 'int 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})" - - myconf \ - -Duseshrplib \ - -Darchname="${myarch}" \ - -Dar="$(tc-getAR)" \ - -Dcc="$(tc-getCC)" \ - -Dcpp="$(tc-getCPP)" \ - -Dld="$(tc-getCC)" \ - -Dnm="$(tc-getNM)" \ - -Dranlib="$(tc-getRANLIB)" \ - -Accflags="${CFLAGS} -DNO_PERL_RAND_SEED" \ - -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 90e467b4d9425e56ef818b6787d26ea764da07df Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:06 +0000 Subject: [PATCH 029/153] dev-lang/python: Sync with Gentoo It's from Gentoo commit fd8e9138a4d7f50a6276c893b6e052a4aff06de0. --- .../portage-stable/dev-lang/python/Manifest | 3 + .../dev-lang/python/python-3.10.16_p2.ebuild | 2 +- .../dev-lang/python/python-3.11.11_p2.ebuild | 2 +- .../python/python-3.14.0_alpha6-r100.ebuild | 635 ++++++++++++++++++ .../python/python-3.14.0_alpha6.ebuild | 630 +++++++++++++++++ 5 files changed, 1270 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.14.0_alpha6-r100.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.14.0_alpha6.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 f7c192b713..49694e2476 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 @@ -10,6 +10,8 @@ DIST Python-3.13.2.tar.xz 22621108 BLAKE2B 79c7dff8a15fd2487d62847a8e654c02433a8 DIST Python-3.13.2.tar.xz.asc 963 BLAKE2B 95a36c305dd452df23b4f119de05e1d3a2b2c9e0c2778a52dc4065f82b52752b68d89eb737cc54cced70623ad4a7b48c85fdff781bf7d7e3b747dacb1ef77db0 SHA512 5f019be530f688b0adf5d5cc9f2c2243e2f1dc7338559db14c1eedd12aadc85404d42c7aafd74e41828205d85f13f278876662ac30c8f3382a1ee081ba5f29f2 DIST Python-3.14.0a5.tar.xz 22850560 BLAKE2B 69d57ff07aad021fcfb626f9164529ce071e08182a4334a95b8411c451aa93db09c60d149868bbaad67d8c4bd79598ea22fa76856c3f70b9c35b04b6f48dbeb4 SHA512 ae34c994f00c36c6ce18091c63eb3469aa545ee391c6879c89f5722f7311f2e97cc997477897969777dfaf98090e3dd01dcdb655c986140e9a7796f963be9df9 DIST Python-3.14.0a5.tar.xz.sigstore 5067 BLAKE2B c3ef20345e05763d201090756ce7e786969d8351ba567b5708ec7a20e6d348c626201fd5b63afa51c0b6740aa3406222b4e07f01d81a8e3812dfc84b751ca248 SHA512 e6755be4a974d8007519e18b9ef417129fa032c9dff508f5170622bf8e8ef0616c8395a1261e9e0e80848c739f31e8369fb5893e7b29f308ad8d62cf1033d609 +DIST Python-3.14.0a6.tar.xz 22956068 BLAKE2B e8605da0dfa0f4ecf2f21cd770a074e73a2fbb24182d8adb27b1583da0ab48157bd9e70438c8efbb8fd17a66447e934a33128e0d50d9f253bde2f6c17df80375 SHA512 0fca503199bed0744139823aaf3ead30d7876556750b476fa6e1f701ae71fa7fe333cd46c775929c26729cf71bef6ba545fdc0118a0efca17c2434de3cadabe1 +DIST Python-3.14.0a6.tar.xz.sigstore 5227 BLAKE2B 1e517fc1205a2d9ec448fe17afac2c6a1874c08904b78f1f0ef6bb4140696ebc03e34080bb973eeae6fbb4adc9b0e3ad3a9133fbef0b48ba4aca99ae81f59862 SHA512 e1824480165f68597822e8934a58e744e3c4098b8646006548d20d42b8e8809ca95f129cc23edd49bd9dbaf158a36d60b7bc5bfd449c08af9e08e8e552e21f7d DIST Python-3.8.20.tar.xz 18962788 BLAKE2B 715c75e0c0a3d3b77af7f07478311bb0554b80aac72915be703aa2d0dd6459a972e5669808e64da14a0b91bb183e00655055c1726f302dc3ccd8721e3b4ae3e6 SHA512 3c9341ee1fd33cb687958dcf2b7c0c7700489726c4d530c3e9d9537d46a6ab534541a4b312232d8505bea395a07e4518c42d75fb7571103e6b266f8f44115c61 DIST Python-3.8.20.tar.xz.asc 833 BLAKE2B 5c86c15a1090b42e42bb7512565b1a7ad9d2137d59e9fd1ab0f83fdfc37dfcf184389418d6703db809e9c8c04a169af292665a2b58bf5dc61b7724ecbb4132d9 SHA512 a751ae0407a593d97acac4d5f8a0456580c753efa12a7d960125c219b4897fdb26fc1ffd43d8ea33ad1449162dd3b2904c16b6c51c57561ba73de3ffa62e0eed DIST Python-3.9.20.tar.xz 19648968 BLAKE2B 80a337ff406130599b8320068d11bc275d23473cedd7c85fcb9e40134f0f2d533be6e712139e788a6423cdc74cea938f306aa37c2a5099e3051f3e390159279c SHA512 c828f33edf1704e3149499d6d34e89264cb5cdb2b09ff05561641b359716d7996f0fe928629e09f006b1fd7850fdaf937275919c7fdd83f5efc32707c64d814b @@ -24,6 +26,7 @@ DIST python-gentoo-patches-3.11.11_p2.tar.xz 16224 BLAKE2B d8404c8c87e109d2c699d DIST python-gentoo-patches-3.12.9.tar.xz 10736 BLAKE2B 1f87d1bba8c094936e5cd3e0ef2eede0dbca3e658430f81b398735d8f02fff1f87739914014dbcb17163f8a969ffc5e7e4cce7d71557ce3c2e58487e6ed8b80f SHA512 342f11df85926e32455d52115d06b817a17f7ae104e3ea8e852046d321d829835bba7c07803c50dd5433ac8b615499428d5bc1a088b484ca0c4304eb8b2cb879 DIST python-gentoo-patches-3.13.2.tar.xz 8316 BLAKE2B 2367808924c83c02b8b2ca765fd4768d4f12cb8e8451eab9d084ce5950a5a81829e573d415f9a16db2e053105def90b5f52c91423fc71e57cd182a1d9c824d8c SHA512 580332ca037c1453f314d5811f96f7bf74defc16cfe515c4fe82ea08a7bf3679aa88d5456db846d988bcf4fbc9eeb4ebe7cee01d135bd55c87931206250e301a DIST python-gentoo-patches-3.14.0a5.tar.xz 5668 BLAKE2B b12801ac5bfa50cb6e3bf4b79e70956b771e0a4c0d5d4265115cf144740a914f764655171fdbf3178ba76f91b7765aa681f0097aaa55e6aa330eeeec3320bb4e SHA512 3110f99058136e8587a4cce2f594a5fde7c575027440e9e4d3b77dba0428c6af60cd0d259833d5d46e3b9ac3f24a2ad3111e4c5436cb423079f5c1a230e47d97 +DIST python-gentoo-patches-3.14.0a6.tar.xz 5680 BLAKE2B 704014b9935db57b28e9191b1a9d478b2e3d17c66fc1bbe1d5df4de0197f51ae184ad44c8434d22c3113545c3267fa8838dc8fa90bab00aa50223e38c9f1be7e SHA512 e5446d9bf25334f117e7967d5d77424bfd8b4a5a277358b8e4c27aaa15686a0fd0c6957b4fd0306622dc83f02de5e2d2f02d1f9a5675412915bfbab4b072e94d DIST python-gentoo-patches-3.8.20_p6.tar.xz 50876 BLAKE2B df0df21c75972fb73e36f66f0c90d3f953b14d7a59bf97ce4214dce6e6d937ed52fbf3db8f3eaf42cde141bfe4d7a731b06e41723285517461c790912706be9e SHA512 48ef567f6972e7975cb61d34a876d8c0db42f1a3c0b832f9366091dd5f2ca854c02887808843d314816c8cf6d7b0738c40e7835fedbba7b84e57f2515dde45e2 DIST python-gentoo-patches-3.9.20_p2.tar.xz 36140 BLAKE2B af0a9e08f3bfd8eb631760d100ec8f54db968a6bd201820192c4ea63ec88e0f83ffe77c709fcf4da43ad8d44eeb239ca1984561c3e7846e3fe4edd757d2321a4 SHA512 d451b41401de631eed996c34f40f2146d4d2f11bfa04fffa762c9b654e690d0ef95be0f51224a964a7c33784bb9b21e58434f6fee17cf39c20b5af34200569d5 DIST python-gentoo-patches-3.9.21_p1.tar.xz 35404 BLAKE2B 7b5ac27e814b06791fa5f0566763711c1b65a7c82ba66f97e237eebc6076f0bfdad3d8269ece6c4d4c238b62cc75b01f68ea3a5d7c4fffc46e88f79b2ba3e7fc SHA512 92c8548b31100a921378c72cc94a81062c96fd795fa2cd001c57a71e4af39e91b21b99e9e84db12adb142d9c4bda809445519c5c8a35545bd10230926bd7eded diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.16_p2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.16_p2.ebuild index 5e5ed7bb19..4359116e4d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.16_p2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.16_p2.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.11_p2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.11_p2.ebuild index b4ca94a695..f2e7f82999 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.11_p2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.11_p2.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.14.0_alpha6-r100.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.14.0_alpha6-r100.ebuild new file mode 100644 index 0000000000..2abe01749d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.14.0_alpha6-r100.ebuild @@ -0,0 +1,635 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +LLVM_COMPAT=( 19 ) +LLVM_OPTIONAL=1 +VERIFY_SIG_METHOD=sigstore +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic linux-info llvm-r1 +inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs +inherit verify-sig + +MY_PV=${PV/_alpha/a} +MY_P="Python-${MY_PV%_p*}" +PYVER="$(ver_cut 1-2)t" +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="Freethreading (no-GIL) version of Python 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.sigstore + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +IUSE=" + bluetooth build debug +ensurepip examples gdbm jit + libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind +" +REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )" +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/expat-2.1:= + dev-libs/libffi:= + dev-libs/mpdecimal:= + dev-python/gentoo-common + >=sys-libs/zlib-1.1.3:= + virtual/libintl + ensurepip? ( dev-python/ensurepip-pip ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + kernel_linux? ( sys-apps/util-linux:= ) + 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 + ) +" +# bluetooth requires headers from bluez +DEPEND=" + ${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + dev-python/ensurepip-wheel + ) + valgrind? ( dev-debug/valgrind ) +" +# autoconf-archive needed to eautoreconf +BDEPEND=" + dev-build/autoconf-archive + app-alternatives/awk + virtual/pkgconfig + jit? ( + $(llvm_gen_dep ' + llvm-core/clang:${LLVM_SLOT} + llvm-core/llvm:${LLVM_SLOT} + ') + ) + verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) +" +RDEPEND+=" + !build? ( app-misc/mime-types ) +" +if [[ ${PV} != *_alpha* ]]; then + RDEPEND+=" + dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] + " +fi + +# https://www.python.org/downloads/metadata/sigstore/ +VERIFY_SIG_CERT_IDENTITY=hugo@python.org +VERIFY_SIG_CERT_OIDC_ISSUER=https://github.com/login/oauth + +# large file tests involve a 2.5G file being copied (duplicated) +CHECKREQS_DISK_BUILD=5500M + +QA_PKGCONFIG_VERSION=${PYVER%t} +# false positives -- functions specific to *BSD +QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags ) + +declare -rgA PYTHON_KERNEL_CHECKS=( + ["CROSS_MEMORY_ATTACH"]="test_external_inspection" #bug 938589 + ["DNOTIFY"]="test_fcntl" # bug 938662 +) + +pkg_pretend() { + if use pgo || use test; then + check-reqs_pkg_pretend + fi + + ewarn "Freethreading build is considered experimental upstream. Using it" + ewarn "could lead to unexpected breakage, including race conditions" + ewarn "and crashes, respectively. Please do not file Gentoo bugs, unless" + ewarn "you can reproduce the problem with dev-lang/python. Instead," + ewarn "please consider reporting freethreading problems upstream." +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]]; then + use jit && llvm-r1_pkg_setup + if use test || use pgo; then + check-reqs_pkg_setup + + local CONFIG_CHECK + for f in "${!PYTHON_KERNEL_CHECKS[@]}"; do + CONFIG_CHECK+="~${f} " + done + linux-info_pkg_setup + fi + fi +} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sigstore} + fi + default +} + +src_prepare() { + # Ensure that internal copies of expat and libffi are not used. + # TODO: Makefile has annoying deps on expat headers + #rm -r Modules/expat || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + # force the correct number of jobs + # https://bugs.gentoo.org/737660 + sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die + + # breaks tests when using --with-wheel-pkg-dir + rm -r Lib/test/wheeldata || die + + eautoreconf +} + +build_cbuild_python() { + # 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 + # + # -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway) + local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto" + local -x LDFLAGS_NODIST=${BUILD_LDFLAGS} + local -x CFLAGS= LDFLAGS= + local -x BUILD_CFLAGS="${CFLAGS_NODIST}" + local -x BUILD_LDFLAGS=${LDFLAGS_NODIST} + + # We need to build our own Python on CBUILD first, and feed it in. + # bug #847910 + local myeconfargs_cbuild=( + "${myeconfargs[@]}" + + --prefix="${BROOT}"/usr + --libdir="${cbuild_libdir:2}" + + # Avoid needing to load the right libpython.so. + --disable-shared + + # As minimal as possible for the mini CBUILD Python + # we build just for cross to satisfy --with-build-python. + --without-lto + --without-readline + --disable-optimizations + ) + + mkdir "${WORKDIR}"/${P}-${CBUILD} || die + pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die + + # Avoid as many dependencies as possible for the cross build. + mkdir Modules || die + cat > Modules/Setup.local <<-EOF || die + *disabled* + nis + _dbm _gdbm + _sqlite3 + _hashlib _ssl + _curses _curses_panel + readline + _tkinter + pyexpat + zlib + # We disabled these for CBUILD because Python's setup.py can't handle locating + # libdir correctly for cross. This should be rechecked for the pure Makefile approach, + # and uncommented if needed. + #_ctypes + EOF + + ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}" + + # 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. + emake + popd &> /dev/null || die +} + +src_configure() { + # disable automagic bluetooth headers detection + if ! use bluetooth; then + local -x ac_cv_header_bluetooth_bluetooth_h=no + fi + + append-flags -fwrapv + filter-flags -malign-double + + # 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 + + # Set baseline test skip flags. + COMMON_TEST_SKIPS=( + # this is actually test_gdb.test_pretty_print + -x test_pretty_print + # https://bugs.gentoo.org/933840 + -x test_perf_profiler + ) + + # Arch-specific skips. See #931888 for a collection of these. + case ${CHOST} in + alpha*) + COMMON_TEST_SKIPS+=( + -x test_builtin + -x test_capi + -x test_cmath + -x test_float + # timeout + -x test_free_threading + -x test_math + -x test_numeric_tower + -x test_random + -x test_statistics + # bug 653850 + -x test_resource + -x test_strtod + ) + ;; + hppa*) + COMMON_TEST_SKIPS+=( + -x test_gdb + ) + ;; + mips*) + COMMON_TEST_SKIPS+=( + -x test_ctypes + -x test_external_inspection + -x test_statistics + ) + ;; + powerpc64-*) # big endian + COMMON_TEST_SKIPS+=( + -x test_gdb + ) + ;; + riscv*) + COMMON_TEST_SKIPS+=( + -x test_urllib2 + ) + ;; + sparc*) + COMMON_TEST_SKIPS+=( + # bug 788022 + -x test_multiprocessing_fork + -x test_multiprocessing_forkserver + -x test_multiprocessing_spawn + + -x test_ctypes + -x test_gdb + # bug 931908 + -x test_exceptions + ) + ;; + esac + + # Kernel-config specific skips + for option in "${!PYTHON_KERNEL_CHECKS[@]}"; do + if ! linux_config_exists || ! linux_chkconfig_present "${option}" + then + COMMON_TEST_SKIPS+=( -x "${PYTHON_KERNEL_CHECKS[${option}]}" ) + fi + done + + # musl-specific skips + use elibc_musl && COMMON_TEST_SKIPS+=( + # various musl locale deficiencies + -x test__locale + -x test_c_locale_coercion + -x test_locale + -x test_re + + # known issues with find_library on musl + # https://bugs.python.org/issue21622 + -x test_ctypes + + # fpathconf, ttyname errno values + -x test_os + ) + + if use pgo; then + local profile_task_flags=( + -m test + "-j$(makeopts_jobs)" + --pgo-extended + --verbose3 + -u-network + + # We use a timeout because of how often we've had hang issues + # here. It also matches the default upstream PROFILE_TASK. + --timeout 1200 + + "${COMMON_TEST_SKIPS[@]}" + + -x test_dtrace + + # All of these seem to occasionally hang for PGO inconsistently + # They'll even hang here but be fine in src_test sometimes. + # bug #828535 (and related: bug #788022) + -x test_asyncio + -x test_httpservers + -x test_logging + -x test_multiprocessing_fork + -x test_socket + -x test_xmlrpc + + # Hangs (actually runs indefinitely executing itself w/ many cpython builds) + # bug #900429 + -x test_tools + ) + + if has_version "app-arch/rpm" ; then + # Avoid sandbox failure (attempts to write to /var/lib/rpm) + profile_task_flags+=( + -x test_distutils + ) + fi + # PGO sometimes fails randomly + local -x PROFILE_TASK="${profile_task_flags[*]} || true" + 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 + --without-static-libpython + --enable-ipv6 + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --without-lto + --with-system-expat + --with-system-libmpdec + --with-platlibdir=lib + --with-pkg-config=yes + --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip + --disable-gil + + $(use_with debug assertions) + $(use_enable jit experimental-jit) + $(use_enable pgo optimizations) + $(use_with readline readline "$(usex libedit editline readline)") + $(use_with valgrind) + ) + + # https://bugs.gentoo.org/700012 + if tc-is-lto; then + append-cflags $(test-flags-CC -ffat-lto-objects) + myeconfargs+=( + --with-lto + ) + fi + + # Force-disable modules we don't want built. + # See Modules/Setup for docs on how this works. Setup.local contains our local deviations. + cat > Modules/Setup.local <<-EOF || die + *disabled* + nis + $(usev !gdbm '_gdbm _dbm') + $(usev !sqlite '_sqlite3') + $(usev !ssl '_hashlib _ssl') + $(usev !ncurses '_curses _curses_panel') + $(usev !readline 'readline') + $(usev !tk '_tkinter') + EOF + + # disable implicit optimization/debugging flags + local -x OPT= + + if tc-is-cross-compiler ; then + build_cbuild_python + myeconfargs+=( + # Point the imminent CHOST build to the Python we just + # built for CBUILD. + --with-build-python="${WORKDIR}"/${P}-${CBUILD}/python + ) + 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 + + 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 + export PYTHONSTRICTEXTENSIONBUILD=1 + + # Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't + # end up writing bytecode & violating sandbox. + # bug #831897 + local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE} + + # Gentoo hack to disable accessing system site-packages + export GENTOO_CPYTHON_BUILD=1 + + if use pgo ; then + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + local -x TMPDIR=/var/tmp + 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=( + --verbose3 + -u-network + -j "$(makeopts_jobs)" + "${COMMON_TEST_SKIPS[@]}" + ) + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + local -x TMPDIR=/var/tmp + + nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local ret=${?} + + [[ ${ret} -eq 0 ]] || die "emake test failed" +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + # -j1 hack for now for bug #843458 + emake -j1 DESTDIR="${D}" TEST_MODULES=no altinstall + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + # Fix collision with GIL-enabled build. + rm "${ED}/usr/bin/python${PYVER%t}" || die + mv "${ED}"/usr/bin/pydoc{${PYVER%t},${PYVER}} || die + mv "${ED}"/usr/share/man/man1/python{${PYVER%t},${PYVER}}.1 || 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 sqlite; then + rm -r "${libdir}/"sqlite3 || die + fi + if use tk; then + # rename to avoid collision with dev-lang/python + mv "${ED}"/usr/bin/idle{${PYVER%t},${PYVER}} || die + else + rm -r "${ED}/usr/bin/idle${PYVER%t}" || die + rm -r "${libdir}/"{idlelib,tkinter} || die + fi + + ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die + + 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 + # pydoc + ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.14.0_alpha6.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.14.0_alpha6.ebuild new file mode 100644 index 0000000000..f4da576cf9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.14.0_alpha6.ebuild @@ -0,0 +1,630 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +LLVM_COMPAT=( 19 ) +LLVM_OPTIONAL=1 +VERIFY_SIG_METHOD=sigstore +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic linux-info llvm-r1 +inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs +inherit 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.sigstore + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +IUSE=" + bluetooth build debug +ensurepip examples gdbm jit + libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind +" +REQUIRED_USE="jit? ( ${LLVM_REQUIRED_USE} )" +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/expat-2.1:= + dev-libs/libffi:= + dev-libs/mpdecimal:= + dev-python/gentoo-common + >=sys-libs/zlib-1.1.3:= + virtual/libintl + ensurepip? ( dev-python/ensurepip-pip ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + kernel_linux? ( sys-apps/util-linux:= ) + 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 + ) +" +# bluetooth requires headers from bluez +DEPEND=" + ${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + dev-python/ensurepip-wheel + ) + valgrind? ( dev-debug/valgrind ) +" +# autoconf-archive needed to eautoreconf +BDEPEND=" + dev-build/autoconf-archive + app-alternatives/awk + virtual/pkgconfig + jit? ( + $(llvm_gen_dep ' + llvm-core/clang:${LLVM_SLOT} + llvm-core/llvm:${LLVM_SLOT} + ') + ) + verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) +" +RDEPEND+=" + !build? ( app-misc/mime-types ) +" +if [[ ${PV} != *_alpha* ]]; then + RDEPEND+=" + dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] + " +fi + +# https://www.python.org/downloads/metadata/sigstore/ +VERIFY_SIG_CERT_IDENTITY=hugo@python.org +VERIFY_SIG_CERT_OIDC_ISSUER=https://github.com/login/oauth + +# large file tests involve a 2.5G file being copied (duplicated) +CHECKREQS_DISK_BUILD=5500M + +QA_PKGCONFIG_VERSION=${PYVER%t} +# false positives -- functions specific to *BSD +QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags ) + +declare -rgA PYTHON_KERNEL_CHECKS=( + ["CROSS_MEMORY_ATTACH"]="test_external_inspection" #bug 938589 + ["DNOTIFY"]="test_fcntl" # bug 938662 +) + +pkg_pretend() { + if use pgo || use test; then + check-reqs_pkg_pretend + fi + + if use jit; then + ewarn "USE=jit is considered experimental upstream. Using it" + ewarn "could lead to unexpected breakage, including race conditions" + ewarn "and crashes, respectively. Please do not file Gentoo bugs, unless" + ewarn "you can reproduce the problem with dev-lang/python[-jit]. Instead," + ewarn "please consider reporting JIT problems upstream." + fi +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]]; then + use jit && llvm-r1_pkg_setup + if use test || use pgo; then + check-reqs_pkg_setup + + local CONFIG_CHECK + for f in "${!PYTHON_KERNEL_CHECKS[@]}"; do + CONFIG_CHECK+="~${f} " + done + linux-info_pkg_setup + fi + fi +} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sigstore} + fi + default +} + +src_prepare() { + # Ensure that internal copies of expat and libffi are not used. + # TODO: Makefile has annoying deps on expat headers + #rm -r Modules/expat || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + # force the correct number of jobs + # https://bugs.gentoo.org/737660 + sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die + + # breaks tests when using --with-wheel-pkg-dir + rm -r Lib/test/wheeldata || die + + eautoreconf +} + +build_cbuild_python() { + # 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 + # + # -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway) + local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto" + local -x LDFLAGS_NODIST=${BUILD_LDFLAGS} + local -x CFLAGS= LDFLAGS= + local -x BUILD_CFLAGS="${CFLAGS_NODIST}" + local -x BUILD_LDFLAGS=${LDFLAGS_NODIST} + + # We need to build our own Python on CBUILD first, and feed it in. + # bug #847910 + local myeconfargs_cbuild=( + "${myeconfargs[@]}" + + --prefix="${BROOT}"/usr + --libdir="${cbuild_libdir:2}" + + # Avoid needing to load the right libpython.so. + --disable-shared + + # As minimal as possible for the mini CBUILD Python + # we build just for cross to satisfy --with-build-python. + --without-lto + --without-readline + --disable-optimizations + ) + + mkdir "${WORKDIR}"/${P}-${CBUILD} || die + pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die + + # Avoid as many dependencies as possible for the cross build. + mkdir Modules || die + cat > Modules/Setup.local <<-EOF || die + *disabled* + nis + _dbm _gdbm + _sqlite3 + _hashlib _ssl + _curses _curses_panel + readline + _tkinter + pyexpat + zlib + # We disabled these for CBUILD because Python's setup.py can't handle locating + # libdir correctly for cross. This should be rechecked for the pure Makefile approach, + # and uncommented if needed. + #_ctypes + EOF + + ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}" + + # 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. + emake + popd &> /dev/null || die +} + +src_configure() { + # disable automagic bluetooth headers detection + if ! use bluetooth; then + local -x ac_cv_header_bluetooth_bluetooth_h=no + fi + + append-flags -fwrapv + filter-flags -malign-double + + # 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 + + # Set baseline test skip flags. + COMMON_TEST_SKIPS=( + # this is actually test_gdb.test_pretty_print + -x test_pretty_print + # https://bugs.gentoo.org/933840 + -x test_perf_profiler + ) + + # Arch-specific skips. See #931888 for a collection of these. + case ${CHOST} in + alpha*) + COMMON_TEST_SKIPS+=( + -x test_builtin + -x test_capi + -x test_cmath + -x test_float + # timeout + -x test_free_threading + -x test_math + -x test_numeric_tower + -x test_random + -x test_statistics + # bug 653850 + -x test_resource + -x test_strtod + ) + ;; + hppa*) + COMMON_TEST_SKIPS+=( + -x test_gdb + ) + ;; + mips*) + COMMON_TEST_SKIPS+=( + -x test_ctypes + -x test_external_inspection + -x test_statistics + ) + ;; + powerpc64-*) # big endian + COMMON_TEST_SKIPS+=( + -x test_gdb + ) + ;; + riscv*) + COMMON_TEST_SKIPS+=( + -x test_urllib2 + ) + ;; + sparc*) + COMMON_TEST_SKIPS+=( + # bug 788022 + -x test_multiprocessing_fork + -x test_multiprocessing_forkserver + -x test_multiprocessing_spawn + + -x test_ctypes + -x test_gdb + # bug 931908 + -x test_exceptions + ) + ;; + esac + + # Kernel-config specific skips + for option in "${!PYTHON_KERNEL_CHECKS[@]}"; do + if ! linux_config_exists || ! linux_chkconfig_present "${option}" + then + COMMON_TEST_SKIPS+=( -x "${PYTHON_KERNEL_CHECKS[${option}]}" ) + fi + done + + # musl-specific skips + use elibc_musl && COMMON_TEST_SKIPS+=( + # various musl locale deficiencies + -x test__locale + -x test_c_locale_coercion + -x test_locale + -x test_re + + # known issues with find_library on musl + # https://bugs.python.org/issue21622 + -x test_ctypes + + # fpathconf, ttyname errno values + -x test_os + ) + + if use pgo; then + local profile_task_flags=( + -m test + "-j$(makeopts_jobs)" + --pgo-extended + --verbose3 + -u-network + + # We use a timeout because of how often we've had hang issues + # here. It also matches the default upstream PROFILE_TASK. + --timeout 1200 + + "${COMMON_TEST_SKIPS[@]}" + + -x test_dtrace + + # All of these seem to occasionally hang for PGO inconsistently + # They'll even hang here but be fine in src_test sometimes. + # bug #828535 (and related: bug #788022) + -x test_asyncio + -x test_httpservers + -x test_logging + -x test_multiprocessing_fork + -x test_socket + -x test_xmlrpc + + # Hangs (actually runs indefinitely executing itself w/ many cpython builds) + # bug #900429 + -x test_tools + ) + + if has_version "app-arch/rpm" ; then + # Avoid sandbox failure (attempts to write to /var/lib/rpm) + profile_task_flags+=( + -x test_distutils + ) + fi + # PGO sometimes fails randomly + local -x PROFILE_TASK="${profile_task_flags[*]} || true" + 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 + --without-static-libpython + --enable-ipv6 + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --without-lto + --with-system-expat + --with-system-libmpdec + --with-platlibdir=lib + --with-pkg-config=yes + --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip + --enable-gil + + $(use_with debug assertions) + $(use_enable jit experimental-jit) + $(use_enable pgo optimizations) + $(use_with readline readline "$(usex libedit editline readline)") + $(use_with valgrind) + ) + + # https://bugs.gentoo.org/700012 + if tc-is-lto; then + append-cflags $(test-flags-CC -ffat-lto-objects) + myeconfargs+=( + --with-lto + ) + fi + + # Force-disable modules we don't want built. + # See Modules/Setup for docs on how this works. Setup.local contains our local deviations. + cat > Modules/Setup.local <<-EOF || die + *disabled* + nis + $(usev !gdbm '_gdbm _dbm') + $(usev !sqlite '_sqlite3') + $(usev !ssl '_hashlib _ssl') + $(usev !ncurses '_curses _curses_panel') + $(usev !readline 'readline') + $(usev !tk '_tkinter') + EOF + + # disable implicit optimization/debugging flags + local -x OPT= + + if tc-is-cross-compiler ; then + build_cbuild_python + myeconfargs+=( + # Point the imminent CHOST build to the Python we just + # built for CBUILD. + --with-build-python="${WORKDIR}"/${P}-${CBUILD}/python + ) + 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 + + 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 + export PYTHONSTRICTEXTENSIONBUILD=1 + + # Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't + # end up writing bytecode & violating sandbox. + # bug #831897 + local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE} + + # Gentoo hack to disable accessing system site-packages + export GENTOO_CPYTHON_BUILD=1 + + if use pgo ; then + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + local -x TMPDIR=/var/tmp + 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=( + --verbose3 + -u-network + -j "$(makeopts_jobs)" + "${COMMON_TEST_SKIPS[@]}" + ) + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + local -x TMPDIR=/var/tmp + + nonfatal emake -Onone test EXTRATESTOPTS="${test_opts[*]}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local ret=${?} + + [[ ${ret} -eq 0 ]] || die "emake test failed" +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + # -j1 hack for now for bug #843458 + emake -j1 DESTDIR="${D}" TEST_MODULES=no 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 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} || die + fi + + ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die + + 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 + # pydoc + ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die + fi +} From b9f67bd22732616399aab1d4ef866ea5ad841afd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:06 +0000 Subject: [PATCH 030/153] dev-lang/python-exec: Sync with Gentoo It's from Gentoo commit 91400b4803c762f366289ddda873ff04fa6e32c7. --- .../dev-lang/python-exec/python-exec-2.4.10.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.10.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.10.ebuild index b6be8d0029..af542129b6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..13} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 ) inherit python-any-r1 From 888434ca6e698c74161fe2f27e22abae3542c73c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:07 +0000 Subject: [PATCH 031/153] dev-lang/rust: Sync with Gentoo It's from Gentoo commit 7cc7ca1d2fe381effb58a237761468f2379245a6. --- .../dev-lang/rust/rust-1.84.0-r1.ebuild | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.84.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.84.0-r1.ebuild index 4414a294a3..298a051649 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.84.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/rust/rust-1.84.0-r1.ebuild @@ -40,8 +40,11 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} # https://github.com/rust-lang/llvm-project/blob/rustc-1.84.0/llvm/CMakeLists.txt -_ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa ) -ALL_LLVM_EXPERIMENTAL_TARGETS=( ) +_ALL_RUST_EXPERIMENTAL_TARGETS=( ARC CSKY DirectX M68k SPIRV Xtensa ) +declare -A ALL_RUST_EXPERIMENTAL_TARGETS +for _x in "${_ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do + ALL_RUST_EXPERIMENTAL_TARGETS["llvm_targets_${_x}"]=0 +done LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" SLOT="${PV}" @@ -52,12 +55,9 @@ LLVM_DEPEND=() # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation for _x in "${ALL_LLVM_TARGETS[@]}"; do LLVM_DEPEND+=( " ${_x}? ( $(llvm_gen_dep "llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" ) - for _xx in "${_ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do - if [[ "${_xx}" == "${_x}" ]] ; then - ALL_LLVM_EXPERIMENTAL_TARGETS+=( ${_x} ) - break - fi - done + if [[ -v ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"] ]] ; then + ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"]=1 + fi done LLVM_DEPEND+=( " wasm? ( $(llvm_gen_dep 'llvm-core/lld:${LLVM_SLOT}') )" ) LLVM_DEPEND+=( " $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}')" ) @@ -279,13 +279,13 @@ src_configure() { rust_build="$(rust_abi "${CBUILD}")" rust_host="$(rust_abi "${CHOST}")" - LLVM_EXPERIMENTAL_TARGETS=() - for _x in "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}"; do - if use llvm_targets_${_x} ; then - LLVM_EXPERIMENTAL_TARGETS+=( ${_x} ) + RUST_EXPERIMENTAL_TARGETS=() + for _x in "${!ALL_RUST_EXPERIMENTAL_TARGETS[@]}"; do + if [[ ${ALL_RUST_EXPERIMENTAL_TARGETS[${_x}]} == 1 ]] && use ${_x} ; then + RUST_EXPERIMENTAL_TARGETS+=( ${_x#llvm_targets_} ) fi done - LLVM_EXPERIMENTAL_TARGETS=${LLVM_EXPERIMENTAL_TARGETS[@]} + RUST_EXPERIMENTAL_TARGETS=${RUST_EXPERIMENTAL_TARGETS[@]} local cm_btype="$(usex debug DEBUG RELEASE)" cat <<- _EOF_ > "${S}"/config.toml @@ -298,7 +298,7 @@ src_configure() { assertions = $(toml_usex debug) ninja = true targets = "${LLVM_TARGETS// /;}" - experimental-targets = "${LLVM_EXPERIMENTAL_TARGETS// /;}" + experimental-targets = "${RUST_EXPERIMENTAL_TARGETS// /;}" link-shared = $(toml_usex system-llvm) $(if is_libcxx_linked; then # https://bugs.gentoo.org/732632 From d9f919f25ff78169a3abce4a27dd82a8babc8343 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:08 +0000 Subject: [PATCH 032/153] dev-lang/swig: Sync with Gentoo It's from Gentoo commit 2bb6573d92cb6460f2e5db89a4e0128f4836b418. --- .../portage-stable/dev-lang/swig/Manifest | 1 + .../dev-lang/swig/swig-4.3.0.ebuild | 64 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/swig/swig-4.3.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/swig/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/swig/Manifest index 09dc4fcf0f..d904ff0cfd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/swig/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/swig/Manifest @@ -1,3 +1,4 @@ DIST swig-4.1.1.tar.gz 8600805 BLAKE2B 898d3405f20c3e49626fb808b568e77c69b81ec2401c0a0c406f9e7a3d7d218353dc8b8ae88a3d485ddfc3be659971b961ee2c89d5b0c75aed0688e0952fd208 SHA512 1cea1918455a75ebc9b2653dd1715bd5dcd974554955f324295c6a6f14c0a715651b221b85fad4a8af5197e0c75bfe7b590bc6ba7178c26245fbbd9a7e110100 DIST swig-4.2.0.tar.gz 8339586 BLAKE2B 4f1c3c7d4b1e218b67a2d796d2171df73971036a433e5fb80233b3050f022d578efdff28fc44d98a6d176ec6270b4942f5f56e9a74bbd8b30d6836c76c620a04 SHA512 b7f508b25bc6e882ed6123f6c7ad12b02a7b74de09ac6e5789968e9c2f51407d1e3dafd5ea495087b4fb0f447ecce17e6070471479c67c4265166d8342a10862 DIST swig-4.2.1.tar.gz 8364050 BLAKE2B 0acffd4794d09f2347d669d1460a794c03f136ab3ddc6623741e182ff52b6bf5f639c736e38540918ebb1abbe36c2ce1957aef8a429f1a716d9c5361175569bf SHA512 019dee5a46d57e1030eef47cd5d007ccaadbdcd4e53cd30d7c795f0118ecf4406a78185534502c81c5f6d7bac0713256e7e19b20b5a2d14e2c552219edbaf5cf +DIST swig-4.3.0.tar.gz 8616205 BLAKE2B ff9c9b9c139ebde89c46abd4b46903dc6c33aff969ed3bf873d7982ed9ad53793e2648460eb52e606e6295984698239118b10cef5d66333b1c3588286367d4d8 SHA512 5dfb8aa9898fccb063dbdf5d6266928cf46d671491308d2c122c59414377f1558015a37d7268729f62c5d4ee20438c98c83ee575fb00078dfe77564ee46a2f64 diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/swig/swig-4.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/swig/swig-4.3.0.ebuild new file mode 100644 index 0000000000..5dc47d6b15 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/swig/swig-4.3.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Simplified Wrapper and Interface Generator" +HOMEPAGE="http://www.swig.org/ https://github.com/swig/swig" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+ BSD BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="ccache doc pcre test" +RESTRICT="!test? ( test )" + +RDEPEND=" + pcre? ( dev-libs/libpcre2 ) + ccache? ( sys-libs/zlib ) +" +DEPEND=" + ${RDEPEND} + test? ( dev-libs/boost ) +" +BDEPEND="virtual/pkgconfig" + +DOCS=( ANNOUNCE CHANGES CHANGES.current README TODO ) + +src_configure() { + # TODO: add USE for various langs? (https://bugs.gentoo.org/921504#c3) + econf \ + PKGCONFIG="$(tc-getPKG_CONFIG)" \ + --without-maximum-compile-warnings \ + $(use_enable ccache) \ + $(use_with pcre) +} + +src_compile() { + # Override these variables per Makefile.in to get verbose logs + emake FLAGS="-k" RUNPIPE="" +} + +src_test() { + # The tests won't get run w/o an explicit call, broken Makefiles? + # java skipped for bug #921504 + # *-sections for bug #935318 + emake check \ + skip-java=true \ + FLAGS="-k" \ + RUNPIPE="" \ + CFLAGS="${CFLAGS} -std=c++20 -ffunction-sections -fdata-sections" \ + CXXFLAGS="${CXXFLAGS} -std=c++20 -ffunction-sections -fdata-sections" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + default + + if use doc; then + docinto html + dodoc -r Doc/{Devel,Manual} + fi +} From 5c606d0f0ca586c614139969c874304faedabec3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:08 +0000 Subject: [PATCH 033/153] dev-lang/tcl: Sync with Gentoo It's from Gentoo commit 6fc62c5cd473b83b6dfbaffaab2499b46191b826. --- .../portage-stable/dev-lang/tcl/Manifest | 1 + .../dev-lang/tcl/tcl-8.6.16.ebuild | 135 ++++++++++++++++++ 2 files changed, 136 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.16.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/Manifest index 5a0bdf43e7..8fd41311c2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/Manifest @@ -1,3 +1,4 @@ DIST tcl-core8.6.13-src.tar.gz 6370805 BLAKE2B f5af3c0fa2d52c09ab16578c9147cb5ac4a06b81882c49f1ef23642bed32adccbe2a5acbddc5d18bd1757e1991daf864707d842e675f92c6de70be6f4275b95e SHA512 c1c953ac0f9a530d8256514c0cb78f166d0063db725b87fa19272716a955cd390ff8f1c5f17e791cf463284d88bb136d61194779a913a6a78f46146d485c71ee DIST tcl-core8.6.14-src.tar.gz 7081644 BLAKE2B 7148c889954d78774c4352ceae5d814498a1670423a2b3ed288786dce97b87d42395b817ef92fc6561358d84736619ef03d1c2e2c502433c4b3f5eb7c80a62e8 SHA512 495b13af817c68d81533c45345d003efd711ddbc5c1a3d1fbbdb10452fa62d91e649f77835239e547355ade84abfea6ae843d2e76de6108532054170a672ddc0 DIST tcl-core8.6.15-src.tar.gz 7019390 BLAKE2B e88b974c005e3acd680f672a13b76bd736730f13c4af1c4538390c0d624b1cd752c8305ac2f6d7f7df5d2fbb43b08614b715c7688ea61184d552cd77117d8533 SHA512 9ca62941405ea2bca3099bf65f03a87071f3d88ff23367ab8af80bba7692caca5f63ec4d9c2282b7ba3433124c5f952578a763888e0a9ba9205e52248539e9e7 +DIST tcl-core8.6.16-src.tar.gz 7022932 BLAKE2B 9a20cc72a2654c8b4f2c9088fabef13321c414d4cc1125afbb0151ae198c6e665a7f18ffa798fcf2ed0ae1160e586819b834d745c5dfbb2b2ed5dc6d0e022d4d SHA512 b25de457523e1f884326db37acebc329d5f1a8ac2a2e0fbdfcefafc76de202ff8d1efe8ff687afa5da486c0a95ab4bde893aad6f70f0e570fa6911c5cf56d458 diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.16.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.16.ebuild new file mode 100644 index 0000000000..bdce8778fd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.16.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with dev-lang/tk! + +inherit autotools flag-o-matic multilib-minimal multilib toolchain-funcs + +MY_P="${PN}${PV}" + +DESCRIPTION="Tool Command Language" +HOMEPAGE="http://www.tcl.tk/" +SRC_URI="https://downloads.sourceforge.net/tcl/${PN}-core${PV}-src.tar.gz" + +SPARENT="${WORKDIR}/${MY_P}" +S="${SPARENT}"/unix + +LICENSE="tcltk Spencer-99" +SLOT="0/8.6" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="debug +threads" + +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-8.6.10-multilib.patch + "${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971 + "${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120 +) + +QA_CONFIG_IMPL_DECL_SKIP=( + stat64 opendir64 rewinddir64 closedir64 # used to test for Large File Support +) + +src_prepare() { + # By dropping the compat directory a lot of licensing and attribution burden + # (BSD-3, zlib,...) is lifted from the user + find \ + "${SPARENT}"/compat/* \ + "${SPARENT}"/doc/try.n \ + -delete || die + + # Drop -Werror + sed -i \ + -e "s: -Werror::g" \ + dltest/Makefile.in \ + || die + + pushd "${SPARENT}" &>/dev/null || die + default + popd &>/dev/null || die + + # httpold tests require netowk + rm ../tests/httpold.test \ + ../tests/env.test \ + ../tests/http.test \ + || die + + # workaround stack check issues, bug #280934 + use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" + + tc-export CC + + sed \ + -e '/chmod/s:555:755:g' \ + -i Makefile.in || die + + sed \ + -e 's:-O[2s]\?::g' \ + -i tcl.m4 || die + + mv configure.{in,ac} || die + + eautoconf + + multilib_copy_sources +} + +multilib_src_configure() { + # We went ahead and deleted the whole compat/ subdir which means + # the configure tests to detect broken versions need to pass (else + # we'll fail to build). This comes up when cross-compiling, but + # might as well get a minor configure speed up normally. + export ac_cv_func_memcmp_working="yes" + export tcl_cv_str{str,toul,tod}_unbroken="ok" + export tcl_cv_strtod_buggy="no" + + econf \ + $(use_enable threads) \ + $(use_enable debug symbols) +} + +multilib_src_install() { + #short version number + local v1=$(ver_cut 1-2) + local mylibdir=$(get_libdir) + + S= default + # fix the tclConfig.sh to eliminate refs to the build directory + # and drop unnecessary -L inclusion to default system libdir + + sed \ + -e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \ + -e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \ + -e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \ + -e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ + -e "/^TCL_LIBW_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ + -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die + if use prefix && [[ ${CHOST} != *-darwin* ]] ; then + sed \ + -e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ + -e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ + -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die + fi + + # install private headers + insinto /usr/${mylibdir}/tcl${v1}/include/unix + doins *.h + insinto /usr/${mylibdir}/tcl${v1}/include/generic + doins "${SPARENT}"/generic/*.h + rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die + + # install symlink for libraries + dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) + dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a + + if multilib_is_native_abi; then + dosym tclsh${v1} /usr/bin/tclsh + dodoc "${SPARENT}"/{ChangeLog*,README.md,changes} + fi +} From 2e18c354423935c2dcb89c47126804f7ff46c765 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:13 +0000 Subject: [PATCH 034/153] dev-libs/expat: Sync with Gentoo It's from Gentoo commit 5e9e20dcc841d271d30ae5f17638f552ddbb2981. --- .../portage-stable/dev-libs/expat/Manifest | 1 + .../dev-libs/expat/expat-2.7.0.ebuild | 100 ++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.7.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/expat/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/expat/Manifest index 8961675365..d99d8c0319 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/expat/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/expat/Manifest @@ -1,2 +1,3 @@ DIST expat-2.6.3.tar.xz 485600 BLAKE2B b8e0a0e779f0f136eaca91115cbbcf5a5cca457cab1cca6f8d6141151d19f8ef2dccb41b0e9134459c1e7d99cb2e0b4ce3922d2bd9221002ec43fe9d53a0084a SHA512 e02c4ad88f9d539258aa1c1db71ded7770a8f12c77b5535e5b34f040ae5b1361ef23132f16d96bdb7c096a83acd637a7c907916bdfcc6d5cfb9e35d04020ca0b DIST expat-2.6.4.tar.xz 486732 BLAKE2B 70d716722358db8d0acb2c74dbbc9d2362d04a0b856eab6b6d723614b656cf6aad9f6646339e0a32b4151db2e9541439bcb81ec87791e5e6ec0bd36a3ca067cc SHA512 620da34d98524478b445038bf1dd439790fe11169496516425fca922226797835c27549fc5fb825792b516563b24eb922d9ad8f27d20a0229e7ee8cd640dfb25 +DIST expat-2.7.0.tar.xz 493060 BLAKE2B 44567e955b8cf2053665140b3557897c6e0e66c7e2ba5919970d91d55a05bb8db604afa37a441ff0a7abf4472b24b0e1e6c3964c56b4bb55358c000ccdc1459d SHA512 69fb19c2634821b657f550f609d0bcc6e45e9d903072bbc63e9a0bfc92ef7d04c6e1408dd39eb43eaa2951f28ae93dce4f796c9769253f440905db2d5606a4c7 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.7.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.7.0.ebuild new file mode 100644 index 0000000000..0f59f82703 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.7.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +AUTOTOOLS_AUTO_DEPEND=no +inherit autotools multilib-minimal + +DESCRIPTION="Stream-oriented XML parser library" +HOMEPAGE="https://libexpat.github.io/" +SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="examples static-libs test unicode" +RESTRICT="!test? ( test )" +BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" + +DOCS=( README.md ) + +QA_CONFIG_IMPL_DECL_SKIP=( + # https://bugs.gentoo.org/906384 + arc4random + arc4random_buf +) + +src_prepare() { + default + + # fix interpreter to be a recent/good shell + sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die + if use unicode; then + cp -R "${S}" "${S}"w || die + pushd "${S}"w >/dev/null + find -name Makefile.am \ + -exec sed \ + -e 's,libexpat\.la,libexpatw.la,' \ + -e 's,libexpat_la,libexpatw_la,' \ + -i {} + || die + eautoreconf + popd >/dev/null + fi +} + +multilib_src_configure() { + local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook" + + mkdir -p "${BUILD_DIR}"w || die + + if use unicode; then + pushd "${BUILD_DIR}"w >/dev/null + CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf} + popd >/dev/null + fi + + ECONF_SOURCE="${S}" econf ${myconf} +} + +multilib_src_compile() { + emake + + if use unicode; then + pushd "${BUILD_DIR}"w >/dev/null + emake -C lib + popd >/dev/null + fi +} + +multilib_src_install() { + emake install DESTDIR="${D}" + + if use unicode; then + pushd "${BUILD_DIR}"w >/dev/null + emake -C lib install DESTDIR="${D}" + popd >/dev/null + + pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null + cp expat.pc expatw.pc + sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die + popd >/dev/null + fi +} + +multilib_src_install_all() { + einstalldocs + + doman doc/xmlwf.1 + + # Note: Use of HTML_DOCS would add unwanted "doc" subfolder + docinto html + dodoc doc/*.{css,html} + + if use examples; then + docinto examples + dodoc examples/*.c + docompress -x usr/share/doc/${PF}/examples + fi + + find "${D}" -name '*.la' -type f -delete || die +} From 8142168bd0757def3d73a6cad2b76823b9a595e3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:13 +0000 Subject: [PATCH 035/153] dev-libs/glib: Sync with Gentoo It's from Gentoo commit fd8e367f22b348f2e7ac64bcd7686e158a8f5b4b. --- .../portage-stable/dev-libs/glib/Manifest | 1 + .../dev-libs/glib/glib-2.80.5-r1.ebuild | 4 +- .../dev-libs/glib/glib-2.82.5.ebuild | 2 +- .../dev-libs/glib/glib-2.84.0.ebuild | 447 ++++++++++++++++++ 4 files changed, 451 insertions(+), 3 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.0.ebuild 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 a610d6496e..340702c09d 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 @@ -3,5 +3,6 @@ DIST glib-2.78.6.tar.xz 5344808 BLAKE2B d16173794c4aa019459cf8c8c84d4107fb839382 DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a8cfda8b8770dd391861999ff3381008f4fe382e90f0a7798fe218debda7f559f6e3ac8f9305e3be98b879969 SHA512 c9cc9f99e217fd950810fcfbfa7300c7850cae4dbfbabc03cdcadb6dcca2e51ea7979ceb68c09d8e9776fd1c04db73b89b81f748c8bd911e1f7ad9f704dff172 DIST glib-2.82.4.tar.xz 5556896 BLAKE2B 62caecc7570b1639f6ddf1deb9debb6d3d6180b74f497f2fcace5ce65d6e28996555d51e5b4980f500bdc3f811b5b6214521b1170f553f2fa1fd240fd0eec835 SHA512 5df0b3c56fe6cf6c94019e29afb408174a5864cdb97cf58d5a12a0f83990b5c2004a49c8e3b0e195f5808874b5911a4a7b3d6aea8718aada1b40561e623cd08d DIST glib-2.82.5.tar.xz 5554704 BLAKE2B e7853034be1137f8b793483df9e9ce1465dd10a990eb9b3cb9ac76c9f8f86ccc6fda85645b04b35963b28c33e0f6c02df4f3d03e06cc278b8515e588d6bd05f6 SHA512 a6b035c32a42b9d6f4c031a29da405848002619654b58c9205f2f78dbb9698cd5866f31ab213adc04aa214d2c48840a9592c0a1e9201e6851ebd435635f393ae +DIST glib-2.84.0.tar.xz 5613328 BLAKE2B a482076d6b0c82824179094974110dbd10d47fce93f84f4626d0d3dbea528602c41ac4a7ab8feedc3d7cc5e404ef8bef30c6c744b6f0f4f3a764644e28210e28 SHA512 72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7 DIST gobject-introspection-1.80.1.tar.xz 1040228 BLAKE2B 7a8c1da9bc8aef293deedde1eed97536fa2f42f79a9761ac8ededb0676e46b636545a69e20e63d812844aeb626fa4fb7ce3c7922e51554fdc79560f16443acd9 SHA512 f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a DIST gobject-introspection-1.82.0.tar.xz 1052872 BLAKE2B 8336ae26d48a71a203655d9d268076f603055ceabb55dbfa676f2c67b4096b83afc106d485dc45d02b3a8be806f9ef50d54806a82e61f2a252ae59543c61e934 SHA512 e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.5-r1.ebuild index 5cd0b2716c..fb26093bb4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build" LICENSE="LGPL-2.1+" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild index 3464207131..dc96f6b064 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.82.5.ebuild @@ -22,7 +22,7 @@ INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build" LICENSE="LGPL-2.1+" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.0.ebuild new file mode 100644 index 0000000000..ee35d4b231 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.84.0.ebuild @@ -0,0 +1,447 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..13} ) + +inherit eapi9-ver gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +INTROSPECTION_PN="gobject-introspection" +INTROSPECTION_PV="1.82.0" +INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}" +SRC_URI=" + ${SRC_URI} + introspection? ( mirror://gnome/sources/gobject-introspection/${INTROSPECTION_PV%.*}/gobject-introspection-${INTROSPECTION_PV}.tar.${GNOME_TARBALL_SUFFIX} ) +" +INTROSPECTION_SOURCE_DIR="${WORKDIR}/${INTROSPECTION_P}" +INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build" + +LICENSE="LGPL-2.1+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=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}] + introspection? ( + >=dev-libs/gobject-introspection-common-${INTROSPECTION_PV} + ) + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + >=dev-build/meson-1.4.0 + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + doc? ( >=dev-util/gi-docgen-2023.1 ) + dev-python/docutils + systemtap? ( >=dev-debug/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig + + introspection? ( + $(python_gen_any_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + sys-devel/bison + app-alternatives/lex + ${PYTHON_DEPS} + ) +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch +) + +python_check_deps() { + if use introspection ; then + python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Running gdb inside a test within sandbox is brittle + sed -i -e '/self.__gdb = shutil.which("gdb")/s:"gdb":"gdb-idonotexist":' glib/tests/assert-msg-test.py || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + sed -i -e '/install : true/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + # Link the glib source to the introspection subproject directory so it can be built there first + if use introspection ; then + ln -s "${S}" "${INTROSPECTION_SOURCE_DIR}/subprojects/glib" + fi + + default + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + # Build internal copy of gobject-introspection to avoid circular dependency (built for native abi only) + if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + einfo "Bootstrapping gobject-introspection..." + INTROSPECTION_BIN_DIR="${T}/bootstrap-gi-prefix/usr/bin" + INTROSPECTION_LIB_DIR="${T}/bootstrap-gi-prefix/usr/$(get_libdir)" + + local emesonargs=( + --prefix="${T}/bootstrap-gi-prefix/usr" + -Dpython="${EPYTHON}" + -Dbuild_introspection_data=true + # Build an internal copy of glib for the internal copy of gobject-introspection + --force-fallback-for=glib + # Make the paths in pkgconfig files relative as we used to not + # do a proper install here and it seems less risky to keep it + # this way. + -Dpkgconfig.relocatable=true + + # We want as minimal a build as possible here to speed things up + # and reduce the risk of failures. + -Dglib:selinux=disabled + -Dglib:xattr=false + -Dglib:libmount=disabled + -Dglib:man-pages=disabled + -Dglib:dtrace=false + -Dglib:systemtap=false + -Dglib:sysprof=disabled + -Dglib:documentation=false + -Dglib:tests=false + -Dglib:installed_tests=false + -Dglib:nls=disabled + -Dglib:oss_fuzz=disabled + -Dglib:libelf=disabled + -Dglib:multiarch=false + ) + + ORIG_SOURCE_DIR=${EMESON_SOURCE} + EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} + + # g-ir-scanner has some relocatable logic but it searches + # for 'lib', not 'lib64', so it can't find itself and eventually + # falls back to the system installation. See bug #946221. + sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die + + ORIG_BUILD_DIR=${BUILD_DIR} + BUILD_DIR=${INTROSPECTION_BUILD_DIR} + + pushd ${INTROSPECTION_SOURCE_DIR} || die + + meson_src_configure + meson_src_compile + # We already provide a prefix in ${T} above. Blank DESTDIR + # as it may be set in the environment by Portage (though not + # guaranteed in src_configure). + meson_src_install --destdir "" + + popd || die + + EMESON_SOURCE=${ORIG_SOURCE_DIR} + BUILD_DIR=${ORIG_BUILD_DIR} + + # Add gobject-introspection binaries and pkgconfig files to path + export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" + + # Override primary pkgconfig search paths to prioritize our internal copy + export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" + + # Set the normal primary pkgconfig search paths as secondary + # (We also need to prepend our just-built one for later use of + # g-ir-scanner to use the new one and to help workaround bugs like + # bug #946221.) + export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" + + # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them + for gliblib in glib gobject gthread gmodule gio girepository; do + export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}" + done + + # Add the path to introspection libraries so that glib can call gir utilities + export LD_LIBRARY_PATH="${INTROSPECTION_LIB_DIR}:${LD_LIBRARY_PATH}" + + # Add the paths to the gobject-introspection python modules to python path so they can be imported + export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}" + fi + + # TODO: Can this be cleaned up now we have -Dglib_debug? (bug #946485) + use debug && EMESON_BUILD_TYPE=debug + + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run + $(meson_feature debug glib_debug) + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman-pages=enabled + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_use doc documentation) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + -Dmultiarch=false + $(meson_native_use_feature introspection) + ) + + # Workaround for bug #938302 + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + # TODO: Use ${ABI} here to be unique for multilib? + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + export TZ=UTC + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + + # Related test is a bit nitpicking + mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die + + meson_src_test --timeout-multiplier 20 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + if ver_replacing "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache || die + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled || die + fi +} From 6a70ed13efe78141f14a907c6bbb971800538bb4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:14 +0000 Subject: [PATCH 036/153] dev-libs/gobject-introspection-common: Sync with Gentoo It's from Gentoo commit 2a87cb22d74289c8c49e8b13f6e990ec76a42f6f. --- .../gobject-introspection-common-1.80.1.ebuild | 4 ++-- .../gobject-introspection-common-1.82.0.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.80.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.80.1.ebuild index 04c04e48d6..084a4c9ebd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.80.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.80.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ HOMEPAGE="https://gi.readthedocs.io/" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild index e4f7e8c166..084a4c9ebd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.82.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ HOMEPAGE="https://gi.readthedocs.io/" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: From 1d5037a97d2b614a74400588dac66d558606db4a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:22 +0000 Subject: [PATCH 037/153] dev-libs/libffi: Sync with Gentoo It's from Gentoo commit b7e1c4dfa3d7044406593d3bdb8cc5fcf3702324. --- .../portage-stable/dev-libs/libffi/libffi-3.4.6-r2.ebuild | 2 +- .../portage-stable/dev-libs/libffi/libffi-3.4.6-r3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.6-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.6-r2.ebuild index 689780e012..1513432cf6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.6-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.6-r2.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}"/${MY_P} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.6-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.6-r3.ebuild index 91b74d8b3c..e71339d70d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.6-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.6-r3.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}"/${MY_P} From 540cb8597df207966849076f6f16bfdeea29a9dd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:26 +0000 Subject: [PATCH 038/153] dev-libs/libpcre2: Sync with Gentoo It's from Gentoo commit 6040d16196dfd1a09d1d51854943d7d2992c7b90. --- .../portage-stable/dev-libs/libpcre2/libpcre2-10.45.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.45.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.45.ebuild index eaf3934f09..447de7f1d5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.45.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.45.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0/3" # libpcre2-posix.so version if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="bzip2 +jit libedit +pcre16 +pcre32 +readline static-libs unicode valgrind zlib" REQUIRED_USE="?? ( libedit readline )" From 717db7fd005747f418318ed7d740e666eb3be3a5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:26 +0000 Subject: [PATCH 039/153] dev-libs/libpipeline: Sync with Gentoo It's from Gentoo commit 08e3d627c59cb580a4834fab5ff529686b5098c6. --- .../dev-libs/libpipeline/Manifest | 1 - .../libpipeline/libpipeline-1.5.7.ebuild | 23 ------------------- .../libpipeline/libpipeline-1.5.8.ebuild | 4 ++-- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/Manifest index b233cc526d..8839976f0e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/Manifest @@ -1,2 +1 @@ -DIST libpipeline-1.5.7.tar.gz 977735 BLAKE2B b8f9ff6886f8df12e3fefbfaa0cbcb1e07d7baaa8a1dfcf4bc01c17c6632b8c6a40e55395f1e4870ca391eefb1535ebbc3931fcdee51cf5f4293741e437a2f25 SHA512 bb3be954f5d826cef805f85d65759fb197c31adf80d92360c7d0caa486e0d4877510681390ca01c028b6e805f968f14e8bf4b3eca02e429529031787e7f14d84 DIST libpipeline-1.5.8.tar.gz 1070254 BLAKE2B 1feb1a9493fd0850b4e3e446619e7e042bd97d8c0bbb3e13a91d90d6cde3ca2c17fb8a3ca256f65291dadc4d8703ad5d3a795839bf8280adc4547b3ec3d2da7d SHA512 0ae94df4bd508f0e664fa5430687d64904c60d69d9565c18cacb70251f8653cb7c571325d1406c859fdd149048adce8c4b3bf028573064496d7da3436e27b9b0 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.7.ebuild deleted file mode 100644 index d1b84cfaf6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.7.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A pipeline manipulation library" -HOMEPAGE="https://libpipeline.nongnu.org/" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-libs/check )" -BDEPEND="virtual/pkgconfig" - -src_install() { - default - - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.8.ebuild index 0ab628994e..082606d74f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" From 0334768b7547bf191ce35ee5a124812ca444ec94 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:27 +0000 Subject: [PATCH 040/153] dev-libs/libsodium: Sync with Gentoo It's from Gentoo commit cebd965456e793ca743d330954d907c4074fa1dd. --- .../dev-libs/libsodium/Manifest | 2 - .../libsodium-1.0.19_p20240117.ebuild | 77 ------------------- .../libsodium/libsodium-1.0.20.ebuild | 4 +- 3 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/Manifest index 4d9f70e540..7272460709 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/Manifest @@ -1,4 +1,2 @@ -DIST libsodium-1.0.19_p20240117.tar.gz 1946650 BLAKE2B 6faa56733ed28f34d58b41a71a41d6ba6369e2f5686e01169f83d5fe955523825bd250cfd59e15515b24f67cef1610af41749b6f56bc370e7f77708a86bd7684 SHA512 2cefd883b60fba5522bf4a6f3c73f9bc54164340400377089eea8fbb01447f1137fcb7f6183845a6c5e2aad51982122a356272b4eda5452d7b550a65aa576140 -DIST libsodium-1.0.19_p20240117.tar.gz.minisig 318 BLAKE2B f951b547f53b2569ed1493dcdbff1cc93519437f56cdf97a764d61a7e1fa98b383b49d4f4a9c4b7b199e2060037971f293796e641bd689c9cd6c7ae2c90b7a20 SHA512 202f9686fabcb7b362923b7f1eeac8544c5f21e7eaa0b4cdd7329733a62a5ec9efd18713bc63187055149525a066540a6904776870d718fd3b238b71ba4b9a35 DIST libsodium-1.0.20.tar.gz 1925167 BLAKE2B 2f1d8b2dc8a65f95433132b12bdccb7e0e4750326b05c4f42ddd3a74bf568faa2515384bfe94bba2ef420aff35c515d3d44945ea5a68f72e6a73b3a9b5bb234c SHA512 7ea165f3c1b1609790e30a16348b9dfdc5731302da00c07c65e125c8ab115c75419a5631876973600f8a4b560ca2c8267001770b68f2eb3eebc9ba095d312702 DIST libsodium-1.0.20.tar.gz.minisig 318 BLAKE2B b5939a9ca9b25332c39484b3ef02ced54aa75b2dc732d384d4f42daa0b6bd276f0c3359a8cbe8c97d8ab76b8c49e9f66959dcf350e3cf00fae10a279826109ae SHA512 fc5a4282093d58eb42559f88ccf75ea3788449afda9d882d313714e448e78ef11c22ff1e52091af026f6bf3ba01917d606040b1dca240dd1a32278c901b4affb diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild deleted file mode 100644 index d358144b16..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19_p20240117.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.minisig -VERIFY_SIG_METHOD=minisig -inherit autotools multilib-minimal verify-sig - -DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library" -HOMEPAGE="https://libsodium.org" - -if [[ ${PV} == *_p* ]] ; then - MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-) - - # We use _pN to represent 'stable releases' - # These are backports from upstream to the last release branch - # See https://download.libsodium.org/libsodium/releases/README.html - SRC_URI=" - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz - verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig ) - " -else - SRC_URI=" - https://download.libsodium.org/${PN}/releases/${P}.tar.gz - verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig ) - " -fi - -S="${WORKDIR}"/${PN}-stable - -LICENSE="ISC" -SLOT="0/26" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" -IUSE="+asm static-libs +urandom" - -CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) -IUSE+=" ${CPU_USE[@]}" - -BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )" - -QA_CONFIG_IMPL_DECL_SKIP=( - _rdrand64_step # depends on target, bug #924154 -) - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.19-cpuflags.patch -) - -src_prepare() { - default - - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable asm) - $(use_enable cpu_flags_x86_aes aesni) - $(use_enable cpu_flags_x86_sse4_1 sse4_1) - $(use_enable static-libs static) - $(use_enable !urandom blocking-random) - ) - - # --disable-pie is needed on x86, see bug #512734 - # TODO: Check if still needed? - if [[ ${ABI} == x86 ]] ; then - myeconfargs+=( --disable-pie ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - default - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.20.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.20.ebuild index 969c701384..ababb4f8b4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.20.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -30,7 +30,7 @@ fi LICENSE="ISC" SLOT="0/26" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="+asm static-libs +urandom" CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) From fabfa86ef5b093aa4ab71ec175dad8cc5873ae5c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:27 +0000 Subject: [PATCH 041/153] dev-libs/libtasn1: Sync with Gentoo It's from Gentoo commit 2086137fc0381f70467ba1ddd4247c952dd77129. --- .../portage-stable/dev-libs/libtasn1/libtasn1-4.20.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libtasn1/libtasn1-4.20.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libtasn1/libtasn1-4.20.0.ebuild index adaefbd8d2..de6371cccc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libtasn1/libtasn1-4.20.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libtasn1/libtasn1-4.20.0.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" LICENSE="LGPL-2.1+" SLOT="0/6" # subslot = libtasn1 soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs test" RESTRICT="!test? ( test )" From 269140db5116eae782ff1b2deb43cb9183ddc9ad Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:31 +0000 Subject: [PATCH 042/153] dev-libs/libuv: Sync with Gentoo It's from Gentoo commit 26ca508e4986c93cddb87c892ce67abb4ce8d02b. --- .../portage-stable/dev-libs/libuv/libuv-1.50.0.ebuild | 2 +- .../portage-stable/dev-libs/libuv/metadata.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.50.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.50.0.ebuild index a3ae6ee320..42e15e3bed 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.50.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.50.0.ebuild @@ -17,7 +17,7 @@ else https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz -> ${P}.tar.gz verify-sig? ( https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz.sign -> ${P}.tar.gz.sig ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" S="${WORKDIR}/${PN}-v${PV}" fi diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/metadata.xml index 718fde52d3..eedf6d05c7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/metadata.xml @@ -1,14 +1,14 @@ - - kde@gentoo.org - Gentoo KDE Project - jsmolic@gentoo.org Jakov Smolić + + kde@gentoo.org + Gentoo KDE Project + libuv is a platform layer for node.js. Its purpose is to abstract IOCP on Windows and epoll/kqueue/event ports/etc. on Unix systems. From 41c7ab71efdb70f3a15546fea7548f235380e769 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:32 +0000 Subject: [PATCH 043/153] dev-libs/libxml2: Sync with Gentoo It's from Gentoo commit af1487919804207cbb390e8ea77e113b25bc527b. --- .../portage-stable/dev-libs/libxml2/Manifest | 1 - .../dev-libs/libxml2/libxml2-2.12.10.ebuild | 2 +- .../dev-libs/libxml2/libxml2-2.13.5.ebuild | 190 ------------------ 3 files changed, 1 insertion(+), 192 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.13.5.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest index 128b5c6636..77794ddc8c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest @@ -1,7 +1,6 @@ DIST libxml2-2.11.9.tar.xz 2627500 BLAKE2B 3ecab5df9017673f31e8bbf737273d72cb4475c3a6f0d0669e7f074b0e4d378460df2e175fe4991c675d8462a2e4d4607c151ed11937a0c8a3a4e81107102f67 SHA512 d5c34ed56525f4c6b61d7055fe4219d7a3337077b4fb27081682e9f8350f1542b4476ac42f2754e590b371a4d9a00921cebf20c10b299371b05b8391e7fa7c33 DIST libxml2-2.12.10.tar.xz 2483708 BLAKE2B b0e68457650665967936799c5b8f550a74534a820ffa1ebcf580c025681ab7f0a0941aea8e3cec93dc056e9cbe53266864635d991f8ce7662cf7b66b2c49abbd SHA512 7bd04375321a99c9b7a82d6a72d9412ab45f958b923f1e2f75d9dfbb1a053eba3e0fd067a53753f9a343b4dcb2d9ab5cba894d4194a5f9fb7108f7c545224791 DIST libxml2-2.12.9.tar.xz 2643456 BLAKE2B 769ff564e62c1c0167e5334879ac9e912491c651b6d48a9d21db569002ae86bc4e4490098710a614bc90bbefc44a9dd0af6b02958041dd3bffccf8b5ddc0f7ca SHA512 6e4544ed3ab36d6cb7481d465ceabf223444739d7f41de3e1927309b8716a5eac85520b9bbaf69913f53e052fbfaf68bf27372074daaa24dca9463ce728b4173 -DIST libxml2-2.13.5.tar.xz 2586872 BLAKE2B 46c280630638e2c8009c593bbbcf90ccbfffe9ddcc99987c4d91c2223043759f2b4d6511b31b2357c5250ac3b40d96ef05c17b4d2adc61972665f8a0d899dfe8 SHA512 acaecd4e3e95136d1c621f9e5f33976ebca87dfbf83859459e339597c3c57fbc47508a7de16af7fbf0e7e7c59fd6f9a82b2e732e1dd12efd79d666bac64ecf4e DIST libxml2-2.13.6.tar.xz 2423476 BLAKE2B b21f2946dd6945de4a47c993e93bfbbc785b51a501782bf44c234ad69675a58ccdbf6a255301c4d69e92ba9a9ed6670156e55b4d8100215f2dea015c943931ff SHA512 1d4fc3c58df28834ceeeefd49ab90b263b62823d2f0870ae38d11320da93cfa2a18d979c605293c91ad985cb702e7395ddc0ec00b4785dab35ba6d8c33d5f6a7 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.12.10.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.12.10.ebuild index 5d93bd5cb6..bd61888e5c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.12.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.12.10.ebuild @@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else inherit gnome.org - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI+=" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.13.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.13.5.ebuild deleted file mode 100644 index e27b196609..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.13.5.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2024 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_{10..13} ) -PYTHON_REQ_USE="xml(+)" -inherit autotools python-r1 multilib-minimal - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20130923.tar.gz" - -DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" - inherit git-r3 -else - inherit gnome.org - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -SRC_URI+=" - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - https://www.w3.org/XML/Test/${XMLCONF_TARBALL} - ) -" -S="${WORKDIR}/${PN}-${PV%_rc*}" - -LICENSE="MIT" -SLOT="2" -IUSE="examples icu lzma +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - virtual/libiconv - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-build/gtk-doc-am" -fi - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.12.9-icu-pkgconfig.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - else - local tarname=${P/_rc/-rc}.tar.xz - - # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${tarname} - - if [[ -n ${PATCHSET_VERSION} ]] ; then - unpack ${PN}-${PATCHSET_VERSION}.tar.xz - fi - fi - - cd "${S}" || die - - if use test ; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - #elibtoolize - - eautoreconf -} - -multilib_src_configure() { - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - --with-legacy \ - "$@" - } - - # Build python bindings separately - libxml2_configure --without-python - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_configure --with-python -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}"/python >/dev/null || die - - emake top_builddir="${NATIVE_BUILD_DIR}" "$@" - - popd >/dev/null || die -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - NATIVE_BUILD_DIR="${BUILD_DIR}" - python_foreach_impl run_in_build_dir libxml2_py_emake all - fi -} - -multilib_src_test() { - ln -s "${S}"/xmlconf || die - - emake check - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake check -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install - - # Hack until automake release is made for the optimise fix - # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 - multilib_is_native_abi && use python && python_foreach_impl python_optimize -} - -multilib_src_install_all() { - einstalldocs - - if ! use examples ; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples || die - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die - fi - - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ -n "${ROOT}" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # Need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}/etc/xml/catalog" - - # We don't want to clobber an existing catalog though, - # only ensure that one is there - # - if [[ ! -e "${CATALOG}" ]]; then - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} From ffd96b8f58367ee84cdf57df9336813e988a8059 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:32 +0000 Subject: [PATCH 044/153] dev-libs/libxslt: Sync with Gentoo It's from Gentoo commit 408c60fc30f46519f95c489f87541647dfbfef78. --- .../portage-stable/dev-libs/libxslt/Manifest | 1 + .../dev-libs/libxslt/libxslt-1.1.43.ebuild | 123 ++++++++++++++++++ .../dev-libs/libxslt/libxslt-9999.ebuild | 8 +- 3 files changed, 125 insertions(+), 7 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.43.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/Manifest index ae381d08f4..d6ddc5434a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/Manifest @@ -1,2 +1,3 @@ DIST libxslt-1.1.39.tar.xz 1578216 BLAKE2B 7c87b769d345fc99a966bea6b4e94533fa211dc3a987ce013a03eefb05dde73ef75526bdecf7d32d8c77112232096fb22d8ec4f0a781b9f59d0422a2db75df01 SHA512 c0c99dc63f8b2acb6cc3ad7ad684ffa2a427ee8d1740495cbf8a7c9b9c8679f96351b4b676c73ccc191014db4cb4ab42b9a0070f6295565f39dbc665c5c16f89 DIST libxslt-1.1.42.tar.xz 1573668 BLAKE2B 91b2ca38807ae21b6629b8e19f4ab9d7d19bc0af17f2546e1cf278b2f2fff62b86bbbd996085fff322f3d5ae6c2b20bcfc4e9fb501c301d3fd5d56cf5b205ede SHA512 02a2189b6cd65fa1fb929fc0e6868bc046bdd8827849f0048cdf9267ed9450745158cef0f2713a833e28fb520b312ff86dc5754dd423ce768c457bfd8812bdc7 +DIST libxslt-1.1.43.tar.xz 1518364 BLAKE2B 84d1cff32c78c4eeff4db614214ee1808bcf958d55711b08e7e2191a4343fb61d38d6b3d9b43f6f12be2dc909fced0a5b5905fa2c5ec7761c83125007e1ce265 SHA512 96110b0397a8f5791f489127574e2143845feb61bea0581d7b7e3c1101fd0718483bae81a7ce417b971bd678293bfd95daddad0dadd3e256c87d41a69faed85a diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.43.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.43.ebuild new file mode 100644 index 0000000000..936f69f353 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.43.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2025 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_{10..13} ) +inherit python-r1 multilib-minimal + +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt" + inherit autotools git-r3 +else + inherit libtool gnome.org + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="crypt debug examples python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND=">=virtual/pkgconfig-1" +RDEPEND=" + >=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + >=dev-libs/libxml2-2.13:2[${MULTILIB_USEDEP},python,${PYTHON_USEDEP}] + ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + else + # Prefix always needs elibtoolize if not eautoreconf'd. + elibtoolize + fi +} + +multilib_src_configure() { + libxslt_configure() { + ECONF_SOURCE="${S}" econf \ + --without-python \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_enable static-libs static) \ + "$@" + } + + # Build Python bindings separately + libxslt_configure --without-python + + if multilib_is_native_abi && use python ; then + NATIVE_BUILD_DIR="${BUILD_DIR}" + python_foreach_impl run_in_build_dir libxslt_configure --with-python + fi +} + +libxslt_py_emake() { + pushd "${BUILD_DIR}"/python >/dev/null || die + + emake top_builddir="${NATIVE_BUILD_DIR}" "$@" + + popd >/dev/null || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use python ; then + python_foreach_impl run_in_build_dir libxslt_py_emake all + fi +} + +multilib_src_test() { + default + + if multilib_is_native_abi && use python ; then + python_foreach_impl run_in_build_dir libxslt_py_emake check + fi +} + +multilib_src_install() { + # "default" does not work here - docs are installed by multilib_src_install_all + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python; then + python_foreach_impl run_in_build_dir libxslt_py_emake \ + DESTDIR="${D}" \ + install + + # Hack until automake release is made for the optimise fix + # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 + python_foreach_impl python_optimize + fi +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples ; then + rm -rf "${ED}"/usr/share/doc/${PF}/tutorial{,2} || die + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die + fi + + find "${ED}" -type f -name "*.la" -delete || die +} 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 f4388c7733..936f69f353 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,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,12 +42,6 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libxslt/xsltconfig.h ) -PATCHES=( - "${FILESDIR}"/${P}-extensions-xmlCheckFilename-older-libxml2.patch - "${FILESDIR}"/${P}-libxml2-2.13.patch - "${FILESDIR}"/${P}-deprecated-xmlCharEncodingHandler.patch -) - src_prepare() { default From 2e486fa3cdef3a63a03a482817ebbd4a0ea8d3eb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:37 +0000 Subject: [PATCH 045/153] dev-libs/mpfr: Sync with Gentoo It's from Gentoo commit c5a49b7729eb17f7c271b0f2cbf63a27b0df2d81. --- .../third_party/portage-stable/dev-libs/mpfr/mpfr-4.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.2.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.2.1.ebuild index cc2b0bfe6d..46d9b8b88a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.2.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/mpfr/mpfr-4.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 From eae2e3db5cb251d3324d008038ab845d24de564b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:37 +0000 Subject: [PATCH 046/153] dev-libs/nettle: Sync with Gentoo It's from Gentoo commit ce5e7835695f23015fc4083b6e9830ad0c4935c3. --- .../portage-stable/dev-libs/nettle/Manifest | 6 -- .../dev-libs/nettle/nettle-3.10.1.ebuild | 2 +- .../dev-libs/nettle/nettle-3.10.ebuild | 99 ------------------- .../dev-libs/nettle/nettle-3.8.1.ebuild | 84 ---------------- .../dev-libs/nettle/nettle-3.9.1-r1.ebuild | 94 ------------------ 5 files changed, 1 insertion(+), 284 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.10.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.8.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.1-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/Manifest index 29db057df0..4a30b452cd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/Manifest @@ -1,8 +1,2 @@ DIST nettle-3.10.1.tar.gz 2643267 BLAKE2B da2e82e647904e855a0e0bd1efee3b610b33de1a722f5d652deeca083d1983c5ee66754233a0917d3bb91bb5a527a3e80cd5fe18f7c25986076b2388910995b5 SHA512 e8673bbcde9cde859ccae75ed6c9c30591e68a995a7c6d724106cfd67a5a5bd45b3468d742443b6565628849d0fd29505a28ca5ee4e89dd13197cdb51429f96c DIST nettle-3.10.1.tar.gz.sig 374 BLAKE2B 1264636002893e80e3001035ce2f17a3e0077405b74050752f1901abc44c882d2be643823d3476282a8dc78bfe3f19cda75d86e00f58dbb546e4347c59cc0963 SHA512 d074a921df31070a6e6562a9f7e213e67b8e6ce331e2683e8180f387aca92058a5fe8610800817a0aa5098b47176dfcb42b52d617648c84cc6262a09ef557eb8 -DIST nettle-3.10.tar.gz 2640485 BLAKE2B edf0ba6375f06e2dd4b1e3ed4bab5f592ac04a36f748ce0461bbec32622eb3d5f96f89350926c24b5bbbf37dbe14a1ad64bba5df7cb7ad5987ec634573aabbb5 SHA512 18d5b904ce60514aa81b57bff2945e5f7f4366d4775e6a5ffc227b85be2def72b3d2159b983b75ac95a56d3167a2ef1a25b5dfc2fb6193f16a012935c36a7b34 -DIST nettle-3.10.tar.gz.sig 374 BLAKE2B 9edebae1bc1941dfc19c3c3653f80ebf66e8aed974c99673a294ff6835145ca8265f5466829e27c5d0352e88a73e9a58fb017cdbad678705ae29cd27dd80fefe SHA512 a56d46bfd545b0dff47ee6426e019afea024ebf40698018b8a4b7a25168ce615bbfe773894dc01ab246f7010ef6a7f1c248cf1f9c693f0f0dbaf27c33c7d216f -DIST nettle-3.8.1.tar.gz 2406251 BLAKE2B 22b4ec81645b579504356597ba87b637e46285682020c90e03ecaea386ac9b48eaf91ee76ae3b86b6060be355de20c320ab3b74958074ad23fc08ad9ab6a4cbb SHA512 a405da3438d185d96917b03b00abb9ab43e04f58f770f657f716c25d64bb258ee170a71328e74736caa7121f50c0c89d3cc840c1201d2a92cfaf1357d24bdc6a -DIST nettle-3.8.1.tar.gz.sig 374 BLAKE2B e2bfce4aaa1be114fb9bf8724f25db75c69c3b98538df46e9b1428ce615f7db3b9e9f9240d232fddac195db4568439b3f58989c20beca82aa6db79f4956db547 SHA512 978304b1faa5adc3b0d6ea7e9597af6154ad5d6e328913ac19184ece94771fdb2a7d5ce0af535ae8d28cb6ccd94fb3d4ef2613c0356df9e08b5d4c26ea646e09 -DIST nettle-3.9.1.tar.gz 2396741 BLAKE2B e3ceaefa19491e58f26b900beaf8b4e746feb2357c7677f5c050f257f4a23c304773446b6283a42a82cf9640e16522b8a71c47f137759f1df23cdeee4625d142 SHA512 5939c4b43cf9ff6c6272245b85f123c81f8f4e37089fa4f39a00a570016d837f6e706a33226e4bbfc531b02a55b2756ff312461225ed88de338a73069e031ced -DIST nettle-3.9.1.tar.gz.sig 374 BLAKE2B 41c37cc0ea649445c7e4bbe2d0e9ab1c6f7bb50000adef2c2ee4828e7efdd2d7c6d823d64209f251cb7d82ce85e73768430a435ee7f1d5a3732e744987918d0c SHA512 fe6f4c9746e7dbc10f61843673de95d2faea209b1caea5c7bf69b81d3f6b2248a4907012b2baf0d65e54682f835cff465482db37615b789017ce0a9e7e267d7d diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.10.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.10.1.ebuild index 1d12a68cd3..21c7bc669e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.10.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.10.1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" LICENSE="|| ( LGPL-3 LGPL-2.1 )" # Subslot = libnettle - libhogweed soname version SLOT="0/8-6" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul" # The arm64 crypto option controls AES, SHA1, and SHA2 usage. REQUIRED_USE=" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.10.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.10.ebuild deleted file mode 100644 index 4e64fde80d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.10.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nettle.asc -inherit multilib-build multilib-minimal toolchain-funcs verify-sig - -DESCRIPTION="Low-level cryptographic library" -HOMEPAGE="https://www.lysator.liu.se/~nisse/nettle/ https://git.lysator.liu.se/nettle/nettle" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" -SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" - -LICENSE="|| ( LGPL-3 LGPL-2.1 )" -# Subslot = libnettle - libhogweed soname version -SLOT="0/8-6" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul" -# The arm64 crypto option controls AES, SHA1, and SHA2 usage. -REQUIRED_USE=" - cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) - cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) - cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 ) -" - -DEPEND="gmp? ( >=dev-libs/gmp-6.1:=[static-libs?,${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" -BDEPEND=" - sys-devel/m4 - doc? ( sys-apps/texinfo ) - verify-sig? ( sec-keys/openpgp-keys-nettle ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/nettle/version.h -) - -DOCS=() -HTML_DOCS=() - -src_prepare() { - default - - # I do not see in config.sub reference to sunldsolaris. - # if someone complains readd - # -e 's/solaris\*)/sunldsolaris*)/' \ - sed -e '/CFLAGS=/s: -ggdb3::' \ - -i configure.ac configure || die - - if use doc ; then - DOCS+=( nettle.pdf ) - HTML_DOCS+=( nettle.html ) - fi -} - -multilib_src_configure() { - # We don't want to run Valgrind within ebuilds, it often gets - # confused by sandbox, etc. - export nettle_cv_prog_valgrind=no - - # TODO: USE=debug w/ --enable-extra-asserts? - local myeconfargs=( - CC_FOR_BUILD="$(tc-getBUILD_CC)" - - $(tc-is-static-only && echo --disable-shared) - - # Intrinsics - $(use_enable cpu_flags_arm_neon arm-neon) - $(use_enable cpu_flags_arm_aes arm64-crypto) - $(use_enable cpu_flags_ppc_altivec power-altivec) - $(use_enable cpu_flags_ppc_vsx2 power-crypto-ext) - $(use_enable cpu_flags_ppc_vsx3 power9) - $(use_enable cpu_flags_x86_aes x86-aesni) - $(use_enable cpu_flags_x86_sha x86-sha-ni) - $(use_enable cpu_flags_x86_pclmul x86-pclmul) - $([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions') - # TODO: cpu_flags_s390? - --disable-s390x-vf - --disable-s390x-msa - - $(use_enable asm assembler) - $(multilib_native_use_enable doc documentation) - $(use_enable gmp public-key) - $(use_enable static-libs static) - --disable-fat - - # openssl is just used for benchmarks (bug #427526) - --disable-openssl - ) - - # https://git.lysator.liu.se/nettle/nettle/-/issues/7 - if use cpu_flags_ppc_altivec && ! tc-cpp-is-true "defined(__VSX__) && __VSX__ == 1" ${CPPFLAGS} ${CFLAGS} ; then - ewarn "cpu_flags_ppc_altivec is enabled, but nettle's asm requires >=P7." - ewarn "Disabling, sorry! See bug #920234." - myeconfargs+=( --disable-power-altivec ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.8.1.ebuild deleted file mode 100644 index 168327d963..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.8.1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nettle.asc -inherit multilib-build multilib-minimal toolchain-funcs verify-sig - -DESCRIPTION="Low-level cryptographic library" -HOMEPAGE="https://www.lysator.liu.se/~nisse/nettle/ https://git.lysator.liu.se/nettle/nettle" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" -SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" - -LICENSE="|| ( LGPL-3 LGPL-2.1 )" -# Subslot = libnettle - libhogweed soname version -SLOT="0/8-6" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul" -# The arm64 crypto option controls AES, SHA1, and SHA2 usage. -REQUIRED_USE="cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) - cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) - cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )" - -DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" -BDEPEND=" - sys-devel/m4 - doc? ( sys-apps/texinfo ) - verify-sig? ( sec-keys/openpgp-keys-nettle ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/nettle/version.h -) - -DOCS=() -HTML_DOCS=() - -src_prepare() { - default - - # I do not see in config.sub reference to sunldsolaris. - # if someone complains readd - # -e 's/solaris\*)/sunldsolaris*)/' \ - sed -e '/CFLAGS=/s: -ggdb3::' \ - -i configure.ac configure || die - - if use doc ; then - DOCS+=( nettle.pdf ) - HTML_DOCS+=( nettle.html ) - fi -} - -multilib_src_configure() { - local myeconfargs=( - CC_FOR_BUILD="$(tc-getBUILD_CC)" - - $(tc-is-static-only && echo --disable-shared) - - # Intrinsics - $(use_enable cpu_flags_arm_neon arm-neon) - $(use_enable cpu_flags_arm_aes arm64-crypto) - $(use_enable cpu_flags_ppc_altivec power-altivec) - $(use_enable cpu_flags_x86_aes x86-aesni) - $(use_enable cpu_flags_x86_sha x86-sha-ni) - $(use_enable cpu_flags_x86_pclmul x86-pclmul) - # TODO: PPC crypto flag? - --disable-power-crypto-ext - # TODO: cpu_flags_s390? - --disable-s390x-vf - --disable-s390x-msa - - $(use_enable asm assembler) - $(multilib_native_use_enable doc documentation) - $(use_enable gmp public-key) - $(use_enable static-libs static) - --disable-fat - - # openssl is just used for benchmarks (bug #427526) - --disable-openssl - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.1-r1.ebuild deleted file mode 100644 index 6b40fdffe4..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.1-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nettle.asc -inherit multilib-build multilib-minimal toolchain-funcs verify-sig - -DESCRIPTION="Low-level cryptographic library" -HOMEPAGE="https://www.lysator.liu.se/~nisse/nettle/ https://git.lysator.liu.se/nettle/nettle" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" -SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" - -LICENSE="|| ( LGPL-3 LGPL-2.1 )" -# Subslot = libnettle - libhogweed soname version -SLOT="0/8-6" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul" -# The arm64 crypto option controls AES, SHA1, and SHA2 usage. -REQUIRED_USE=" - cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) - cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) - cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 ) -" - -DEPEND="gmp? ( >=dev-libs/gmp-6.1:=[static-libs?,${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" -BDEPEND=" - sys-devel/m4 - doc? ( sys-apps/texinfo ) - verify-sig? ( sec-keys/openpgp-keys-nettle ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/nettle/version.h -) - -DOCS=() -HTML_DOCS=() - -src_prepare() { - default - - # I do not see in config.sub reference to sunldsolaris. - # if someone complains readd - # -e 's/solaris\*)/sunldsolaris*)/' \ - sed -e '/CFLAGS=/s: -ggdb3::' \ - -i configure.ac configure || die - - if use doc ; then - DOCS+=( nettle.pdf ) - HTML_DOCS+=( nettle.html ) - fi -} - -multilib_src_configure() { - local myeconfargs=( - CC_FOR_BUILD="$(tc-getBUILD_CC)" - - $(tc-is-static-only && echo --disable-shared) - - # Intrinsics - $(use_enable cpu_flags_arm_neon arm-neon) - $(use_enable cpu_flags_arm_aes arm64-crypto) - $(use_enable cpu_flags_ppc_altivec power-altivec) - $(use_enable cpu_flags_ppc_vsx2 power-crypto-ext) - $(use_enable cpu_flags_ppc_vsx3 power9) - $(use_enable cpu_flags_x86_aes x86-aesni) - $(use_enable cpu_flags_x86_sha x86-sha-ni) - $(use_enable cpu_flags_x86_pclmul x86-pclmul) - $([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions') - # TODO: cpu_flags_s390? - --disable-s390x-vf - --disable-s390x-msa - - $(use_enable asm assembler) - $(multilib_native_use_enable doc documentation) - $(use_enable gmp public-key) - $(use_enable static-libs static) - --disable-fat - - # openssl is just used for benchmarks (bug #427526) - --disable-openssl - ) - - # https://git.lysator.liu.se/nettle/nettle/-/issues/7 - if use cpu_flags_ppc_altivec && ! tc-cpp-is-true "defined(__VSX__) && __VSX__ == 1" ${CPPFLAGS} ${CFLAGS} ; then - ewarn "cpu_flags_ppc_altivec is enabled, but nettle's asm requires >=P7." - ewarn "Disabling, sorry! See bug #920234." - myeconfargs+=( --disable-power-altivec ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} From 5e30452f0e106b3b6a80f6aea16b3d668129b28c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:38 +0000 Subject: [PATCH 047/153] dev-libs/oniguruma: Sync with Gentoo It's from Gentoo commit 4919baac41fd67fbbe01fcd8e0a9530d95649cdc. --- .../portage-stable/dev-libs/oniguruma/oniguruma-6.9.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.10.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.10.ebuild index e16d7d4694..0cd0a97b9e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.10.ebuild @@ -21,7 +21,7 @@ fi LICENSE="BSD-2" SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="crnl-as-line-terminator static-libs" BDEPEND="" From 6302e81072bb0d4ff8d14fd33e58b9cd921c26c2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:39 +0000 Subject: [PATCH 048/153] dev-libs/opensc: Sync with Gentoo It's from Gentoo commit cab89310ee107a97c79ade245dd7f74ec43c8e58. --- .../portage-stable/dev-libs/opensc/opensc-0.26.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.26.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.26.0.ebuild index 012ba3163d..1e196259ce 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.26.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.26.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git" else SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="LGPL-2.1+ BSD" From a2e8a13f12461e368d82a19e71521c25619d2449 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:39 +0000 Subject: [PATCH 049/153] dev-libs/openssl: Sync with Gentoo It's from Gentoo commit 25a3482b60d25142e6f7607a868722004dbcdec0. --- .../portage-stable/dev-libs/openssl/Manifest | 8 - .../dev-libs/openssl/openssl-3.0.15-r1.ebuild | 287 ---------------- .../dev-libs/openssl/openssl-3.0.16.ebuild | 2 +- .../dev-libs/openssl/openssl-3.1.7-r1.ebuild | 289 ----------------- .../dev-libs/openssl/openssl-3.1.8.ebuild | 2 +- .../dev-libs/openssl/openssl-3.2.3-r1.ebuild | 306 ------------------ .../dev-libs/openssl/openssl-3.2.4.ebuild | 2 +- .../dev-libs/openssl/openssl-3.3.2-r1.ebuild | 304 ----------------- .../dev-libs/openssl/openssl-3.3.2-r2.ebuild | 305 ----------------- .../dev-libs/openssl/openssl-3.3.2-r3.ebuild | 306 ------------------ .../dev-libs/openssl/openssl-3.4.1.ebuild | 6 +- 11 files changed, 6 insertions(+), 1811 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.0.15-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.1.7-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.2.3-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/Manifest index 52fe39948f..652f7c6c91 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/Manifest @@ -3,20 +3,12 @@ DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32 DIST openssl-1.1.1w.tar.gz 9893384 BLAKE2B 2fdba6ca0188928ab2f74e606136afca66cfa0467170fa6298ef160b64ac6fdcad1e81e5dd14013ce0e9921d0f7417edec531cd0beaf1196fec704c2c6d48395 SHA512 b4c625fe56a4e690b57b6a011a225ad0cb3af54bd8fb67af77b5eceac55cc7191291d96a660c5b568a08a2fbf62b4612818e7cca1bb95b2b6b4fc649b0552b6d DIST openssl-1.1.1w.tar.gz.asc 833 BLAKE2B d990be69ed913509d52b78e7473668429d4485adb29ef03e4612dd0cadbac4f04c7289d8e5baf6f397bcedeaac9f802f18fc719964d882ae0514ed1ca16ae277 SHA512 0f3d7aa48b1cabf8dd43e8108aeed10a4dffb4f5a244d4da9c86ea358b0c8b90c46da561d21e01c567c2f5035d824ed82ec104aad1776b7f33a1be85990e98ef -DIST openssl-3.0.15.tar.gz 15318633 BLAKE2B f2900d0894b97e86c709079ca4336d5dc508d69e91d3a4de4420c8d9344cb54dada6ea2cdd408166e53db0c652b06654e670701166b67a0a40578676e1cea535 SHA512 acd80f2f7924d90c1416946a5c61eff461926ad60f4821bb6b08845ea18f8452fd5e88a2c2c5bd0d7590a792cb8341a3f3be042fd0a5b6c9c1b84a497c347bbf -DIST openssl-3.0.15.tar.gz.asc 833 BLAKE2B 43088d6ae9e95aec8cfa08c0d338d76c2299ee89a1719a39c497b25c83a4c0c2d155fa00a62b47e15a7f2889680197741390c850d62a84ec5ce27ed1bbddcd28 SHA512 8b9471074130fd26b511820a1c2586792fd0105421515734c213ae18de27b5b026261e64d4cb8f5e7b568d1f4193484ebe0e99eda9d99df72474310a568ca3bf DIST openssl-3.0.16.tar.gz 15334967 BLAKE2B a1bcaf17c92beca6ff7f39857788120648904ef1dd25ffa2e43bd5477810e8c18751929d5ed270e7f429c569c5b5fdf069f1280646d8b4d1e879f15dfa03f7d9 SHA512 5eea2b0c60d870549fc2b8755f1220a57f870d95fbc8d5cc5abb9589f212d10945f355c3e88ff48540a7ee1c4db774b936023ca33d7c799ea82d91eef9c1c16d DIST openssl-3.0.16.tar.gz.asc 833 BLAKE2B 5f288f4b1e3a85181a73f288c7cb2d2e6e54e09b3ba032a6074c207f1f53d2920f4cdbbc9143a60063b3426eaa0279af4b1ed59b6b909047051ce73caff03584 SHA512 8b9688ecf84cb61b2718fc898eb748a8eb1ad9125f4742b09552d81bce098753dcbc36cdee9a30adbe4127de30938d955a7af12f8619338bcf2e2e748c8e8c86 -DIST openssl-3.1.7.tar.gz 15684836 BLAKE2B 1332f4b2454b6c9bf3ff2099aa343d6202bec98c6e44fba6377d5bb8efd9bf337df3a95549d874a2908f376056f6f333e6f65cbec7e27377d1ab8cbefddaa241 SHA512 bb4743c1a95148901d2d2bc51460c14cea3387c7dda9323524adbdb11334562f72aa3a873913c51ea1ffce606e675e22a74f78b3119b6a956da3f75c942cd0e2 -DIST openssl-3.1.7.tar.gz.asc 833 BLAKE2B 17220aa3274a5eda3df8c04f60f87a48fcf5c773167e746bf3f9feb6cc3c03b024a2e83b1c93122b6baa073b12417e2910230f270287be7b7f2c5300814b7fda SHA512 89b6f4b913aac8b2519aac586ba0c70a3df331eb70ea79c2aa45355bfd9430ba1af3c8ea0d31b171f55036a8cc332207787cabf58da871f400d666a5ae09ce2a DIST openssl-3.1.8.tar.gz 15706439 BLAKE2B 05d8ac054bc46ac6196470bd388ef8be2d2dd62c14bb22fff668ab8e8914bb8d89eb78119ba49839a364ca4c3683186299a9bfbf6a03d83a8630b54e668e5977 SHA512 faf066b207184a67387d4659b68de0bb89c4ec847b835998c8cc57ee4a8759f3fc3b7fe2db85f394bf8c54720ce044447168e0fa2fda6f0901c4d9a1697d9a6e DIST openssl-3.1.8.tar.gz.asc 833 BLAKE2B b9f1f439ff373d4b3706cfd9d2518d84aca1744ae50a31c50cb7fd4aa9de1d4139fc314390353377391a99b3d6c9ea66b0160d7fed15bdf4c9a255e94654eb80 SHA512 0737d62b6971f311936908d7cf3eb6c01e1ae314709bc80cfdbe885d17c64337fd2378a1e93c932f870681efc992a8d0656625580e30cc9e3d397aa4ebb7c7e6 -DIST openssl-3.2.3.tar.gz 17762604 BLAKE2B 1445336aa92d0fd9df266ad570fe2bf5701279e462dd3fccd4cf662f328bfee923dc6c72c42c1921fd38bce43e1c60cacdec3f1c2963fe0ffda6a0e8e34ac6e4 SHA512 9e9f06ab630914e32e64bfb945dfa375ea3595b3db4eb8ef68288a58909baf753b34998439907c22ff2b8561cfd3f3f6b7fbf22981479e66a98c2e92fda172a2 -DIST openssl-3.2.3.tar.gz.asc 833 BLAKE2B 5a7289ed40534a058b9eb7686ce444b9d453a2973ab7ebda01c99f7245f6ba19197123f8bb3b16940d4bfbc5e313babc0249f280e55911190b47da3a47ed1e6a SHA512 e727adb88f84c48082ef0cae963bf999cce11619f7322014cc7f36c16e8375a60542f518c1b86319208cf8da33044e942b3d65208bc59fd4a5f522ab78ff1c23 DIST openssl-3.2.4.tar.gz 17782746 BLAKE2B 079a0eb15b960a8ec89a2b2ccfa1f5e216dac325cb0857e168119fb240b6cdd78ecf723802a53d1e62e0a534be60e5459f561de764d1987e38eab466e555f994 SHA512 24712cb722ed8daff51db9deec4db982256cccd1a537d3a8690a94a6fd41815fd85cab95e551212938f28a61ed658d285b07734f7b88d8a0b18a318602d424f2 DIST openssl-3.2.4.tar.gz.asc 833 BLAKE2B 27c55522889843a14133535d47ad1fc7b2eba7a6f7fd0f78a8be8f36492ff53932b1a50131e90a37c3c22ba60b188b9dff98717756c4a20f361b22d069482399 SHA512 a381b24bd47a2e00657a29af02aa890b22186de70ba3ac3776ff5d4fb40579e9fd8356aacb6ce230d40adb6765e906b8d9bda54f98cc8887e98069f9bfd10140 -DIST openssl-3.3.2.tar.gz 18076531 BLAKE2B cc53d45418673bc2a406d6697b8bd17ff6c726463c4ccc87bb2fa5a6592d0d178dc8cfeb2fbb980ea354a5dc2c86f31c48453427c6937896c7221273e623c9b5 SHA512 5ae47bf1aed2740a33ba5df7dc7345a6738aa6bfa3c9c4de5e51742485e24b25192988d7a2c1b8201ef70056ad8abd0ca78b3d55abe24c0b0373d83b47ed9b74 -DIST openssl-3.3.2.tar.gz.asc 833 BLAKE2B c318e2dcef085b83ced77048dc136d9bc8438d49a7985f3c6ebd4ffd0e5e290ece47e8fd1074c6cc056e87b2bae2101dd58b8d70dbc0eb99aa134d776125439c SHA512 981f8438bbd541b97e745aca1bb77cde68900ce4b5ffefc9eccc2f18c675292203f6b4c7bffefde2256a442b7310d8438279b52fb21aac65921e9a529bc00067 DIST openssl-3.3.3.tar.gz 18102481 BLAKE2B c2033e357963e339faaf3b35b18c660da48616a6228e802a3ef1c4a6a51a570db42970d973868c4d57afcd3953403c9ff047317cac49a865af628abde99c2ade SHA512 4f53d963c258305f0e926d2e56fc73359c3d62adb25bfce06889eef3278652d073b9e2a4100a884c0d8ee90cb924ba258a5de4e7be6d2c7c49765167e95430d7 DIST openssl-3.3.3.tar.gz.asc 833 BLAKE2B dbb8436f7e8e015eca740ccddcbfc159884089c7540e47d03d65efcc607a28d29889f7eaf53412e50362d201941df3061e7877b6216215d4cab04bdb149d23a7 SHA512 2fde16310fc0a2985ea9df5b8485c17391a589297679687634b833b453e9c5d04ddb3b8b4f117259af9b13813ca0ea9ee6cec2d854dfc7e1add3dbb78962ccd0 DIST openssl-3.4.1.tar.gz 18346056 BLAKE2B 328a2a4f0536b15ffe6421afc99bdb5dcdf3d29f44437fdd80bbf4089f5f2658ca10907e033eda2e04c6b862e49b150ea59d8ab1807d14a3dcf64e10c32e78af SHA512 1de6307c587686711f05d1e96731c43526fa3af51e4cd94c06c880954b67f6eb4c7db3177f0ea5937d41bc1f8cadcf5bce75025b5c1a46a469376960f1001c5f diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.0.15-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.0.15-r1.ebuild deleted file mode 100644 index 2d404c45bc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.0.15-r1.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic linux-info toolchain-funcs -inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig - -DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" -HOMEPAGE="https://openssl-library.org/" - -MY_P=${P/_/-} - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/openssl/openssl.git" - - inherit git-r3 -else - SRC_URI=" - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz - verify-sig? ( - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc - ) - " - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -S="${WORKDIR}"/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0/3" # .so version of libssl/libcrypto -IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) -" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - app-alternatives/bc - sys-process/procps - ) - verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 ) -" - -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" -PDEPEND="app-misc/ca-certificates" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/openssl/configuration.h -) - -PATCHES=( - "${FILESDIR}"/${P}-CVE-2024-9143.patch -) - -pkg_setup() { - if use ktls ; then - if kernel_is -lt 4 18 ; then - ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" - else - CONFIG_CHECK="~TLS ~TLS_DEVICE" - ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" - ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" - use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" - - linux-info_pkg_setup - fi - fi - - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl doesn't work with userpriv! - if use test && use sctp ; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi -} - -src_prepare() { - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile || die - - if ! use vanilla ; then - PATCHES+=( - # Add patches which are Gentoo-specific customisations here - ) - fi - - default - - if use test && use sctp && has network-sandbox ${FEATURES} ; then - einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." - rm test/recipes/80-test_ssl_new.t || die - fi - - # Test fails depending on kernel configuration, bug #699134 - rm test/recipes/30-test_afalg.t || die -} - -src_configure() { - # Keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (bug #417795 again) - tc-is-clang && append-flags -Qunused-arguments - - # We really, really need to build OpenSSL w/ strict aliasing disabled. - # It's filled with violations and it *will* result in miscompiled - # code. This has been in the ebuild for > 10 years but even in 2022, - # it's still relevant: - # - https://github.com/llvm/llvm-project/issues/55255 - # - https://github.com/openssl/openssl/issues/12247 - # - https://github.com/openssl/openssl/issues/18225 - # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 - # Don't remove the no strict aliasing bits below! - filter-flags -fstrict-aliasing - append-flags -fno-strict-aliasing - # The OpenSSL developers don't test with LTO right now, it leads to various - # warnings/errors (which may or may not be false positives), it's considered - # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. - filter-lto - - append-flags $(test-flags-CC -Wa,--noexecstack) - - # bug #895308 - append-atomic-flags - # Configure doesn't respect LIBS - export LDLIBS="${LIBS}" - - # bug #197996 - unset APPS - # bug #312551 - unset SCRIPTS - # bug #311473 - unset CROSS_COMPILE - - tc-export AR CC CXX RANLIB RC - - multilib-minimal_src_configure -} - -multilib_src_configure() { - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths, bug #460790. - #local ec_nistp_64_gcc_128 - # - # Disable it for now though (bug #469976) - # Do NOT re-enable without substantial discussion first! - # - #echo "__uint128_t i;" > "${T}"/128.c - #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - #fi - - local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") - einfo "Using configuration: ${sslout:-(openssl knows best)}" - - # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features - local myeconfargs=( - ${sslout} - - $(use cpu_flags_x86_sse2 || echo "no-sse2") - enable-camellia - enable-ec - enable-ec2m - enable-sm2 - enable-srp - $(use elibc_musl && echo "no-async") - enable-idea - enable-mdc2 - enable-rc5 - $(use fips && echo "enable-fips") - $(use_ssl asm) - $(use_ssl ktls) - $(use_ssl rfc3779) - $(use_ssl sctp) - $(use test || echo "no-tests") - $(use_ssl tls-compression zlib) - $(use_ssl weak-ssl-ciphers) - - --prefix="${EPREFIX}"/usr - --openssldir="${EPREFIX}"${SSL_CNF_DIR} - --libdir=$(get_libdir) - - shared - threads - ) - - edo perl "${S}/Configure" "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake build_sw - - if multilib_is_native_abi; then - emake build_docs - fi -} - -multilib_src_test() { - # VFP = show subtests verbosely and show failed tests verbosely - # Normal V=1 would show everything verbosely but this slows things down. - emake HARNESS_JOBS="$(makeopts_jobs)" -Onone VFP=1 test -} - -multilib_src_install() { - # Only -j1 is supported for the install targets: - # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 - emake DESTDIR="${D}" -j1 install_sw - if use fips; then - emake DESTDIR="${D}" -j1 install_fips - # Regen this in pkg_preinst, bug 900625 - rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die - fi - - if multilib_is_native_abi; then - emake DESTDIR="${D}" -j1 install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs - fi - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die - fi -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el - - # Create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # bug #254521 - dodir /etc/sandbox.d - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_preinst() { - if use fips; then - # Regen fipsmodule.cnf, bug 900625 - ebegin "Running openssl fipsinstall" - "${ED}/usr/bin/openssl" fipsinstall -quiet \ - -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ - -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" - eend $? - fi - - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} - -pkg_postinst() { - ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" - openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" - eend $? - - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.0.16.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.0.16.ebuild index e9fc46b2c8..5af9adcda8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.0.16.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.0.16.ebuild @@ -27,7 +27,7 @@ else " if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.1.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.1.7-r1.ebuild deleted file mode 100644 index aeaa611d6f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.1.7-r1.ebuild +++ /dev/null @@ -1,289 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic linux-info toolchain-funcs -inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig - -DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" -HOMEPAGE="https://openssl-library.org/" - -MY_P=${P/_/-} - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/openssl/openssl.git" - - inherit git-r3 -else - SRC_URI=" - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz - verify-sig? ( - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc - ) - " - - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -S="${WORKDIR}"/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto -IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - !=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) -" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - app-alternatives/bc - sys-process/procps - ) - verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 ) -" - -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" -PDEPEND="app-misc/ca-certificates" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/openssl/configuration.h -) - -PATCHES=( - "${FILESDIR}"/${P}-CVE-2024-9143.patch -) - -pkg_setup() { - if use ktls ; then - if kernel_is -lt 4 18 ; then - ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" - else - CONFIG_CHECK="~TLS ~TLS_DEVICE" - ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" - ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" - use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" - - linux-info_pkg_setup - fi - fi - - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl doesn't work with userpriv! - if use test && use sctp ; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi -} - -src_prepare() { - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile - - if ! use vanilla ; then - PATCHES+=( - # Add patches which are Gentoo-specific customisations here - ) - fi - - default - - if use test && use sctp && has network-sandbox ${FEATURES} ; then - einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." - rm test/recipes/80-test_ssl_new.t || die - fi - - # Test fails depending on kernel configuration, bug #699134 - rm test/recipes/30-test_afalg.t || die -} - -src_configure() { - # Keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (bug #417795 again) - tc-is-clang && append-flags -Qunused-arguments - - # We really, really need to build OpenSSL w/ strict aliasing disabled. - # It's filled with violations and it *will* result in miscompiled - # code. This has been in the ebuild for > 10 years but even in 2022, - # it's still relevant: - # - https://github.com/llvm/llvm-project/issues/55255 - # - https://github.com/openssl/openssl/issues/12247 - # - https://github.com/openssl/openssl/issues/18225 - # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 - # Don't remove the no strict aliasing bits below! - filter-flags -fstrict-aliasing - append-flags -fno-strict-aliasing - # The OpenSSL developers don't test with LTO right now, it leads to various - # warnings/errors (which may or may not be false positives), it's considered - # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. - filter-lto - - append-flags $(test-flags-CC -Wa,--noexecstack) - - # bug #895308 - append-atomic-flags - # Configure doesn't respect LIBS - export LDLIBS="${LIBS}" - - # bug #197996 - unset APPS - # bug #312551 - unset SCRIPTS - # bug #311473 - unset CROSS_COMPILE - - tc-export AR CC CXX RANLIB RC - - multilib-minimal_src_configure -} - -multilib_src_configure() { - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths, bug #460790. - #local ec_nistp_64_gcc_128 - # - # Disable it for now though (bug #469976) - # Do NOT re-enable without substantial discussion first! - # - #echo "__uint128_t i;" > "${T}"/128.c - #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - #fi - - local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") - einfo "Using configuration: ${sslout:-(openssl knows best)}" - - # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features - local myeconfargs=( - ${sslout} - - $(use cpu_flags_x86_sse2 || echo "no-sse2") - enable-camellia - enable-ec - enable-ec2m - enable-sm2 - enable-srp - $(use elibc_musl && echo "no-async") - enable-idea - enable-mdc2 - enable-rc5 - $(use fips && echo "enable-fips") - $(use_ssl asm) - $(use_ssl ktls) - $(use_ssl rfc3779) - $(use_ssl sctp) - $(use test || echo "no-tests") - $(use_ssl tls-compression zlib) - $(use_ssl weak-ssl-ciphers) - - --prefix="${EPREFIX}"/usr - --openssldir="${EPREFIX}"${SSL_CNF_DIR} - --libdir=$(get_libdir) - - shared - threads - ) - - edo perl "${S}/Configure" "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake build_sw - - if multilib_is_native_abi; then - emake build_docs - fi -} - -multilib_src_test() { - # VFP = show subtests verbosely and show failed tests verbosely - # Normal V=1 would show everything verbosely but this slows things down. - emake HARNESS_JOBS="$(makeopts_jobs)" -Onone VFP=1 test -} - -multilib_src_install() { - # Only -j1 is supported for the install targets: - # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 - emake DESTDIR="${D}" -j1 install_sw - if use fips; then - emake DESTDIR="${D}" -j1 install_fips - # Regen this in pkg_preinst, bug 900625 - rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die - fi - - if multilib_is_native_abi; then - emake DESTDIR="${D}" -j1 install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs - fi - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die - fi -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el - - # Create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # bug #254521 - dodir /etc/sandbox.d - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_preinst() { - if use fips; then - # Regen fipsmodule.cnf, bug 900625 - ebegin "Running openssl fipsinstall" - "${ED}/usr/bin/openssl" fipsinstall -quiet \ - -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ - -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" - eend $? - fi - - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} - -pkg_postinst() { - ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" - openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" - eend $? - - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.1.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.1.8.ebuild index 59f78d81c6..417b482e59 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.1.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.1.8.ebuild @@ -27,7 +27,7 @@ else " if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.2.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.2.3-r1.ebuild deleted file mode 100644 index 15ae0fec71..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.2.3-r1.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic linux-info toolchain-funcs -inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig - -DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" -HOMEPAGE="https://openssl-library.org/" - -MY_P=${P/_/-} - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/openssl/openssl.git" - - inherit git-r3 -else - SRC_URI=" - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz - verify-sig? ( - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc - ) - " - - if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - fi -fi - -S="${WORKDIR}"/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto -IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - !=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) -" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - app-alternatives/bc - sys-process/procps - ) - verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" -PDEPEND="app-misc/ca-certificates" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/openssl/configuration.h -) - -PATCHES=( - "${FILESDIR}"/${P}-CVE-2024-9143.patch -) - -pkg_setup() { - if use ktls ; then - if kernel_is -lt 4 18 ; then - ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" - else - CONFIG_CHECK="~TLS ~TLS_DEVICE" - ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" - ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" - use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" - - linux-info_pkg_setup - fi - fi - - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl doesn't work with userpriv! - if use test && use sctp ; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi -} - -src_unpack() { - # Can delete this once test fix patch is dropped - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} - fi - - default -} - -src_prepare() { - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile - - if ! use vanilla ; then - PATCHES+=( - # Add patches which are Gentoo-specific customisations here - ) - fi - - default - - if use test && use sctp && has network-sandbox ${FEATURES} ; then - einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." - rm test/recipes/80-test_ssl_new.t || die - fi - - # Test fails depending on kernel configuration, bug #699134 - rm test/recipes/30-test_afalg.t || die -} - -src_configure() { - # Keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (bug #417795 again) - tc-is-clang && append-flags -Qunused-arguments - - # We really, really need to build OpenSSL w/ strict aliasing disabled. - # It's filled with violations and it *will* result in miscompiled - # code. This has been in the ebuild for > 10 years but even in 2022, - # it's still relevant: - # - https://github.com/llvm/llvm-project/issues/55255 - # - https://github.com/openssl/openssl/issues/12247 - # - https://github.com/openssl/openssl/issues/18225 - # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 - # Don't remove the no strict aliasing bits below! - filter-flags -fstrict-aliasing - append-flags -fno-strict-aliasing - # The OpenSSL developers don't test with LTO right now, it leads to various - # warnings/errors (which may or may not be false positives), it's considered - # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. - filter-lto - - append-flags $(test-flags-CC -Wa,--noexecstack) - - # bug #895308 -- check inserts GNU ld-compatible arguments - [[ ${CHOST} == *-darwin* ]] || append-atomic-flags - # Configure doesn't respect LIBS - export LDLIBS="${LIBS}" - - # bug #197996 - unset APPS - # bug #312551 - unset SCRIPTS - # bug #311473 - unset CROSS_COMPILE - - tc-export AR CC CXX RANLIB RC - - multilib-minimal_src_configure -} - -multilib_src_configure() { - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths, bug #460790. - #local ec_nistp_64_gcc_128 - # - # Disable it for now though (bug #469976) - # Do NOT re-enable without substantial discussion first! - # - #echo "__uint128_t i;" > "${T}"/128.c - #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - #fi - - local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") - einfo "Using configuration: ${sslout:-(openssl knows best)}" - - # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features - local myeconfargs=( - ${sslout} - - $(use cpu_flags_x86_sse2 || echo "no-sse2") - enable-camellia - enable-ec - enable-ec2m - enable-sm2 - enable-srp - $(use elibc_musl && echo "no-async") - enable-idea - enable-mdc2 - enable-rc5 - $(use fips && echo "enable-fips") - $(use_ssl asm) - $(use_ssl ktls) - $(use_ssl rfc3779) - $(use_ssl sctp) - $(use test || echo "no-tests") - $(use_ssl tls-compression zlib) - $(use_ssl weak-ssl-ciphers) - - --prefix="${EPREFIX}"/usr - --openssldir="${EPREFIX}"${SSL_CNF_DIR} - --libdir=$(get_libdir) - - shared - threads - ) - - edo perl "${S}/Configure" "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake build_sw - - if multilib_is_native_abi; then - emake build_docs - fi -} - -multilib_src_test() { - # See https://github.com/openssl/openssl/blob/master/test/README.md for options. - # - # VFP = show subtests verbosely and show failed tests verbosely - # Normal V=1 would show everything verbosely but this slows things down. - # - # -j1 here for https://github.com/openssl/openssl/issues/21999, but it - # shouldn't matter as tests were already built earlier, and HARNESS_JOBS - # controls running the tests. - emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test -} - -multilib_src_install() { - # Only -j1 is supported for the install targets: - # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 - emake DESTDIR="${D}" -j1 install_sw - if use fips; then - emake DESTDIR="${D}" -j1 install_fips - # Regen this in pkg_preinst, bug 900625 - rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die - fi - - if multilib_is_native_abi; then - emake DESTDIR="${D}" -j1 install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs - fi - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die - fi -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el - - # Create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # bug #254521 - dodir /etc/sandbox.d - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_preinst() { - if use fips; then - # Regen fipsmodule.cnf, bug 900625 - ebegin "Running openssl fipsinstall" - "${ED}/usr/bin/openssl" fipsinstall -quiet \ - -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ - -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" - eend $? - fi - - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} - -pkg_postinst() { - ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" - openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" - eend $? - - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.2.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.2.4.ebuild index 0b29b39f05..fe3dcd069e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.2.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.2.4.ebuild @@ -27,7 +27,7 @@ else " if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r1.ebuild deleted file mode 100644 index 7ea54de6cf..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r1.ebuild +++ /dev/null @@ -1,304 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic linux-info toolchain-funcs -inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig - -DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" -HOMEPAGE="https://openssl-library.org/" - -MY_P=${P/_/-} - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/openssl/openssl.git" - - inherit git-r3 -else - SRC_URI=" - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz - verify-sig? ( - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc - ) - " - - if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - fi -fi - -S="${WORKDIR}"/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto -IUSE="+asm cpu_flags_x86_sse2 fips ktls +quic rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - !=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) -" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - app-alternatives/bc - sys-process/procps - ) - verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" -PDEPEND="app-misc/ca-certificates" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/openssl/configuration.h -) - -PATCHES=( - "${FILESDIR}"/${P}-CVE-2024-9143.patch -) - -pkg_setup() { - if use ktls ; then - if kernel_is -lt 4 18 ; then - ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" - else - CONFIG_CHECK="~TLS ~TLS_DEVICE" - ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" - ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" - use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" - - linux-info_pkg_setup - fi - fi - - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl doesn't work with userpriv! - if use test && use sctp ; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi -} - -src_unpack() { - # Can delete this once test fix patch is dropped - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} - fi - - default -} - -src_prepare() { - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile || die - - if ! use vanilla ; then - PATCHES+=( - # Add patches which are Gentoo-specific customisations here - ) - fi - - default - - if use test && use sctp && has network-sandbox ${FEATURES} ; then - einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." - rm test/recipes/80-test_ssl_new.t || die - fi - - # Test fails depending on kernel configuration, bug #699134 - rm test/recipes/30-test_afalg.t || die -} - -src_configure() { - # Keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (bug #417795 again) - tc-is-clang && append-flags -Qunused-arguments - - # We really, really need to build OpenSSL w/ strict aliasing disabled. - # It's filled with violations and it *will* result in miscompiled - # code. This has been in the ebuild for > 10 years but even in 2022, - # it's still relevant: - # - https://github.com/llvm/llvm-project/issues/55255 - # - https://github.com/openssl/openssl/issues/12247 - # - https://github.com/openssl/openssl/issues/18225 - # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 - # Don't remove the no strict aliasing bits below! - filter-flags -fstrict-aliasing - append-flags -fno-strict-aliasing - # The OpenSSL developers don't test with LTO right now, it leads to various - # warnings/errors (which may or may not be false positives), it's considered - # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. - filter-lto - - append-flags $(test-flags-CC -Wa,--noexecstack) - - # bug #895308 -- check inserts GNU ld-compatible arguments - [[ ${CHOST} == *-darwin* ]] || append-atomic-flags - # Configure doesn't respect LIBS - export LDLIBS="${LIBS}" - - # bug #197996 - unset APPS - # bug #312551 - unset SCRIPTS - # bug #311473 - unset CROSS_COMPILE - - tc-export AR CC CXX RANLIB RC - - multilib-minimal_src_configure -} - -multilib_src_configure() { - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths, bug #460790. - #local ec_nistp_64_gcc_128 - # - # Disable it for now though (bug #469976) - # Do NOT re-enable without substantial discussion first! - # - #echo "__uint128_t i;" > "${T}"/128.c - #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - #fi - - local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") - einfo "Using configuration: ${sslout:-(openssl knows best)}" - - # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features - local myeconfargs=( - ${sslout} - - $(multilib_is_native_abi || echo "no-docs") - $(use cpu_flags_x86_sse2 || echo "no-sse2") - enable-camellia - enable-ec - enable-ec2m - enable-sm2 - enable-srp - $(use elibc_musl && echo "no-async") - enable-idea - enable-mdc2 - enable-rc5 - $(use fips && echo "enable-fips") - $(use quic && echo "enable-quic") - $(use_ssl asm) - $(use_ssl ktls) - $(use_ssl rfc3779) - $(use_ssl sctp) - $(use test || echo "no-tests") - $(use_ssl tls-compression zlib) - $(use_ssl weak-ssl-ciphers) - - --prefix="${EPREFIX}"/usr - --openssldir="${EPREFIX}"${SSL_CNF_DIR} - --libdir=$(get_libdir) - - shared - threads - ) - - edo perl "${S}/Configure" "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake build_sw -} - -multilib_src_test() { - # See https://github.com/openssl/openssl/blob/master/test/README.md for options. - # - # VFP = show subtests verbosely and show failed tests verbosely - # Normal V=1 would show everything verbosely but this slows things down. - # - # -j1 here for https://github.com/openssl/openssl/issues/21999, but it - # shouldn't matter as tests were already built earlier, and HARNESS_JOBS - # controls running the tests. - emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test -} - -multilib_src_install() { - # Only -j1 is supported for the install targets: - # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 - emake DESTDIR="${D}" -j1 install_sw - if use fips; then - emake DESTDIR="${D}" -j1 install_fips - # Regen this in pkg_preinst, bug 900625 - rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die - fi - - if multilib_is_native_abi; then - emake DESTDIR="${D}" -j1 install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs - fi - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die - fi -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el - - # Create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # bug #254521 - dodir /etc/sandbox.d - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_preinst() { - if use fips; then - # Regen fipsmodule.cnf, bug 900625 - ebegin "Running openssl fipsinstall" - "${ED}/usr/bin/openssl" fipsinstall -quiet \ - -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ - -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" - eend $? - fi - - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} - -pkg_postinst() { - ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" - openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" - eend $? - - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r2.ebuild deleted file mode 100644 index a141ad50c5..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r2.ebuild +++ /dev/null @@ -1,305 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic linux-info toolchain-funcs -inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig - -DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" -HOMEPAGE="https://openssl-library.org/" - -MY_P=${P/_/-} - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/openssl/openssl.git" - - inherit git-r3 -else - SRC_URI=" - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz - verify-sig? ( - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc - ) - " - - if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - fi -fi - -S="${WORKDIR}"/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto -IUSE="+asm cpu_flags_x86_sse2 fips ktls +quic rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - !=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) -" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - app-alternatives/bc - sys-process/procps - ) - verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" -PDEPEND="app-misc/ca-certificates" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/openssl/configuration.h -) - -PATCHES=( - "${FILESDIR}"/${P}-CVE-2024-9143.patch - "${FILESDIR}"/${PN}-3.3.2-silence-warning.patch -) - -pkg_setup() { - if use ktls ; then - if kernel_is -lt 4 18 ; then - ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" - else - CONFIG_CHECK="~TLS ~TLS_DEVICE" - ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" - ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" - use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" - - linux-info_pkg_setup - fi - fi - - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl doesn't work with userpriv! - if use test && use sctp ; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi -} - -src_unpack() { - # Can delete this once test fix patch is dropped - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} - fi - - default -} - -src_prepare() { - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile || die - - if ! use vanilla ; then - PATCHES+=( - # Add patches which are Gentoo-specific customisations here - ) - fi - - default - - if use test && use sctp && has network-sandbox ${FEATURES} ; then - einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." - rm test/recipes/80-test_ssl_new.t || die - fi - - # Test fails depending on kernel configuration, bug #699134 - rm test/recipes/30-test_afalg.t || die -} - -src_configure() { - # Keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (bug #417795 again) - tc-is-clang && append-flags -Qunused-arguments - - # We really, really need to build OpenSSL w/ strict aliasing disabled. - # It's filled with violations and it *will* result in miscompiled - # code. This has been in the ebuild for > 10 years but even in 2022, - # it's still relevant: - # - https://github.com/llvm/llvm-project/issues/55255 - # - https://github.com/openssl/openssl/issues/12247 - # - https://github.com/openssl/openssl/issues/18225 - # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 - # Don't remove the no strict aliasing bits below! - filter-flags -fstrict-aliasing - append-flags -fno-strict-aliasing - # The OpenSSL developers don't test with LTO right now, it leads to various - # warnings/errors (which may or may not be false positives), it's considered - # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. - filter-lto - - append-flags $(test-flags-CC -Wa,--noexecstack) - - # bug #895308 -- check inserts GNU ld-compatible arguments - [[ ${CHOST} == *-darwin* ]] || append-atomic-flags - # Configure doesn't respect LIBS - export LDLIBS="${LIBS}" - - # bug #197996 - unset APPS - # bug #312551 - unset SCRIPTS - # bug #311473 - unset CROSS_COMPILE - - tc-export AR CC CXX RANLIB RC - - multilib-minimal_src_configure -} - -multilib_src_configure() { - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths, bug #460790. - #local ec_nistp_64_gcc_128 - # - # Disable it for now though (bug #469976) - # Do NOT re-enable without substantial discussion first! - # - #echo "__uint128_t i;" > "${T}"/128.c - #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - #fi - - local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") - einfo "Using configuration: ${sslout:-(openssl knows best)}" - - # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features - local myeconfargs=( - ${sslout} - - $(multilib_is_native_abi || echo "no-docs") - $(use cpu_flags_x86_sse2 || echo "no-sse2") - enable-camellia - enable-ec - enable-ec2m - enable-sm2 - enable-srp - $(use elibc_musl && echo "no-async") - enable-idea - enable-mdc2 - enable-rc5 - $(use fips && echo "enable-fips") - $(use quic && echo "enable-quic") - $(use_ssl asm) - $(use_ssl ktls) - $(use_ssl rfc3779) - $(use_ssl sctp) - $(use test || echo "no-tests") - $(use_ssl tls-compression zlib) - $(use_ssl weak-ssl-ciphers) - - --prefix="${EPREFIX}"/usr - --openssldir="${EPREFIX}"${SSL_CNF_DIR} - --libdir=$(get_libdir) - - shared - threads - ) - - edo perl "${S}/Configure" "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake build_sw -} - -multilib_src_test() { - # See https://github.com/openssl/openssl/blob/master/test/README.md for options. - # - # VFP = show subtests verbosely and show failed tests verbosely - # Normal V=1 would show everything verbosely but this slows things down. - # - # -j1 here for https://github.com/openssl/openssl/issues/21999, but it - # shouldn't matter as tests were already built earlier, and HARNESS_JOBS - # controls running the tests. - emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test -} - -multilib_src_install() { - # Only -j1 is supported for the install targets: - # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 - emake DESTDIR="${D}" -j1 install_sw - if use fips; then - emake DESTDIR="${D}" -j1 install_fips - # Regen this in pkg_preinst, bug 900625 - rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die - fi - - if multilib_is_native_abi; then - emake DESTDIR="${D}" -j1 install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs - fi - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die - fi -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el - - # Create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # bug #254521 - dodir /etc/sandbox.d - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_preinst() { - if use fips; then - # Regen fipsmodule.cnf, bug 900625 - ebegin "Running openssl fipsinstall" - "${ED}/usr/bin/openssl" fipsinstall -quiet \ - -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ - -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" - eend $? - fi - - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} - -pkg_postinst() { - ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" - openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" - eend $? - - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r3.ebuild deleted file mode 100644 index 74109bfb1f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.3.2-r3.ebuild +++ /dev/null @@ -1,306 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic linux-info toolchain-funcs -inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig - -DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" -HOMEPAGE="https://openssl-library.org/" - -MY_P=${P/_/-} - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/openssl/openssl.git" - - inherit git-r3 -else - SRC_URI=" - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz - verify-sig? ( - https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc - ) - " - - if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - fi -fi - -S="${WORKDIR}"/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto -IUSE="+asm cpu_flags_x86_sse2 fips ktls +quic rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - !=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) -" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - app-alternatives/bc - sys-process/procps - ) - verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" -PDEPEND="app-misc/ca-certificates" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/openssl/configuration.h -) - -PATCHES=( - "${FILESDIR}"/${P}-CVE-2024-9143.patch - "${FILESDIR}"/${PN}-3.3.2-silence-warning.patch - "${FILESDIR}"/${P}-arm64-clobber.patch -) - -pkg_setup() { - if use ktls ; then - if kernel_is -lt 4 18 ; then - ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" - else - CONFIG_CHECK="~TLS ~TLS_DEVICE" - ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" - ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" - use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" - - linux-info_pkg_setup - fi - fi - - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl doesn't work with userpriv! - if use test && use sctp ; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi -} - -src_unpack() { - # Can delete this once test fix patch is dropped - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} - fi - - default -} - -src_prepare() { - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile || die - - if ! use vanilla ; then - PATCHES+=( - # Add patches which are Gentoo-specific customisations here - ) - fi - - default - - if use test && use sctp && has network-sandbox ${FEATURES} ; then - einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." - rm test/recipes/80-test_ssl_new.t || die - fi - - # Test fails depending on kernel configuration, bug #699134 - rm test/recipes/30-test_afalg.t || die -} - -src_configure() { - # Keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (bug #417795 again) - tc-is-clang && append-flags -Qunused-arguments - - # We really, really need to build OpenSSL w/ strict aliasing disabled. - # It's filled with violations and it *will* result in miscompiled - # code. This has been in the ebuild for > 10 years but even in 2022, - # it's still relevant: - # - https://github.com/llvm/llvm-project/issues/55255 - # - https://github.com/openssl/openssl/issues/12247 - # - https://github.com/openssl/openssl/issues/18225 - # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057 - # Don't remove the no strict aliasing bits below! - filter-flags -fstrict-aliasing - append-flags -fno-strict-aliasing - # The OpenSSL developers don't test with LTO right now, it leads to various - # warnings/errors (which may or may not be false positives), it's considered - # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663. - filter-lto - - append-flags $(test-flags-CC -Wa,--noexecstack) - - # bug #895308 -- check inserts GNU ld-compatible arguments - [[ ${CHOST} == *-darwin* ]] || append-atomic-flags - # Configure doesn't respect LIBS - export LDLIBS="${LIBS}" - - # bug #197996 - unset APPS - # bug #312551 - unset SCRIPTS - # bug #311473 - unset CROSS_COMPILE - - tc-export AR CC CXX RANLIB RC - - multilib-minimal_src_configure -} - -multilib_src_configure() { - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - # See if our toolchain supports __uint128_t. If so, it's 64bit - # friendly and can use the nicely optimized code paths, bug #460790. - #local ec_nistp_64_gcc_128 - # - # Disable it for now though (bug #469976) - # Do NOT re-enable without substantial discussion first! - # - #echo "__uint128_t i;" > "${T}"/128.c - #if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then - # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" - #fi - - local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") - einfo "Using configuration: ${sslout:-(openssl knows best)}" - - # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features - local myeconfargs=( - ${sslout} - - $(multilib_is_native_abi || echo "no-docs") - $(use cpu_flags_x86_sse2 || echo "no-sse2") - enable-camellia - enable-ec - enable-ec2m - enable-sm2 - enable-srp - $(use elibc_musl && echo "no-async") - enable-idea - enable-mdc2 - enable-rc5 - $(use fips && echo "enable-fips") - $(use quic && echo "enable-quic") - $(use_ssl asm) - $(use_ssl ktls) - $(use_ssl rfc3779) - $(use_ssl sctp) - $(use test || echo "no-tests") - $(use_ssl tls-compression zlib) - $(use_ssl weak-ssl-ciphers) - - --prefix="${EPREFIX}"/usr - --openssldir="${EPREFIX}"${SSL_CNF_DIR} - --libdir=$(get_libdir) - - shared - threads - ) - - edo perl "${S}/Configure" "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake build_sw -} - -multilib_src_test() { - # See https://github.com/openssl/openssl/blob/master/test/README.md for options. - # - # VFP = show subtests verbosely and show failed tests verbosely - # Normal V=1 would show everything verbosely but this slows things down. - # - # -j1 here for https://github.com/openssl/openssl/issues/21999, but it - # shouldn't matter as tests were already built earlier, and HARNESS_JOBS - # controls running the tests. - emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test -} - -multilib_src_install() { - # Only -j1 is supported for the install targets: - # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 - emake DESTDIR="${D}" -j1 install_sw - if use fips; then - emake DESTDIR="${D}" -j1 install_fips - # Regen this in pkg_preinst, bug 900625 - rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die - fi - - if multilib_is_native_abi; then - emake DESTDIR="${D}" -j1 install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs - fi - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die - fi -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el - - # Create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # bug #254521 - dodir /etc/sandbox.d - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_preinst() { - if use fips; then - # Regen fipsmodule.cnf, bug 900625 - ebegin "Running openssl fipsinstall" - "${ED}/usr/bin/openssl" fipsinstall -quiet \ - -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ - -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" - eend $? - fi - - preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} - -pkg_postinst() { - ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" - openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" - eend $? - - preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ - /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.4.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.4.1.ebuild index feb4d05614..41de3131f2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.4.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/openssl/openssl-3.4.1.ebuild @@ -26,9 +26,9 @@ else ) " - #if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then - # KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - #fi + if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 )" fi From f6ef5b5e5c4d6639f1611a221ad46ece72f9c256 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:41 +0000 Subject: [PATCH 050/153] dev-libs/tree-sitter: Sync with Gentoo It's from Gentoo commit 78f59b392f1e6fbd9972be9ecc879af3c32a0c40. --- .../dev-libs/tree-sitter/Manifest | 1 + .../tree-sitter/tree-sitter-0.25.3.ebuild | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter/tree-sitter-0.25.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter/Manifest index d6c87b9cd7..b786a6114b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter/Manifest @@ -2,3 +2,4 @@ DIST tree-sitter-0.23.0.tar.gz 2977346 BLAKE2B e10846d5bd0a6aa1ecac362e2ab2ccf0f DIST tree-sitter-0.24.3.tar.gz 3018668 BLAKE2B fa703b6250e11274d0c5ebccb741cc41f521cc5e882383d8f891369540ce6b3b4b048eddb4d0c88186e57516e2d01977e76b42352f26759b3f6093a339cc6a11 SHA512 2d934c03b0ee71419654d03bf6e4ca759b4ef3217b8837fcaef64ee5b4bc8ea8298ff685ae4aaa477b615d11d538ff960b92529b11f13e936b85bad52e369cd3 DIST tree-sitter-0.25.1.tar.gz 855493 BLAKE2B 6b9e4bf454c50e9b7341aa94d5131d333f45a0a047090ca04da71bfc54357568d0c098c6f7df65ee9d20ede7050537342fc394e281f4070f2d021a7e4134cedf SHA512 9861b18c7209e3c37d180a399bcae181cea46c4e58eff743ff6044ed0f2923ee838fa88993f1266272e07163748d5df1bef7d7dc6d8800e004e8af1227e489af DIST tree-sitter-0.25.2.tar.gz 855826 BLAKE2B 5c2cdaeba229c58d40f5d9b2c4af920d4e1d9fd60ce1d49e632cd660d441d3c32632864b1e226e4c99b4e8f054bfc0082a80c2eb1cdca0684f899b913378a17d SHA512 8acdb410c8b5c2552e9dd5524d80ab1d529e418f408d7c495619e6781f3b70ea2d61b6f69b5b3d1ebd753b739c0f9dd744302808d9a3051b5c7dcf68dba30002 +DIST tree-sitter-0.25.3.tar.gz 856455 BLAKE2B 4527d13ea702dced09d9227ad9f6a18484e8517c5da1840c22c5e69686084dbc46de0c07e7e06980e6dde4cf07791fe88fba10f90684a2ef29b58f84b59a2176 SHA512 a626dcea5378774511aa1ef669e4dbada3079440b596882172a676c61e53aa6f701b537e3575851af9e10b1e264da25a9f6487b01f43a896cf1a22d58ca7e623 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter/tree-sitter-0.25.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter/tree-sitter-0.25.3.ebuild new file mode 100644 index 0000000000..7121e61d87 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter/tree-sitter-0.25.3.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit optfeature toolchain-funcs + +DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library" +HOMEPAGE="https://github.com/tree-sitter/tree-sitter" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +fi + +LICENSE="MIT" +# ABI is not stable. Revisit after tree-sitter-1.0. +# https://bugs.gentoo.org/930039 +# https://github.com/tree-sitter/tree-sitter/pull/3302 +SLOT="0/${PV}" +RESTRICT="test" # tests are for CLI and not the lib + +PATCHES=( + "${FILESDIR}/${PN}-0.22.2-no-static.patch" +) + +src_prepare() { + default + tc-export CC +} + +src_compile() { + emake \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + STRIP="" # bug 930020 +} + +src_install() { + emake DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install +} + +pkg_postinst() { + optfeature "building and testing grammars" dev-util/tree-sitter-cli +} From 5c49811e1de1c5881463eb7fbcbdb7a311ba9717 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:41 +0000 Subject: [PATCH 051/153] dev-libs/tree-sitter-bash: Sync with Gentoo It's from Gentoo commit 73ed2fed8a7fbbac9ebed73dbca29503af8e574c. --- .../dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.3.ebuild index 184a737bbf..0b2695a345 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/tree-sitter-bash/tree-sitter-bash-0.23.3.ebuild @@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" From f2141b8fd3eed378f8354a631eb9b89227b56f05 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:41 +0000 Subject: [PATCH 052/153] dev-libs/userspace-rcu: Sync with Gentoo It's from Gentoo commit a1ee45274b94c65f7756e3a501bdb3b5d2c04f69. --- .../dev-libs/userspace-rcu/Manifest | 1 + .../userspace-rcu/userspace-rcu-0.15.1.ebuild | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/userspace-rcu-0.15.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/Manifest index d137fe3a09..94c3a37dec 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/Manifest @@ -1,3 +1,4 @@ DIST userspace-rcu-0.14.0.tar.bz2 661322 BLAKE2B ba9fa4c6dec693d2616234187db531f00fc0ade65f7e2a57182d9441728ddfa6f3e9d4544b824ca5edf7c027a43c9231d998a309c01f4bbab1eeefe856344f77 SHA512 7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f DIST userspace-rcu-0.14.1.tar.bz2 669999 BLAKE2B 6ae6a98020f731b5dc3bef5e7cf1a0b590087dbaff8836a4d2b694ad8d0d76b298261d99bea4281907cb516980b69c673d80baac17ae244e2f4fe690fc539293 SHA512 46137525854164df05326202909689b62f8f3aa6e04127eb9157a83aed8180f35a68332ec66e4e4fc9b0c046b64c64b492caed4b64f86f87a31579e4209ec345 DIST userspace-rcu-0.15.0.tar.bz2 683414 BLAKE2B 3502cd0acd6e8e1370a2fd369207a305b3138b0db3186a37a9511bcf2f9ba362787274b030b0138111fe1d4805acd95bbae00c4d2332f1a0761f02bdc7f89e38 SHA512 a0b543dcc6d1ace34c4f159074a439926bcec6708fde66db14022cfa6e8082d5d0430ad02dc036cc3902304357439bbacd89b3fc5f4ed9911716f2f0480af3e4 +DIST userspace-rcu-0.15.1.tar.bz2 682998 BLAKE2B c2b20099a4a9284f44031bb2d5f87ab03292896739115fdc741493d7f7c714b306a1981c1ff8164fb39ddf200634ddefdb757582b4891aa04cadd9dd8b51260a SHA512 164d369cc1375b6b71eaa26812aff8a294bfbdffde65c2668e5c559d215d74c1973681f8083bfde39e280ca6fe8e92aadc7c867f966a5769548b754c92389616 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/userspace-rcu-0.15.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/userspace-rcu-0.15.1.ebuild new file mode 100644 index 0000000000..76f4e1156e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/userspace-rcu/userspace-rcu-0.15.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Userspace RCU (read-copy-update) library" +HOMEPAGE="https://liburcu.org/" +SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0/8" # subslot = soname version +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( sys-process/time )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.13.1-tests-no-benchmark.patch +) + +src_prepare() { + default + + # Needed for tests patch + # ... and refresh libtool (see https://github.com/gentoo/gentoo/pull/23973) + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-shared + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" +} + +src_test() { + default + + emake -C tests/regression regtest + + # We don't run the benchmark tests. + rm tests/benchmark/test-suite.log || die +} + +src_install() { + default + + find "${ED}" -type f -name "*.la" -delete || die +} From 9149cac8999c924b29dc0d98c573412693aa5719 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:49 +0000 Subject: [PATCH 053/153] dev-python/cryptography: Sync with Gentoo It's from Gentoo commit 043ace55a1de5bd53a23a97e4261a2b26eb5d4e4. --- .../dev-python/cryptography/Manifest | 7 - .../cryptography/cryptography-44.0.0.ebuild | 135 ------------------ .../cryptography/cryptography-44.0.1.ebuild | 2 +- 3 files changed, 1 insertion(+), 143 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/cryptography/cryptography-44.0.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cryptography/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/cryptography/Manifest index 6590f0eb18..e5120ad2a2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cryptography/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/cryptography/Manifest @@ -10,11 +10,9 @@ DIST cc-1.1.6.crate 81585 BLAKE2B 412ef9d62c32a42164f8c2b827c10f0d41e75faa77e6d1 DIST cc-1.2.1.crate 92731 BLAKE2B c9cb100964834692781ecc3f47972f83adaf27e019ca212f896b19a853521cf2084da213f2c2fc5c8a1bc794cc83fe9f81faf7751e1b065a3a2a08137cda0b61 SHA512 54bc5d85d48d678d33dc795aa6cc823a59ae6d17b4ec5708a1dd515e3495eabccdd949e9467e9bb3a29e44847a2d3ccd75055dfda241d8abbb16bfad650f2819 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff DIST cryptography-43.0.3.tar.gz 686989 BLAKE2B 60efc12c020563aa0d229941d237a39e7d7243045433c7c4cf4c57a8f031569d32bfcd0e43316dd9eb3d6dd3b4e6ad8106b7bdca53c2e6c4ebb094391759da66 SHA512 965ecdbdac09ba4cf3d3289cb7f0997bfb9abd61aa663554f27651328e5da1c92edadba521b1bf779e245255e5db3da7ea8092496f845b73278ffcdd91076bbc -DIST cryptography-44.0.0.tar.gz 710657 BLAKE2B fa9d89d143e6dc84d9335cae1a38493616a5ca29ac71811c636fed961eec3311e9cabd08d7187ea05588cb2d0947509ceb028922ac13796e6160aaf991e41523 SHA512 d0aaa2160a31079412ddb7be07fd170c7e54736c315b6fbb6ee5264af0eb90be392ecd1c0e3bfb4ea071c0153ad8f47604bd6b28d4297cd9774dc55647b4e97e DIST cryptography-44.0.1.tar.gz 710819 BLAKE2B 8c6b072b4dd59d9c5698ce07da336b51759d0b98421e0767bf92c73bffc7590b1d6ce7288683305b8724755a86df115bcfde8e34dd02bedfc90730f360c01b3d SHA512 f45bebc4e92d140859f4b5c3e505c17f5b607b5fe62eed45dd4df3981d2a20a74c192d885336a47e4f3bc6e1ed785cf3a3430f81ed14fcd89a3c750d4aae10f3 DIST cryptography-44.0.2.tar.gz 710807 BLAKE2B 3bdfe1f6d4f44a77f8d5c2299e10e672eba2a68888fd5ee8ffae8a452d6c586c39bf5527feee60b62121dd7b18e13b1c91705df87ba0b52885e8538c56fec139 SHA512 12594fcd349b02a077d52b870af99850e275f13a561bbe9c993475f4ebfd35eccb63400c93a9629caf68195b759e2dbfddc3c60dc3066d063bb447acd7b17c03 DIST cryptography_vectors-43.0.3.tar.gz 35306415 BLAKE2B daf21d6bc7ba81bac2b38e0459c104117c17c3b5c6d74c3f0ba5c0da961999bc2f0fc0a088e6d3498960de70b2862867c6dd10b6e05db99352c0adc9d65104f8 SHA512 7ffbf439b84ea85a8178f6b41a349c8d3ba6586cf6513a6b13d01f55bc0fa8bb5635de2ee9afd334c5660c60cd2fc286f85b2c9c364b6e85bf4164c32fb6ca7e -DIST cryptography_vectors-44.0.0.tar.gz 35317300 BLAKE2B 3c0fc56d39447f2fbb06ffcaac82aec242e50a0341c9599c64b649ab5cf97fec740db8625269d5130a2bf20b1d34ef84b07ed451f5b221eab1acd0fee076dab1 SHA512 e6c37d7fc78c22292c04e7e6a83a5438baa13a30f724fe8bb7b72e6caf9d75a2130537e75a803c309da00f4ce30dc55a7f737415740741f384953f443c3eaf1c DIST cryptography_vectors-44.0.1.tar.gz 35317778 BLAKE2B e6e9b1b2db108aac983ef78fab31ed0ed12257d774d5d4e8fb742dc856543992f66db7c7ac5190f74aa176272b1337131ace70e89d0b0552f26432309c2727f1 SHA512 60d4aefc3aa7d18183993d96e203e7e94f323359a9f0824e9367548a1c33bd96982b6e619310a565290b5d1109e8310127f52c6478b392859788ba27fa6415b9 DIST cryptography_vectors-44.0.2.tar.gz 35318019 BLAKE2B 67ed8f4af54c4469f1da21993e7220c649b1098f6e2b82fff10f8339cfd89506d6b6f64083999998408bc60fd66172e1b33844f39d41387c7ff8cc1efc52a35d SHA512 7a75078eae4a1a46d5aa87961aa2e4f28725a2feac99ea0ce00d48aa509ce00fb43176d48eab8eabaa3f7204ba8c4b2ef78b4b65187cfd5056b3c3e3116b4239 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 @@ -38,24 +36,19 @@ DIST portable-atomic-1.7.0.crate 145385 BLAKE2B 7d9622d636677e3adae0f90940509031 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434 DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c -DIST pyo3-0.23.2.crate 1073639 BLAKE2B 01ddd26a4e347f3b6d7fee215a1894e779167730710373d59712f2119332fcf287d9c0e75d3d28baff8cf5000afb9d0e577947a26bdd8828428d33aa0f8be537 SHA512 b2b40809e1f26978c140b7ca4ecebb661a47fc01cd03fcd5c486076576c9b229de04f15ed55661db4e26545cb29110f1034a185abb623e4bf7fbb69188db335c DIST pyo3-0.23.4.crate 1087676 BLAKE2B 2c7d3530460ff687e8f60dcff0fb01465b2a4642043ebdfc927fc3824b9fbce9c4b304250808a85405d21df12d17a1d1ada7bdf8f3563710692f22223e2732f1 SHA512 0015aa75163ad0ec026d185e15c26f59aaad0eb3cc3044b146e5d703bb375fcd838df2044febbd52e6e129dfba81c8249329fc3e4805695274dac7a69eee0651 DIST pyo3-0.23.5.crate 1088533 BLAKE2B 2efae0a42c1d33e25c5871e3f61a3cea9890d278a20e2777307752b544ab3a634059bba896a1df0df4eadd0ae3c2e63b6d637aecd6699b31fac4107e3a43a387 SHA512 efd3a86dd70c199304463c0ae18dbdf4d9176d1af13b664bdd05a1e218cffda3f29f06d868d0d852d51c3e85b7e07c39617206b3feddc913b3b622f3fcf59d5f DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8 -DIST pyo3-build-config-0.23.2.crate 32197 BLAKE2B 393c76b1dcb625145673736272d4cb9d96a02df87ddcc385316652f0ff1b5595a34ebe5d789f61888c2fd82de05476c85f781d21018bd99cb630fa634afee203 SHA512 29678272073e896cb0b65efb0eaba40c82977b18efd389597aef8902e32daff51f2609c6be93ecfe0336260446c3186951f770ff449823cdde5a0518a1585c81 DIST pyo3-build-config-0.23.4.crate 33885 BLAKE2B 7f95a8a9e08d413899ff1fa64af5a52783bad4a7b4db92835464f12bd8565f152497aaeb45d25cc91eed73950abeea30ca4c7495e3b15423ae588b97038beb18 SHA512 b11442609f43d9baab79daf083caf0366987f6ae182239814ad6df6fe4ad31b95132d74f1162fa9428d229bd8c18ef9b696a4c3329b3960fd705d1705fc5e973 DIST pyo3-build-config-0.23.5.crate 33885 BLAKE2B 14e3897186abb772bcde147a9ebf2a70f5cbd634cb0240e1dbba71079acd2f9cd61fd263a5d32bc583e188ec84b6db8b93f018ab954ac9da66f423183ad5c176 SHA512 72aac032e3026554761eb81dc9c57591abc4d0c329c46918da13a8cc93c0532eba2fe3d971699a50890c66d8853b93a67840b0e8f1c15747d184b873dec2894a DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579 -DIST pyo3-ffi-0.23.2.crate 74052 BLAKE2B 085c66bae61e6059331813be77a1e4f850c4b8b12ac60b03188f2a009c9f58e062dc3ea2b9e470a480956bb8cbef645f95e53fae2638d59ebf5039aa5d41d504 SHA512 e228e473da98ce0fe4f15cf840ba1f51f66bb6fd103a7c0bb76b3218980c93b45ecf691f712333f4a27a9efc76517a85f6e13d5e9650b774eadebf59a647e493 DIST pyo3-ffi-0.23.4-pypy3_11.patch.xz 2140 BLAKE2B 29cf1a3b340241bb323192261b11a431a0b78748819dfe05683ce51c18fb53b5e9394fd4269197475d467f6be82df1fdc92e45450a1e2416ddd459bc00174b6e SHA512 43da84518b24022b82314fc509e8125ad6a9e5c47f8e2eb20da2fa38631719759ce821253a62bdd9fc3fdbedf798e9a37168c39d913570a6cfc53aca3ec0eedb DIST pyo3-ffi-0.23.4.crate 74806 BLAKE2B 650784d46347c00f09c010c39e9762f778efc510ad0b99b5ddf30cab18edaba552207339ad44ed4ae6d87ddfcc56fa540a17e3a4cb331905a0988d5ba2dc682a SHA512 c12097292b4620f4fd98d61fde4a0f0c7d423a94d518fa5b1cf759089b066fede6d83e20171acc2aa7bf268de5700c9b59da32131216734626b0fa5cd5651801 DIST pyo3-ffi-0.23.5.crate 74867 BLAKE2B 5c80f7ac77ee516a891c1cb367e27fa396e55a7504dc8f92312219a90860baba3861ca2e83a1410839b99b6b3beb4c068703b841e18ea1854f70d04fef7404bd SHA512 37c25b21acc3718eab842c04489b0c16c04d33a30fe7f3f58cd80943048203375d8788ce84153ba3720df695fc95bf9f7bccacfa02b0e669a5ddbfc44d65f86c DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a -DIST pyo3-macros-0.23.2.crate 8056 BLAKE2B a87c4b8aab972eaf5e9b941db34e18be411bed8b5753d3e2d3f65e4a18723a72e70858bb34e8db949f0c6b748e122fed41e9c78f6c20150077fcc3c4eb0026ba SHA512 dba0b5bd212b6a5f38d6fc93183c8ab80bb53bfa5f03d471897014f2d3d1959804e5fdbc817845c1cef797f314b924d58eff95cfcb848eb98b283e104d24637c DIST pyo3-macros-0.23.4.crate 8852 BLAKE2B ba5722fd52e47aa4dc2e89bacd69326bd98943a1670ebeab08a2e9e8070a0975ebbe928a0bce8b53a700b65294fee2b00d2a1e6623a0c48ac15902cdbfcb7a97 SHA512 c36c9005db5a4b48b5fda881130f4e7da8eef46e2c363c395ccca3fe476e0204d98c2a832cd03c787fb37a2664fadd42bf8f47de71eb44d055754ab5766af934 DIST pyo3-macros-0.23.5.crate 8856 BLAKE2B 56e7dea9cc630e21f9e8aa43319db27f3d287baad4035bf8d921b2c8e737142e5a89decf6a04bcc095f97e035cfe4a5edd7091bba79dd68bc110b7420c29477b SHA512 bf9c12b02597cf6f119e92fe827016f393d13cfa21376811ab9bf8f49cbfd6447afe9dcbef564ad2b5b72db5338520c37c77429db8ee1ccb74de3944fc9fce7f DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8 -DIST pyo3-macros-backend-0.23.2.crate 70067 BLAKE2B 905c0e6e5ca0c0a91af8386a632cc81f4a9b08a51a22a260188078abf9ee70d60f77e2fc0df09483d8dc6b37cd455a23b7f70f41ee74a2ad9dd0dbef39cc22c2 SHA512 dc3f8780c09c63c0e0d4f26c29a9a4e29e4fc9f14254ac8a942235e480a3f4bfa3bf073d3011e043b6c22e1999d1f68bf7b0fdf212e9edb4bfb2396a97ab0ee1 DIST pyo3-macros-backend-0.23.4.crate 70912 BLAKE2B a428c732f0b17d9a8f620d0e8d58469f2cba339c8a8307393ce252a7860808e5d50e6bbf711cafd0635c844f4b1d48e57db4dd99ef7b5e3d97d6f760164278e9 SHA512 2fe670fbf35724f489cc82f38d3f7c1e6aa15b087a2674b7a68b562572f9bb00cbb7746cccfcb62d0861a18f6d24c5739273c8302d1662a161142f4a6b532b6f DIST pyo3-macros-backend-0.23.5.crate 70938 BLAKE2B 20d5b00edf806ff19de3e3a03d10a23a29b16d544faf2bb5781032e51c3e07cd7f1a979e00b9f1abca36bc7cf1546b702ee83f85d021d74ac819b8b13bf8d140 SHA512 5e9a971d98a7b70424bf93b1f7fb326564010562dd376789be2fa6b13b89c3d34f760eb61ed49f0b013bbdfff2658d874d24a8a0b65d8f82d10d8f34b8ef5b53 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cryptography/cryptography-44.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cryptography/cryptography-44.0.0.ebuild deleted file mode 100644 index 67caafa79e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/cryptography/cryptography-44.0.0.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CARGO_OPTIONAL=yes -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=maturin -PYTHON_COMPAT=( python3_{10..13} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -CRATES=" - asn1@0.20.0 - asn1_derive@0.20.0 - autocfg@1.4.0 - base64@0.22.1 - bitflags@2.6.0 - cc@1.2.1 - cfg-if@1.0.0 - foreign-types-shared@0.1.1 - foreign-types@0.3.2 - heck@0.5.0 - indoc@2.0.5 - itoa@1.0.14 - libc@0.2.166 - memoffset@0.9.1 - once_cell@1.20.2 - openssl-macros@0.1.1 - openssl-sys@0.9.104 - openssl@0.10.68 - pem@3.0.4 - pkg-config@0.3.31 - portable-atomic@1.10.0 - proc-macro2@1.0.92 - pyo3-build-config@0.23.2 - pyo3-ffi@0.23.2 - pyo3-macros-backend@0.23.2 - pyo3-macros@0.23.2 - pyo3@0.23.2 - quote@1.0.37 - self_cell@1.0.4 - shlex@1.3.0 - syn@2.0.89 - target-lexicon@0.12.16 - unicode-ident@1.0.14 - unindent@0.2.3 - vcpkg@0.2.15 -" - -inherit cargo distutils-r1 flag-o-matic multiprocessing pypi - -VEC_P=cryptography_vectors-$(ver_cut 1-3) -DESCRIPTION="Library providing cryptographic recipes and primitives" -HOMEPAGE=" - https://github.com/pyca/cryptography/ - https://pypi.org/project/cryptography/ -" -SRC_URI+=" - ${CARGO_CRATE_URIS} - test? ( - $(pypi_sdist_url cryptography_vectors "$(ver_cut 1-3)") - ) -" - -LICENSE="|| ( Apache-2.0 BSD ) PSF-2" -# Dependent crate licenses -LICENSE+=" - Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-3.0 -" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" - -RDEPEND=" - >=dev-libs/openssl-1.0.2o-r6:0= - $(python_gen_cond_dep ' - >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}] - ' 'python*') -" -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - ${RUST_DEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/certifi[${PYTHON_USEDEP}] - >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}] - dev-python/iso8601[${PYTHON_USEDEP}] - dev-python/pretend[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - dev-python/pytest-subtests[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - ) -" - -# Files built without CFLAGS/LDFLAGS, acceptable for rust -QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so" - -distutils_enable_tests pytest - -src_unpack() { - cargo_src_unpack -} - -src_prepare() { - default - - sed -i -e 's:--benchmark-disable::' pyproject.toml || die - - # work around availability macros not supported in GCC (yet) - if [[ ${CHOST} == *-darwin* ]] ; then - local darwinok=0 - if [[ ${CHOST##*-darwin} -ge 16 ]] ; then - darwinok=1 - fi - sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \ - src/_cffi_src/openssl/src/osrandom_engine.c || die - fi -} - -python_configure_all() { - filter-lto # bug #903908 - - export UNSAFE_PYO3_SKIP_VERSION_CHECK=1 -} - -python_test() { - local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}" - local EPYTEST_IGNORE=( - tests/bench - ) - epytest -n "$(makeopts_jobs)" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cryptography/cryptography-44.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cryptography/cryptography-44.0.1.ebuild index e829f6b5fc..7c1599ff21 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cryptography/cryptography-44.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/cryptography/cryptography-44.0.1.ebuild @@ -69,7 +69,7 @@ LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-3.0 " SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" >=dev-libs/openssl-1.0.2o-r6:0= From 16a8e3262c06ddb86c5456f1d85b56a578fe5ba5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:50 +0000 Subject: [PATCH 054/153] dev-python/cython: Sync with Gentoo It's from Gentoo commit 66b2507434f83c53632141715d9bffd9d1d107f4. --- .../portage-stable/dev-python/cython/cython-3.0.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.12.ebuild index d17dfd1a11..730510625a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.12.ebuild @@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" From 5f3bbb0e7a757e0234ea69a55313370e062fe94e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:52 +0000 Subject: [PATCH 055/153] dev-python/ensurepip-setuptools: Sync with Gentoo It's from Gentoo commit 43a832dfd140bac7738bb59d0828c160ff9681da. --- .../dev-python/ensurepip-setuptools/Manifest | 3 +-- .../ensurepip-setuptools-75.8.0.ebuild | 20 ------------------- .../ensurepip-setuptools-75.8.2.ebuild | 2 +- ...ild => ensurepip-setuptools-76.0.0.ebuild} | 0 4 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.0.ebuild rename sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/{ensurepip-setuptools-75.8.1.ebuild => ensurepip-setuptools-76.0.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/Manifest index 22b5aebb84..5e1ee31959 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/Manifest @@ -1,3 +1,2 @@ -DIST setuptools-75.8.0-py3-none-any.whl 1228782 BLAKE2B 0e53d2e2d3666bce8072b23556c77a013a6db704eaa1b582a37defcd5691bb6cc66533bc9edc164911e5e5839c0c418571052a696c5c9a98b289ea232d045a38 SHA512 02760ed1215eefe7ad4beae24243fa6372d47b975a060dd69d5c521c6c53fe9ba1a6e73f39448ed9471b89371d19273824becbc8471da40cf43d3c799f0b50cf -DIST setuptools-75.8.1-py3-none-any.whl 1228867 BLAKE2B ec0fada24a666a0a32dc4bae456e40b35c0d6f87cc389a6ad917ae330e7e509a4f1a21a5c0a38cd4a5e74890c3e8e6c6be23450cd7658803f6f037b900e11b17 SHA512 ca68002ae0fabceae31d46f5e9453582bc60fc137b6e1c58d30f834a5233eeb58c60385be4a71b0feb2f3059cec5197bf4cb50f2bb94a728ebfb80f08ece8dd3 DIST setuptools-75.8.2-py3-none-any.whl 1229385 BLAKE2B e2890604e9acbf23aefc94ee99927bafdc189e45c84b0e4e0b48737d120ba60590438603195e180988b26e3e8fb378812507e2a0b513bf886c3b1eb673853da5 SHA512 083447a6bd375ca99e017ec4c5e3083ee4eee32b65d911b4d5ccadfa587ec213d43562d21d0f238753cc5c54354027b8425880d7248fbbd170b0c006613f4327 +DIST setuptools-76.0.0-py3-none-any.whl 1236106 BLAKE2B 783411ca7c3ee2f2aaaba2d40abb010f7014eb640e6ebee125e0d80afd863634eb01a10343c086b46a7b928db14d5edc6270c92129d2b20bbf0ce36229de932a SHA512 6b2af35acbd3c73f19a5eac91cc13329ef6b0c9b9dbad18fdcfabb0625215a661d320d164a08018a08a3578c5bc3aedfd9ed9ecdaaf62ef08e30fcae34a3eefb diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.0.ebuild deleted file mode 100644 index 473fddfd3c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2022-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit pypi - -DESCRIPTION="Shared setuptools wheel for ensurepip Python module" -HOMEPAGE="https://pypi.org/project/setuptools/" -SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")" -S=${DISTDIR} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -src_install() { - insinto /usr/lib/python/ensurepip - doins "${A}" -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild index b76c3f6972..473fddfd3c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild @@ -12,7 +12,7 @@ S=${DISTDIR} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" src_install() { insinto /usr/lib/python/ensurepip diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-76.0.0.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/ensurepip-setuptools/ensurepip-setuptools-76.0.0.ebuild From 3b86a0c3c440449e8a015212ae6e08594d2ca869 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:06:55 +0000 Subject: [PATCH 056/153] dev-python/flit-core: Sync with Gentoo It's from Gentoo commit 3b0f832a59f43b1a77b6be2aafb5debe33103492. --- .../dev-python/flit-core/Manifest | 1 - .../flit-core/flit-core-3.10.1.ebuild | 37 ------------------- .../flit-core/flit-core-3.11.0.ebuild | 7 +++- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.10.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flit-core/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/flit-core/Manifest index 98a12279d8..cfabffe7b4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/flit-core/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/flit-core/Manifest @@ -1,2 +1 @@ -DIST flit_core-3.10.1.tar.gz 42842 BLAKE2B bd17ab1fb955b1d829b4faaa42257176857b8a9b07132235455331cdd52943fa09fe5e4fd1091f1b15d477ec43e8084c2b409081d077c43a9a4cdbae9e8741b1 SHA512 ac0d39b6ee35b553fc8f7f3f6e558fdc32714ed64d6c506da7913ef95d00780b5f86894d9b042f32cdc51d38ec515fa02f1154b0edbc81d8e53475788c444b08 DIST flit_core-3.11.0.tar.gz 52038 BLAKE2B 6b6e0c606429fdb8123aa2dc17336003d8348f576bf26745ffa116a5e0159e20be5b8a20c541c570a825cdb2c970380f290599a09fdcc9e3bcf4158329aff9d2 SHA512 628ffd0950da88f1775c1b193ee5c6f1af06046877ca0ad66d7ae5af7df4b49759f19a4494cf15d7a1480d34c19925ce11205e7359df9fc223bca6595f94525d diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.10.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.10.1.ebuild deleted file mode 100644 index 9537812b9e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.10.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2019-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 8 -- sys-apps/portage dep -EAPI=8 - -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Simplified packaging of Python modules (core module)" -HOMEPAGE=" - https://pypi.org/project/flit-core/ - https://github.com/pypa/flit/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.{9..10}) -" -BDEPEND=" - test? ( dev-python/testpath[${PYTHON_USEDEP}] ) -" - -distutils_enable_tests pytest - -src_prepare() { - rm -r flit_core/vendor || die - sed -i -e 's:from \.vendor ::' flit_core/*.py || die - distutils-r1_src_prepare -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.11.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.11.0.ebuild index dec56b2013..1a99d14666 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.11.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.11.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" $(python_gen_cond_dep ' @@ -38,3 +38,8 @@ src_prepare() { sed -i -e 's:from \.vendor ::' flit_core/*.py || die sed -i -e '/license-files/d' pyproject.toml || die } + +python_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest +} From d5f7f2d5dbe230ca56339fa3bc923d5dc941bf83 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:01 +0000 Subject: [PATCH 057/153] dev-python/jinja2: Sync with Gentoo It's from Gentoo commit 9658842dc2f392080925dd15be449c8e4d8328ba. --- .../portage-stable/dev-python/jinja2/Manifest | 1 + .../dev-python/jinja2/jinja2-3.1.6.ebuild | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/jinja2/jinja2-3.1.6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jinja2/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/jinja2/Manifest index e12212062b..73afee13c2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/jinja2/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/jinja2/Manifest @@ -1 +1,2 @@ DIST jinja2-3.1.5.tar.gz 244674 BLAKE2B 0b3f44e5d3a5f3d898d0b678035ddaaeb30f1f7ca09555da93adbb8d7f7159a3e192809f69f47c21ce5be6f4fb1cc91bc35d4d62f2c38c71582210085091b3d7 SHA512 75ad0094482c69d45fcd3aa8ee32e249931e53fee3f804f6ddfd5b6da0ed16962d8f1fced811e7dcb4d8401fadd828e77528d6d1280547a7d4f5f77cccf9bbd4 +DIST jinja2-3.1.6.tar.gz 245115 BLAKE2B 494aa04ec2fa9fcc1d89b24148eaec371e2be70d4c6d5e24dd6b2efc6e91ebb0da92fade8667979bf26ba32c87f754ebc5d5d21d2a35f9b4ce7bc228b53a46e3 SHA512 bddd5e142f1462426c57b2efafdfafdfc6b66de257668707940896feae71eabdf19e0b6e34ef49b965153baf9b1eb59bb5a97349bb287ea0921dd2a751e967ab diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jinja2/jinja2-3.1.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/jinja2/jinja2-3.1.6.ebuild new file mode 100644 index 0000000000..8356bca57f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/jinja2/jinja2-3.1.6.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYPI_PN=jinja2 +PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 pypi + +DESCRIPTION="A full-featured template engine for Python" +HOMEPAGE=" + https://palletsprojects.com/p/jinja/ + https://github.com/pallets/jinja/ + https://pypi.org/project/Jinja2/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + +RDEPEND=" + >=dev-python/markupsafe-2.0[${PYTHON_USEDEP}] +" + +distutils_enable_sphinx docs \ + dev-python/sphinx-issues \ + dev-python/pallets-sphinx-themes +distutils_enable_tests pytest + +# XXX: handle Babel better? + +src_prepare() { + # avoid unnecessary dep on extra sphinxcontrib modules + sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die + + distutils-r1_src_prepare +} + +python_test() { + local EPYTEST_IGNORE=() + if ! has_version "dev-python/trio[${PYTHON_USEDEP}]"; then + EPYTEST_IGNORE+=( + tests/test_async.py + tests/test_async_filters.py + ) + fi + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest +} + +pkg_postinst() { + if ! has_version dev-python/babel; then + elog "For i18n support, please emerge dev-python/babel." + fi +} From 39b09aefba3d09fd90ae463869209e09427534e9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:03 +0000 Subject: [PATCH 058/153] dev-python/lxml: Sync with Gentoo It's from Gentoo commit 7a9a87fec682309ff77f3383bccc348964a84ad7. --- .../portage-stable/dev-python/lxml/Manifest | 1 - .../dev-python/lxml/lxml-5.3.0.ebuild | 119 ------------------ .../dev-python/lxml/lxml-5.3.1.ebuild | 2 +- 3 files changed, 1 insertion(+), 121 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.3.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest index 73e2f4a794..70121184a0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest @@ -1,2 +1 @@ -DIST lxml-5.3.0.gh.tar.gz 951199 BLAKE2B 8317179c524856593b323f665c288ddddd8af7e716e1ddf1222a857c8466cfc62a6c20b21744ca418f809a3c8492216c5c9c38cfa62f2e7d51daea7343b6810b SHA512 514477bf4c865541233d73f20de816b51d265dbd75c56a0d13779e14527c73e85ca890718d06c08728da228d410459016e9cb8abdad4d03b44a81a04a198fb54 DIST lxml-5.3.1.gh.tar.gz 951340 BLAKE2B e73cc8513cfe42d163b8475788472f00f2f3492deb7536b6556ed4f14924ffe57497947e660a161ec5a0821135b3d103799c0da0b9c647ccdcbfa9b0c5d6a1d9 SHA512 e89ada765791b67e4e83a9151c500f2e8d924c05d421a46bece1183666fc566d545d2e6b62987075e82cbafb8cd4b1f48f6f94e9ebcc0bbd7227d687b2282794 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.3.0.ebuild deleted file mode 100644 index 59ac331915..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.3.0.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 optfeature toolchain-funcs - -DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" -HOMEPAGE=" - https://lxml.de/ - https://pypi.org/project/lxml/ - https://github.com/lxml/lxml/ -" -SRC_URI=" - https://github.com/lxml/lxml/archive/${P}.tar.gz - -> ${P}.gh.tar.gz -" -S=${WORKDIR}/lxml-${P} - -LICENSE="BSD ElementTree GPL-2 PSF-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc examples +threads test" -RESTRICT="!test? ( test )" - -# Note: lib{xml2,xslt} are used as C libraries, not Python modules. -DEPEND=" - >=dev-libs/libxml2-2.10.3 - >=dev-libs/libxslt-1.1.38 -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - virtual/pkgconfig - >=dev-python/cython-3.0.10[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] - ') - ) - test? ( - dev-python/cssselect[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.3.0-pypy.patch" -) - -python_check_deps() { - use doc || return 0 - python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" && - python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" && - python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" && - python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" -} - -python_prepare_all() { - # don't use some random SDK on Darwin - sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \ - setupinfo.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - local DISTUTILS_ARGS=( - # by default it adds -w to CFLAGS - --warnings - ) - tc-export PKG_CONFIG - distutils-r1_python_compile -} - -python_compile_all() { - use doc && emake html -} - -python_test() { - local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml - local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH} - - cp -al "${BUILD_DIR}"/{install,test} || die - cp -al src/lxml/tests "${dir}/" || die - cp -al src/lxml/html/tests "${dir}/html/" || die - mkdir "${dir}"/../../doc || die - # this one needs to be copied, because upstream uses doc/../../../doc - cp -r "${S}"/doc "${dir}"/../../ || die - ln -s "${S}"/doc "${dir}"/../../../../ || die - - "${EPYTHON}" test.py --no-src -vv --all-levels -p || - die "Tests fail on ${EPYTHON}" -} - -python_install_all() { - if use doc; then - local DOCS=( README.rst *.txt doc/*.txt ) - local HTML_DOCS=( doc/html/. ) - fi - if use examples; then - dodoc -r samples - fi - - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4 - optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect - optfeature "Support for lxml.html.clean sanitizer" dev-python/lxml-html-clean -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.3.1.ebuild index 8e79faafc6..e5ff274131 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.3.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.3.1.ebuild @@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P} LICENSE="BSD ElementTree GPL-2 PSF-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc examples +threads test" RESTRICT="!test? ( test )" From 9850a1011c020e0bbc4c28d2213bb2a512e76c3a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:09 +0000 Subject: [PATCH 059/153] dev-python/pip: Sync with Gentoo It's from Gentoo commit 3af1a248a5cd753ea6ae9cca95a870f70fbf6cfa. --- .../pip/files/pip-25.0.1-scripttest-2.patch | 43 +++++++++++++++++++ .../dev-python/pip/pip-25.0.1-r1.ebuild | 14 +++--- 2 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-25.0.1-scripttest-2.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-25.0.1-scripttest-2.patch b/sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-25.0.1-scripttest-2.patch new file mode 100644 index 0000000000..950f70c192 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pip/files/pip-25.0.1-scripttest-2.patch @@ -0,0 +1,43 @@ +From 3c77c106330ca77883e9e3c7a150032bb5db73fd Mon Sep 17 00:00:00 2001 +From: Richard Si +Date: Sat, 8 Mar 2025 10:44:32 -0500 +Subject: [PATCH] tests: Use script.scratch_path over script.temp_path + +script.temp_path is the system temporary directory. scripttest will +check that there aren't any dangling files left in there, thus it's +inappropriate to write long-lived packages there. + +These tests are currently passing as scripttest's temporary file +detection logic is broken. However, a newer version of scripttest will +fail. +--- + tests/functional/test_cli.py | 2 +- + tests/functional/test_pep517.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py +index 65946a1f46a..366d0129b2d 100644 +--- a/tests/functional/test_cli.py ++++ b/tests/functional/test_cli.py +@@ -24,7 +24,7 @@ def test_entrypoints_work(entrypoint: str, script: PipTestEnvironment) -> None: + if script.zipapp: + pytest.skip("Zipapp does not include entrypoints") + +- fake_pkg = script.temp_path / "fake_pkg" ++ fake_pkg = script.scratch_path / "fake_pkg" + fake_pkg.mkdir() + fake_pkg.joinpath("setup.py").write_text( + dedent( +diff --git a/tests/functional/test_pep517.py b/tests/functional/test_pep517.py +index fd9380d0eb6..34ddd6633ce 100644 +--- a/tests/functional/test_pep517.py ++++ b/tests/functional/test_pep517.py +@@ -252,7 +252,7 @@ def test_pep517_backend_requirements_satisfied_by_prerelease( + script.pip("install", "test_backend", "--no-index", "-f", data.backends) + + project_dir = make_project( +- script.temp_path, ++ script.scratch_path, + requires=["test_backend", "myreq"], + backend="test_backend", + ) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-25.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-25.0.1-r1.ebuild index c29b754e9b..63c7a8d8d9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-25.0.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/pip/pip-25.0.1-r1.ebuild @@ -6,11 +6,11 @@ EAPI=8 # please bump dev-python/ensurepip-pip along with this package! DISTUTILS_USE_PEP517=setuptools -PYTHON_TESTED=( pypy3 python3_{10..13} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3_11 ) +PYTHON_TESTED=( pypy3 pypy3_11 python3_{10..13} ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) PYTHON_REQ_USE="ssl(+),threads(+)" -inherit bash-completion-r1 distutils-r1 +inherit distutils-r1 shell-completion DESCRIPTION="The PyPA recommended tool for installing Python packages" HOMEPAGE=" @@ -76,6 +76,8 @@ python_prepare_all() { "${FILESDIR}/pip-23.1-no-coverage.patch" # prepare to unbundle dependencies "${FILESDIR}/pip-25.0.1-unbundle.patch" + # https://github.com/pypa/pip/pull/13272 + "${FILESDIR}/${P}-scripttest-2.patch" ) distutils-r1_python_prepare_all @@ -137,7 +139,7 @@ python_test() { ) case ${EPYTHON} in - pypy3) + pypy3*) EPYTEST_DESELECT+=( # unexpected tempfiles? tests/functional/test_install_config.py::test_do_not_prompt_for_authentication @@ -169,7 +171,5 @@ python_install_all() { distutils-r1_python_install_all newbashcomp completion.bash pip - - insinto /usr/share/zsh/site-functions - newins completion.zsh _pip + newzshcomp completion.zsh _pip } From be31b43c456396c6a1e46fe2f8dd6fdd096c3ae2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:11 +0000 Subject: [PATCH 060/153] dev-python/poetry-core: Sync with Gentoo It's from Gentoo commit 2a3a9fceb72790067999ed1a89e03eb93a2a82ca. --- .../dev-python/poetry-core/Manifest | 2 - .../poetry-core/poetry-core-2.0.1.ebuild | 69 ------------------- .../poetry-core/poetry-core-2.1.0.ebuild | 69 ------------------- .../poetry-core/poetry-core-2.1.1.ebuild | 2 +- 4 files changed, 1 insertion(+), 141 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.0.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.1.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/Manifest index 41f79c5a5b..8f098cf247 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/Manifest @@ -1,3 +1 @@ -DIST poetry_core-2.0.1.tar.gz 355487 BLAKE2B 84bbeb7129c13d3ed1a06fbcbdcb8e1a1a608c35d398bdbf35ea70c467adbbe5d293945fecdf90e7795122af2a3f5d9fa64a99e56ee37a197ea022d271f10a15 SHA512 dd1d303abd034fc0341aaa5fc8d11f13ef305e93b9e9036f4040c2cb007c8b1eecbdb719d2b5692530b80ecc06d416751a45c499f373a05b7066e56785d1a8e8 -DIST poetry_core-2.1.0.tar.gz 362182 BLAKE2B 6f2636e76c037199b8303a58dc7cd28edc9f0359620f803a2ec2d314e1b7254aa1226eec760f425517ce318bed1cbc5c0baf7fdceec8f48b0ee8e8683ede511c SHA512 6b32bc9326766c5df21ad749f2f67d24ee4feea0abe3234206b09a5146a0a52c4b79931d3044d4259e60f1bc8c369035309bab08710893b7e541c2fcf3f4b54d DIST poetry_core-2.1.1.tar.gz 362210 BLAKE2B 03eb8b3de0138468b04b42003eb9a491c33ddb566647b933ca992f609b956ce9c27f874c61496fdd9a0d9ee0b02bda09524636ef550221f607a50792be8f73b4 SHA512 6624530062196c9a40be73d74a8dd51cfa8af8f34705837c5101b3955252e94fd136b32259887796ea304b77cfcd35042bf391fe78174f22faeebe77247605c4 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.0.1.ebuild deleted file mode 100644 index 41a1b6b897..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.0.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2022-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=standalone -PYTHON_TESTED=( pypy3 python3_{10..13} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3_11 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Poetry PEP 517 Build Backend" -HOMEPAGE=" - https://github.com/python-poetry/poetry-core/ - https://pypi.org/project/poetry-core/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" - -# check inside vendors/pyproject.toml -# (note that some are indirect deps) -RDEPEND=" - >=dev-python/fastjsonschema-2.21.1[${PYTHON_USEDEP}] - >=dev-python/lark-1.2.2[${PYTHON_USEDEP}] - >=dev-python/packaging-24.2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/tomli-2.2.1[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/build[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/tomli-w[${PYTHON_USEDEP}] - >=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20.21[${PYTHON_USEDEP}] - dev-vcs/git - ' "${PYTHON_TESTED[@]}") - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # remove vendoring of dependencies - rm -r src/poetry/core/_vendor || die - sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die - - distutils-r1_src_prepare -} - -python_test() { - if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then - einfo "Skipping tests on ${EPYTHON} (unported deps)" - return - fi - - # Poetry expects test to be run inside a git repository, otherwise - # VCS-related logic doesn't get triggered. An empty repository - # suffices, though. - git init || die - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p pytest_mock -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.1.0.ebuild deleted file mode 100644 index 5c2c2b8048..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.1.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2022-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=standalone -PYTHON_TESTED=( pypy3 pypy3_11 python3_{10..13} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) - -inherit distutils-r1 pypi - -DESCRIPTION="Poetry PEP 517 Build Backend" -HOMEPAGE=" - https://github.com/python-poetry/poetry-core/ - https://pypi.org/project/poetry-core/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" - -# check inside vendors/pyproject.toml -# (note that some are indirect deps) -RDEPEND=" - >=dev-python/fastjsonschema-2.21.1[${PYTHON_USEDEP}] - >=dev-python/lark-1.2.2[${PYTHON_USEDEP}] - >=dev-python/packaging-24.2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/tomli-2.2.1[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/build[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/tomli-w[${PYTHON_USEDEP}] - >=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20.21[${PYTHON_USEDEP}] - dev-vcs/git - ' "${PYTHON_TESTED[@]}") - ) -" - -distutils_enable_tests pytest - -src_prepare() { - # remove vendoring of dependencies - rm -r src/poetry/core/_vendor || die - sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die - - distutils-r1_src_prepare -} - -python_test() { - if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then - einfo "Skipping tests on ${EPYTHON} (unported deps)" - return - fi - - # Poetry expects test to be run inside a git repository, otherwise - # VCS-related logic doesn't get triggered. An empty repository - # suffices, though. - git init || die - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p pytest_mock -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.1.1.ebuild index 5c2c2b8048..1a278a88e9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.1.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/poetry-core/poetry-core-2.1.1.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" # check inside vendors/pyproject.toml # (note that some are indirect deps) From 5603a9e4046d0f16859c43d54989c6909c652e24 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:16 +0000 Subject: [PATCH 061/153] dev-python/setuptools: Sync with Gentoo It's from Gentoo commit f6c98ddc9e6dba4a1e9f391050ce08a9b4c72315. --- .../dev-python/setuptools/Manifest | 3 +- .../setuptools/setuptools-75.8.0.ebuild | 133 ------------------ .../setuptools/setuptools-75.8.2.ebuild | 2 +- ...75.8.1.ebuild => setuptools-76.0.0.ebuild} | 0 4 files changed, 2 insertions(+), 136 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-75.8.0.ebuild rename sdk_container/src/third_party/portage-stable/dev-python/setuptools/{setuptools-75.8.1.ebuild => setuptools-76.0.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest index f7aae64dee..8a9a2a399b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest @@ -1,3 +1,2 @@ -DIST setuptools-75.8.0.tar.gz 1343222 BLAKE2B a71cba4c11ede52aae24e8a8045f2733f93001b896ea4dd46ebdfa0dd639fccfcc24b038cf4f9b6363b768e98d66cbeac2331cbcd4bb38767ea73f1811a11837 SHA512 4afa657c5259f9f405c39d82d8c264236749861ba2b104e8b26dd49da8ffb27ad3089ea894f2bb65208f480d7a4042114b93228f1cf2b224dc248774d7681a3d -DIST setuptools-75.8.1.tar.gz 1343534 BLAKE2B c68a054bbb9367416b9c801d330699f96016e5e22459dfd833a8d1f62d908473f3909083261e8fe41c2ac0cbbdd571800321ad133c4821837be618cb46c8b5cb SHA512 6177074601f10b4d1eff52aa9be80eb52f4f2fc74f0e54d10d556a0812b2de9568ab9d7bc3692fc286b54070728fe41c41d2271403403d0d757733fe2ac74a8f DIST setuptools-75.8.2.tar.gz 1344083 BLAKE2B 7d4dff2c0948bb411ef5f70e5f5f91bc0e230b155a97419d263f88e54a94390fd7dcadad14105f4d886a25024bf4c95e776ae7b25e4b1d6f17e45e6060b99da2 SHA512 adf7f5d2eab7621b03c86e3f96857b176631108dc8a0eba2b16b87e394bff0b607998bc24cc074cd3f7b0ed6dbe0bd753cce5af2f108fce2473fb50b22f32913 +DIST setuptools-76.0.0.tar.gz 1349387 BLAKE2B 4293d1b0719c70c17bde8b6091f394420a300175b787f0a1aa5a42cc81b4dfad186f1d0927b32124f37f78a730a049e16cfd87dbc71fa1ed5c1bb632634ece84 SHA512 8272f0f2823d8f093d24eeb12270f978dab52d1a609c08275248024decf2b47bc5b1ce352f22ea198bd93eb3375c829757e573921721e05f5269651669df9b2e diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-75.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-75.8.0.ebuild deleted file mode 100644 index 2c3d96da67..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-75.8.0.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 8 -- sys-apps/portage dep -EAPI=8 - -# please bump dev-python/ensurepip-setuptools along with this package! - -DISTUTILS_USE_PEP517=standalone -PYTHON_TESTED=( python3_{10..13} pypy3 pypy3_11 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13t ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 pypi - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE=" - https://github.com/pypa/setuptools/ - https://pypi.org/project/setuptools/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !=dev-python/jaraco-functools-4[${PYTHON_USEDEP}] - >=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}] - >=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}] - >=dev-python/packaging-24.2[${PYTHON_USEDEP}] - >=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}] - >=dev-python/wheel-0.44.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] - ' 3.10) - !<=dev-libs/gobject-introspection-1.76.1-r0 - !=dev-libs/gobject-introspection-1.78.1-r0 - !=dev-libs/gobject-introspection-1.80.1-r1 -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - >=dev-python/build-1.0.3[${PYTHON_USEDEP}] - >=dev-python/ini2toml-0.14[${PYTHON_USEDEP}] - >=dev-python/filelock-3.4.0[${PYTHON_USEDEP}] - >=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}] - >=dev-python/jaraco-path-3.7.2[${PYTHON_USEDEP}] - >=dev-python/jaraco-test-5.5[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pip-run[${PYTHON_USEDEP}] - dev-python/pyproject-hooks[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - >=dev-python/pytest-home-0.5[${PYTHON_USEDEP}] - dev-python/pytest-subprocess[${PYTHON_USEDEP}] - dev-python/pytest-timeout[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - ) -" -# setuptools-scm is here because installing plugins apparently breaks stuff at -# runtime, so let's pull it early. See bug #663324. -# -# trove-classifiers are optionally used in validation, if they are -# installed. Since we really oughtn't block them, let's always enforce -# the newest version for the time being to avoid errors. -# https://github.com/pypa/setuptools/issues/4459 -PDEPEND=" - dev-python/setuptools-scm[${PYTHON_USEDEP}] - >=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}] -" - -src_prepare() { - local PATCHES=( - # TODO: remove this when we're 100% PEP517 mode - "${FILESDIR}/setuptools-62.4.0-py-compile.patch" - # https://github.com/abravalheri/validate-pyproject/pull/221 - "${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch" - ) - - distutils-r1_src_prepare - - # breaks tests - sed -i -e '/--import-mode/d' pytest.ini || die - - # remove bundled dependencies - rm -r */_vendor || die -} - -python_test() { - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then - return - fi - - local EPYTEST_DESELECT=( - # network - setuptools/tests/test_build_meta.py::test_legacy_editable_install - setuptools/tests/test_distutils_adoption.py - setuptools/tests/test_editable_install.py - setuptools/tests/test_virtualenv.py::test_no_missing_dependencies - setuptools/tests/test_virtualenv.py::test_test_command_install_requirements - # TODO - setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic - setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors - # expects bundled deps in virtualenv - setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist - setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel - # fails if python-xlib is installed - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts - # TODO, probably some random package - setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass - # broken by unbundling - setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata - # fails on normalized metadata, perhaps different dep version? - setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config - # TODO - setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist - # relies on -Werror - setuptools/_static.py::setuptools._static.Dict - setuptools/_static.py::setuptools._static.List - ) - - local EPYTEST_XDIST=1 - local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH} - epytest -o tmp_path_retention_policy=all \ - -m "not uses_network" setuptools -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-75.8.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-75.8.2.ebuild index dac8b7007e..2c3d96da67 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-75.8.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-75.8.2.ebuild @@ -21,7 +21,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-75.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-76.0.0.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-75.8.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-76.0.0.ebuild From e68e1ea2ffeb04dd5e6991bebacb8cb9800e14ef Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:17 +0000 Subject: [PATCH 062/153] dev-python/setuptools-scm: Sync with Gentoo It's from Gentoo commit 0e0c5a265e2a3024631be7d4ac8f511ce442f7c5. --- .../dev-python/setuptools-scm/Manifest | 1 - .../setuptools-scm-8.1.0.ebuild | 61 ------------------- .../setuptools-scm-8.2.0.ebuild | 2 +- 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/Manifest index 9bff7a7eab..ddd6fc517f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/Manifest @@ -1,2 +1 @@ -DIST setuptools_scm-8.1.0.tar.gz 76465 BLAKE2B f50a1c25c93179809cb448dbaeab9d71596c729e374c88c2f8d9f5f7a1d746a001f9aa9fb93478679f1c1af96f35313e1250f96375f56310a4b814ee0542ed52 SHA512 205f1c122539d107a61a7ef01ff9ec225f7b2e6d92fc33a9f2a0c616051cbf32163ac4e6878d898e51cc1ff81fce6c6521a18fc5e09bdbc9d7d2467ba013c57f DIST setuptools_scm-8.2.0.tar.gz 77572 BLAKE2B 105ddebf318a1bc0d1f0ee0e5232f5af8a43a8ed0908bd6ffceb6ba188ff8640b681a0a98006f67cc8c2f82917e6e0565f8a1aba44e8d7ff29700e3d158dde22 SHA512 3f4c4eb8a3e4f71a29187486cdc00b1e9af9b577c55a58b5ad03e6c6bad50b638b2e23ed8ee3db739481f8380d126635b42213b16172e79ba9f6ec81ce774e27 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild deleted file mode 100644 index cacddcb004..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 8 -- sys-apps/portage dep -EAPI=8 - -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..13} python3_13t pypy3 pypy3_11 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Manage versions by scm tags via setuptools" -HOMEPAGE=" - https://github.com/pypa/setuptools-scm/ - https://pypi.org/project/setuptools-scm/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -# there's an optional dep on rich for cute logs -RDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/build[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-vcs/git - ) -" - -distutils_enable_tests pytest - -python_test() { - local EPYTEST_DESELECT=( - # the usual nondescript gpg-agent failure - testing/test_git.py::test_git_getdate_signed_commit - - # fetching from the Internet - testing/test_regressions.py::test_pip_download - - # calls flake8, unpredictable - testing/test_functions.py::test_dump_version_flake8 - ) - - if has_version dev-python/nose; then - EPYTEST_DESELECT+=( - # https://bugs.gentoo.org/892639 - testing/test_integration.py::test_pyproject_support - ) - fi - - epytest -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-8.2.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-8.2.0.ebuild index b3466e7f8a..c99de4cc8f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-8.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-8.2.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # there's an optional dep on rich for cute logs RDEPEND=" From 203c66607f42e83ef359b68985833518b77dc99b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:19 +0000 Subject: [PATCH 063/153] dev-python/trove-classifiers: Sync with Gentoo It's from Gentoo commit bd2a977ee7614d04f72c128d37f9b08968969e99. --- .../portage-stable/dev-python/trove-classifiers/Manifest | 4 ++-- ...5.2.18.16.ebuild => trove-classifiers-2025.3.13.13.ebuild} | 0 ...25.1.15.22.ebuild => trove-classifiers-2025.3.3.18.ebuild} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/{trove-classifiers-2025.2.18.16.ebuild => trove-classifiers-2025.3.13.13.ebuild} (100%) rename sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/{trove-classifiers-2025.1.15.22.ebuild => trove-classifiers-2025.3.3.18.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/Manifest index 3c5fd13424..0bbdd117f5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/Manifest @@ -1,2 +1,2 @@ -DIST trove_classifiers-2025.1.15.22.tar.gz 16236 BLAKE2B 23003b48c5f6b919559c3355b9eda56d229c5e19420368200952ab9a81a6ca850c779788ccb3c9340bd08e11f9c1da6ea67ecc180c206216313064881d3469f8 SHA512 460df4327866ea6ef19ea04e9ea4dd746eb733ceafec0db9920b1e6eb1649abfcc914f4e103700072696846c4af4c85003a1ef6323b4605a8f1659126d459503 -DIST trove_classifiers-2025.2.18.16.tar.gz 16271 BLAKE2B 99f21fb5a6d40029cb53d2ce0b59c387b012e2538cfab8efb902bc8941499beb4b2ef506662442c5f2a0d2719099858e9bb4c9140514f41a4821436b7eefae30 SHA512 776082bbc7aac7fd4219fe9641261b439394b45ffb7b7f2e639e3f2fe583faa4594dc0113fd3ab3197035fa72c94ab378078023a6534721e640c01e9e5ce249d +DIST trove_classifiers-2025.3.13.13.tar.gz 16266 BLAKE2B c5bea5e7cba406c466d0fba3f00b9ad519d9639833407f76ea171e7783ae662bcca89c584c75d4e0b74d753acdf9107e17458f0af3e840b8035263e1056507c7 SHA512 15e6f8bd6ca8150efb8bc8d90d1c6e3774f9b740dfdd5c7e34870cfc73ca31faa1450bdc9ec26452c383259f5e6171d291d07cdcaf49c87ea9275704faaaa61f +DIST trove_classifiers-2025.3.3.18.tar.gz 16239 BLAKE2B 439b7c7aadae4a2dfb55a065b57853cf5f1f5752072c6e52fcde0ed63bc95a8d17ad9e618983f3302af0bb2b91af5e7db3d076d001008d0c06a62bdf5680facf SHA512 a84ee9e3ff20664b433bd07835e0050fa9cd149d18bbcbd2514abb8f1d056725788c64e37c8863b779070728795f5aa01c0a38b8088082ddc37a10629b9ae492 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2025.2.18.16.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2025.3.13.13.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2025.2.18.16.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2025.3.13.13.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2025.1.15.22.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2025.3.3.18.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2025.1.15.22.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2025.3.3.18.ebuild From 6d5cef36618b41638e46b7ee730b689a6b8f811e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:22 +0000 Subject: [PATCH 064/153] dev-util/bpftool: Sync with Gentoo It's from Gentoo commit 2a4bcd4e446fd51b86f566e7b99dcf97e738036a. --- .../portage-stable/dev-util/bpftool/bpftool-7.5.0.ebuild | 2 +- .../portage-stable/dev-util/bpftool/bpftool-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-7.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-7.5.0.ebuild index b3e3ff89e6..931ad8d588 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-7.5.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-7.5.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_COMPAT=( {15..19} ) +LLVM_COMPAT=( {15..20} ) LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{10..13} ) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-9999.ebuild index 753408c8ea..fd1c3aebd4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -LLVM_COMPAT=( {15..19} ) +LLVM_COMPAT=( {15..20} ) LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{10..13} ) From c465ac8f21bdf274d1de924ee9ca40549dc59170 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:26 +0000 Subject: [PATCH 065/153] dev-util/gdbus-codegen: Sync with Gentoo It's from Gentoo commit a77a723e5dfd04132aafcaee2523f3447d7a8a07. --- .../dev-util/gdbus-codegen/Manifest | 1 + .../gdbus-codegen/gdbus-codegen-2.80.5.ebuild | 4 +- .../gdbus-codegen/gdbus-codegen-2.82.5.ebuild | 2 +- .../gdbus-codegen/gdbus-codegen-2.84.0.ebuild | 77 +++++++++++++++++++ 4 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.84.0.ebuild 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 01739de14e..e7b29fedf5 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 @@ -7,3 +7,4 @@ DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a DIST glib-2.82.2.tar.xz 5555528 BLAKE2B 930fa7816082e6ba4b7f394985840bb6abf4fe9a4451286cddd3cfc8a4f3d4e3b4f06f09fbb34486f6fd47d0b72363b06a280ccae62d061724a7a2e00734bc4c SHA512 d5b761ec0c088496f2f9e5767568076a30ff492c272f21133560689f4e6a177d403c78d71ef85da63de331152c4d1f27b65d3e927ebfaf0fb63592f66e564ea1 DIST glib-2.82.4.tar.xz 5556896 BLAKE2B 62caecc7570b1639f6ddf1deb9debb6d3d6180b74f497f2fcace5ce65d6e28996555d51e5b4980f500bdc3f811b5b6214521b1170f553f2fa1fd240fd0eec835 SHA512 5df0b3c56fe6cf6c94019e29afb408174a5864cdb97cf58d5a12a0f83990b5c2004a49c8e3b0e195f5808874b5911a4a7b3d6aea8718aada1b40561e623cd08d DIST glib-2.82.5.tar.xz 5554704 BLAKE2B e7853034be1137f8b793483df9e9ce1465dd10a990eb9b3cb9ac76c9f8f86ccc6fda85645b04b35963b28c33e0f6c02df4f3d03e06cc278b8515e588d6bd05f6 SHA512 a6b035c32a42b9d6f4c031a29da405848002619654b58c9205f2f78dbb9698cd5866f31ab213adc04aa214d2c48840a9592c0a1e9201e6851ebd435635f393ae +DIST glib-2.84.0.tar.xz 5613328 BLAKE2B a482076d6b0c82824179094974110dbd10d47fce93f84f4626d0d3dbea528602c41ac4a7ab8feedc3d7cc5e404ef8bef30c6c744b6f0f4f3a764644e28210e28 SHA512 72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.80.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.80.5.ebuild index 20af474b84..5a2471c0ab 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.80.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.80.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" RDEPEND=" ${PYTHON_DEPS} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.82.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.82.5.ebuild index ae6bdba2ad..5a2471c0ab 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.82.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.82.5.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" RDEPEND=" ${PYTHON_DEPS} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.84.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.84.0.ebuild new file mode 100644 index 0000000000..ae6bdba2ad --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.84.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME_ORG_MODULE="glib" +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE="xml(+)" +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=1 + +inherit gnome.org distutils-r1 + +DESCRIPTION="GDBus code and documentation generator" +HOMEPAGE="https://www.gtk.org/" + +S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND=" + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + >=dev-python/docutils-0.21.1 +" + +python_prepare_all() { + PATCHES=( + "${FILESDIR}/${PN}-2.56.1-sitedir.patch" + ) + distutils-r1_python_prepare_all + + local MAJOR_VERSION=$(ver_cut 1) + local MINOR_VERSION=$(ver_cut 2) + sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die + sed -e "s:@VERSION@:${PV}:" \ + -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ + -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die + cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" + sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" +} + +do_xsltproc_command() { + # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) + xsltproc \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + -o "${2}" \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ + "${1}" || die "manpage generation failed" +} + +src_compile() { + distutils-r1_src_compile + rst2man \ + "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.rst" \ + "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} + +src_test() { + einfo "Skipping tests. This package is tested by dev-libs/glib" + einfo "when merged with FEATURES=test" +} + +python_install_all() { + distutils-r1_python_install_all # no-op, but prevents QA warning + doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} From 26c632fc24e7b0d9ac518c8b398b997fc3217361 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:27 +0000 Subject: [PATCH 066/153] dev-util/glib-utils: Sync with Gentoo It's from Gentoo commit 2ab28664652199b2074a5730c2e5900b504b671f. --- .../dev-util/glib-utils/Manifest | 1 + .../glib-utils/glib-utils-2.80.5.ebuild | 4 +- .../glib-utils/glib-utils-2.82.5.ebuild | 2 +- .../glib-utils/glib-utils-2.84.0.ebuild | 53 +++++++++++++++++++ 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.84.0.ebuild 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 01739de14e..e7b29fedf5 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 @@ -7,3 +7,4 @@ DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a DIST glib-2.82.2.tar.xz 5555528 BLAKE2B 930fa7816082e6ba4b7f394985840bb6abf4fe9a4451286cddd3cfc8a4f3d4e3b4f06f09fbb34486f6fd47d0b72363b06a280ccae62d061724a7a2e00734bc4c SHA512 d5b761ec0c088496f2f9e5767568076a30ff492c272f21133560689f4e6a177d403c78d71ef85da63de331152c4d1f27b65d3e927ebfaf0fb63592f66e564ea1 DIST glib-2.82.4.tar.xz 5556896 BLAKE2B 62caecc7570b1639f6ddf1deb9debb6d3d6180b74f497f2fcace5ce65d6e28996555d51e5b4980f500bdc3f811b5b6214521b1170f553f2fa1fd240fd0eec835 SHA512 5df0b3c56fe6cf6c94019e29afb408174a5864cdb97cf58d5a12a0f83990b5c2004a49c8e3b0e195f5808874b5911a4a7b3d6aea8718aada1b40561e623cd08d DIST glib-2.82.5.tar.xz 5554704 BLAKE2B e7853034be1137f8b793483df9e9ce1465dd10a990eb9b3cb9ac76c9f8f86ccc6fda85645b04b35963b28c33e0f6c02df4f3d03e06cc278b8515e588d6bd05f6 SHA512 a6b035c32a42b9d6f4c031a29da405848002619654b58c9205f2f78dbb9698cd5866f31ab213adc04aa214d2c48840a9592c0a1e9201e6851ebd435635f393ae +DIST glib-2.84.0.tar.xz 5613328 BLAKE2B a482076d6b0c82824179094974110dbd10d47fce93f84f4626d0d3dbea528602c41ac4a7ab8feedc3d7cc5e404ef8bef30c6c744b6f0f4f3a764644e28210e28 SHA512 72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.80.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.80.5.ebuild index 515ecab644..56c0406534 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.80.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.80.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.82.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.82.5.ebuild index 8b1ce3fe27..56c0406534 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.82.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.82.5.ebuild @@ -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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.84.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.84.0.ebuild new file mode 100644 index 0000000000..8b1ce3fe27 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.84.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) +GNOME_ORG_MODULE="glib" + +inherit gnome.org python-single-r1 + +DESCRIPTION="Build utilities for GLib using projects" +HOMEPAGE="https://www.gtk.org/" + +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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-python/docutils-0.21.1 +" + +src_configure() { :; } + +do_rst2man_command() { + rst2man \ + --syntax-highlight=none \ + "${1}" "${2}" || die "manpage generation failed" +} + +src_compile() { + sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die + sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die + sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die + do_rst2man_command docs/reference/gobject/glib-genmarshal.rst docs/reference/gobject/glib-genmarshal.1 + do_rst2man_command docs/reference/gobject/glib-mkenums.rst docs/reference/gobject/glib-mkenums.1 + do_rst2man_command docs/reference/glib/gtester-report.rst docs/reference/glib/gtester-report.1 +} + +src_install() { + python_fix_shebang gobject/glib-genmarshal + python_fix_shebang gobject/glib-mkenums + python_fix_shebang glib/gtester-report + exeinto /usr/bin + doexe gobject/glib-genmarshal + doexe gobject/glib-mkenums + doexe glib/gtester-report + doman docs/reference/gobject/glib-genmarshal.1 + doman docs/reference/gobject/glib-mkenums.1 + doman docs/reference/glib/gtester-report.1 +} From 2de5b214f7bd28b8e763963692d8d75ec8ec09cc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:28 +0000 Subject: [PATCH 067/153] dev-util/maturin: Sync with Gentoo It's from Gentoo commit 074e76f99694b894ca7b7025ff9735c01a131154. --- .../portage-stable/dev-util/maturin/Manifest | 4 ++-- .../dev-util/maturin/maturin-1.8.2.ebuild | 5 +---- .../{maturin-1.8.1.ebuild => maturin-1.8.3.ebuild} | 11 ++++------- 3 files changed, 7 insertions(+), 13 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-util/maturin/{maturin-1.8.1.ebuild => maturin-1.8.3.ebuild} (92%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/maturin/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/maturin/Manifest index c04a9e3be4..789b0f5081 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/maturin/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/maturin/Manifest @@ -1,4 +1,4 @@ -DIST maturin-1.8.1-vendor.tar.xz 28014132 BLAKE2B 0fdaa5c2005645a964594431ea29faeed2aa703f8e33776fe1c02f865a36a11793e8aad5c18f295e97085e7c1e2fb26ada8968703920455c78327b23a9338182 SHA512 3bf23cf509ba416002d8a7b2a0cd2e6b2b6ec98ab335fcdade501a99b068cbf6db5a3665ca918b1192839cc0377ede0d150a657a104a98cc85e90a83d030d174 -DIST maturin-1.8.1.gh.tar.gz 542041 BLAKE2B 0ded1146c03d1139cc826bff520dbed4f27f4c0d2fa58a1336b075d222bb73881ec455d9b8480206c9f25756d6680a3918db4b4043fb6a63a023d94d23c5ea48 SHA512 2f07ced149fd59035c3acddbc4449cdfa59f8680d1784a68fbb71414a8a6309d3e138b10a7aeb3ca1f35f52ffe04c0e557e4636c84b7d8c60cd012798e3ec041 DIST maturin-1.8.2-vendor.tar.xz 17297348 BLAKE2B 400ae0e41d3c3a7e330482902fe73c1def631bbdb32734e6fa110eb6d2d954b464d9feeca5727d8f551d30cb6868c3000afcaed452c3f10a661e6f03d79edd02 SHA512 c5faa7ff3c49e5097a27f19821bf4a355dd17ed74efae503ec1639cb8a695873cdc5a89a94da77fe7cb7cb1e1685ab895c801bbf94828c22d7c0ba29105213fa DIST maturin-1.8.2.gh.tar.gz 544160 BLAKE2B d5784b76ee7dbbb48818e3ef0acebe32cee423e787f9c4bdcc50af90656a34d1dd1a89c414948b07e983edc1047382b82a1590d4c0de0e59279be81e06bbbdfc SHA512 83ca2dc64e1933f18b66d06bb985f6834a41ae289cf74d01689158febda783157cbecfb5c10c6da9544eda501acb9fdc52dd9cd7f351c2c4c5c0c0a1e6cffc4f +DIST maturin-1.8.3-vendor.tar.xz 15014308 BLAKE2B 5dec263a5297108e5ac36ca6a05f7013f0bcc1704e8b5038418ac7c17d979dc449e1a06ec3a5b6439498b3473e68765fd2ae69ed671b9d4d9aef8e20f325a1a9 SHA512 106e7d0a013f715e1eb8008d31518317bb7e66c3d429c2972ddcfb457afc89de4359d4d85f19fce50861eff219063e666106e284916290e6cca08e7dd6c54889 +DIST maturin-1.8.3.gh.tar.gz 544455 BLAKE2B 0e0115331a8e23d03b8c96348b505d9573988c1f6fdbf9c179d6c94a0d3aa3d448727babb9d7f6e85ae2bc3f2a8201c7b32dbba894228f0035055662449b1556 SHA512 b4f79df7b099777d6068d2705fd6ca6a79c0a96c77530dcca26fef5d09b39a57feabab9d3871fc5b4760df234955329222dc29a86df5404d880140f1a3736431 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/maturin/maturin-1.8.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/maturin/maturin-1.8.2.ebuild index 777f8cad3d..5577ff0feb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/maturin/maturin-1.8.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/maturin/maturin-1.8.2.ebuild @@ -24,7 +24,7 @@ LICENSE+=" MPL-2.0 Unicode-3.0 Unicode-DFS-2016 " # crates SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="doc +ssl test" RESTRICT="!test? ( test )" @@ -92,9 +92,6 @@ src_prepare() { src_configure() { export OPENSSL_NO_VENDOR=1 - # bug #938847 (TODO?: should probably be an eclass default for musl) - use elibc_musl && RUSTFLAGS+=" -C target-feature=-crt-static" - # https://github.com/rust-lang/stacker/issues/79 use s390 && ! is-flagq '-march=*' && append-cflags $(test-flags-CC -march=z10) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/maturin/maturin-1.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/maturin/maturin-1.8.3.ebuild similarity index 92% rename from sdk_container/src/third_party/portage-stable/dev-util/maturin/maturin-1.8.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/maturin/maturin-1.8.3.ebuild index facdc87187..1c7441b062 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/maturin/maturin-1.8.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/maturin/maturin-1.8.3.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..13} ) +PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) RUST_MIN_VER=1.75.0 inherit cargo distutils-r1 flag-o-matic shell-completion toolchain-funcs @@ -20,11 +20,11 @@ SRC_URI=" # rustls+ring is unused, so openssl license can be skipped LICENSE="|| ( Apache-2.0 MIT ) doc? ( CC-BY-4.0 OFL-1.1 )" LICENSE+=" - 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC - MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016 + 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT + MPL-2.0 Unicode-3.0 Unicode-DFS-2016 " # crates SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="doc +ssl test" RESTRICT="!test? ( test )" @@ -88,9 +88,6 @@ src_prepare() { src_configure() { export OPENSSL_NO_VENDOR=1 - # bug #938847 (TODO?: should probably be an eclass default for musl) - use elibc_musl && RUSTFLAGS+=" -C target-feature=-crt-static" - # https://github.com/rust-lang/stacker/issues/79 use s390 && ! is-flagq '-march=*' && append-cflags $(test-flags-CC -march=z10) From bb132b0fdccc71c366676277b92508cb8b25fd3e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:30 +0000 Subject: [PATCH 068/153] dev-util/perf: Sync with Gentoo It's from Gentoo commit 251a445e7e2579933e7bd26c55b1765af8b08135. --- .../src/third_party/portage-stable/dev-util/perf/Manifest | 2 +- .../dev-util/perf/{perf-6.13.1.ebuild => perf-6.13.5.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/portage-stable/dev-util/perf/{perf-6.13.1.ebuild => perf-6.13.5.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest index 0500a6afa6..393d40a615 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest @@ -3,4 +3,4 @@ DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581 DIST linux-6.13.tar.xz 148523052 BLAKE2B 9f617ecb3f2393b57ba03c654fea62a7213f24c835989f333a1ef29492af551bfa7d9ad786d5ef1484854adc77c7c6af38fb09a72d994d305695f512c325e77f SHA512 1137e6440132b0958f89165440e99208f82b204e7245ae69dc9c808df97d13ce8f58136db92407e0e93394fa7f6283ec7a34597c6e92a5b6d9025e0960357957 DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad DIST patch-6.11.7.xz 669756 BLAKE2B f2ec79bd337eaa61c7203c00ce61b3e5afa9eee38a3e38e63a7fc9270af86674e5c369ca7ddfe4fa5f79601b1c874af1ce732bd8987529c7db2f2f9ca54ba85b SHA512 031c22e2fa7e1c7808f50dc2120a35d10a0b81d30636c5d19146fe12558999517f132213b72c39a32d8cc2c0e14e16ff64cac63ef97f8be0ebe8e709a3de8156 -DIST patch-6.13.1.xz 9376 BLAKE2B 569a23e297ba11a0f344346253603abf178a3a534847d9b5481c1e69d825afb00d5996e4488ecc44f45272a74d130b4fd53094e3508f9c1da878eefe36d46b46 SHA512 f964a63a1b186f64042a08f454f9b025a3f013aecf860538ba5597c9ee75ac7c1210f6ec57d8c6dab9fe8af348c511dadda04e23baa6bea6f3f6c084593e3d0e +DIST patch-6.13.5.xz 459896 BLAKE2B 08f3dc28f8f9cbf561570dc74b1a7070be07f966c442e9a4baf98fc5d7b18ec9d15360911049747ecbc1fe91c3f32188006ce85817caf2ba10925bf9456d76cf SHA512 d1d4b60f6072291624fcab6c630e8cd06795ad84282ad7fd55b1ab288b762a092b8486d2905f1de8e91e7b0e7d6e9a0046bd76d8e7352ff7ab5129e2ef67613b diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.13.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.13.5.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.13.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.13.5.ebuild From 2ba56e81143d998f1112f19b137d7344b94955fa Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:31 +0000 Subject: [PATCH 069/153] dev-util/pkgconf: Sync with Gentoo It's from Gentoo commit 65b073f11199535e5269a6cf49a11b29ca1b1ed6. --- .../portage-stable/dev-util/pkgconf/Manifest | 1 + .../dev-util/pkgconf/pkgconf-2.4.3.ebuild | 73 +++++++++++++++++++ .../dev-util/pkgconf/pkgconf-9999.ebuild | 4 +- 3 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.4.3.ebuild 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 e9effa6ca3..5302cd53ff 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 @@ -2,3 +2,4 @@ DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc03513 DIST pkgconf-2.1.1.tar.xz 311956 BLAKE2B b59e57b1118bb75bc946a1e65e037a172c2ade3a7b9da8404b3598833cd091600045de151f2db06453b23563501b2dff7fdda8967e14c0c933ac50d28ddb3cd0 SHA512 cdf0998cd87f6d5e5a6560037eb847fd9613d237858d26eec321c42f54ca40ac72b6749c48c5b32611841d701393b1217bdb6c0cba5efd2c138be10d0e8fb32d DIST pkgconf-2.2.0.tar.xz 311920 BLAKE2B c2a89e932e7671785799f4b82beb75e92f246c152c03e88c847cedef39f2123da0544ff914d1c1512b8616f8b8cfd9f5115b33560042bcfa7ac5f78c0ceb2a27 SHA512 c4ff254c7323bdebc2595037df60e33f17fc5c222d7500a4b9d8b18c8b451ac35cd3ac90d31c920c23e9495ece2b82422de61e13286d43de3a5d1fe8211bd944 DIST pkgconf-2.3.0.tar.xz 316160 BLAKE2B cca3476df0b79cdbca798ed3a067611414e9b422e8347d0f490e7c4d0c43cdd2c7b586ac11e028a8df365d4ea4194f46b1d9fc0acd0f5fd6b4a5548673a8f853 SHA512 869fe0a7a2e06e9da37ff672b991dad60a9a7c9df2c65b78b2aa70dba10920650fb946d5a9c8019ea54a510835acc2eb4244092fa36d0339bd6764ff84e8542c +DIST pkgconf-2.4.3.tar.xz 321352 BLAKE2B 5ca90b1b97e5516369e7042952418d5046faee02ff67144b0805c3c007507c42400825cfe73ac2c4df3f11dab4d5abba24b52abe930a3b25abbcbbddb3a06a31 SHA512 7e59b6aaf875ec3fc8c225985937384d2aef57d9daf64b7ea88242bf1a11349fe52cf6d1238d728f0509599982d69c761a0f01e8f8e24de028db58288760896f diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.4.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.4.3.ebuild new file mode 100644 index 0000000000..67f2eeb9a9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.4.3.ebuild @@ -0,0 +1,73 @@ +# Copyright 2012-2025 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.ariadne.space/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" +HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" + +LICENSE="ISC" +SLOT="0/6" +IUSE="+native-symlinks test" + +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/atf + dev-util/kyua + ) +" +RDEPEND="!dev-util/pkgconfig" + +src_prepare() { + default + + [[ ${PV} == 9999 ]] && eautoreconf + + MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf$(get_exeext) + /usr/bin/pkg-config$(get_exeext) + ) +} + +multilib_src_configure() { + local myeconfargs=( + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +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 + + if ! use native-symlinks; then + rm "${ED}"/usr/bin/{pkgconf,pkg-config}$(get_exeext) || die + fi + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild index d11205b46a..67f2eeb9a9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2024 Gentoo Authors +# Copyright 2012-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ DESCRIPTION="pkg-config compatible replacement with no dependencies other than C HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" LICENSE="ISC" -SLOT="0/5" +SLOT="0/6" IUSE="+native-symlinks test" RESTRICT="!test? ( test )" From 781ce789353f3393d5dba59e725e7ff4c3b2230f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:32 +0000 Subject: [PATCH 070/153] dev-vcs/git: Sync with Gentoo It's from Gentoo commit d870cadac7b9654edf9063e58784ad5c7c1b2da0. --- .../portage-stable/dev-vcs/git/Manifest | 3 + ...n-use-test_environment-conditionally.patch | 63 +++ .../dev-vcs/git/git-2.48.1.ebuild | 2 +- .../dev-vcs/git/git-2.49.0-r1.ebuild | 480 ++++++++++++++++++ .../dev-vcs/git/git-9999-r1.ebuild | 117 +++-- .../dev-vcs/git/git-9999-r2.ebuild | 117 +++-- .../dev-vcs/git/git-9999-r3.ebuild | 116 +++-- .../dev-vcs/git/git-9999.ebuild | 117 +++-- 8 files changed, 790 insertions(+), 225 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.49.0-meson-use-test_environment-conditionally.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.0-r1.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 162e1a8379..ad40e84a4c 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 @@ -1,9 +1,12 @@ DIST git-2.45.2.tar.xz 7487680 BLAKE2B 477acc786c26e0b04843ad6d07333607b2274d587263d72c6d036cade725e6f62f8c773903f401c799de71527d0473589afc507eec02f445e0c148dd7cbf407c SHA512 dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73 DIST git-2.45.3.tar.xz 7492256 BLAKE2B 51c08789487070c33ff7c6c2135203010f12641eaf9908bf70724255e72bed24a7f0b7cc0b5c947081dad22041d0ee80c53971e5634510d35d797747338cd2d8 SHA512 b5b98bcc886f6a015b54193a9481092d4bfdc3689c479a8751e63529ce1dd1db226f2da38d26f25f54b81fe2c3c48d8edbe18af534fff65f6fcaa4c50923f93b DIST git-2.48.1.tar.xz 7723580 BLAKE2B 092ed16fab3b3e56c81cb91db48e4db1f41b6d91d4855a7c73fb642f1fd0272823a92b8963644ef33517c61956bca89a95e4b4dc3e9237cb0520aa37c0770966 SHA512 75c89ab4ca83adc46989a4b05a9b482b40a7ba69d15aa1c1f27d0cee37c2908e154a75d59b0a0a540647352b9c55020f1a5ad309f0eff78e9fd8e631ef9e4606 +DIST git-2.49.0.tar.xz 7771796 BLAKE2B c9a58cb4bcbc33d3c6ede2ce6e6131af3998669419c8d8e4317c52ee14ae4bfcdd209780c6dda31cd772bdb703096729de17f21579bf7f0bb830bc6c9e1d7ffd SHA512 81a16415890305fc6cfd14ade8bee76779feba01f51c5446f40c14211654342c68ef0911859fa6e8e9ff0a718847bb44ee4156d03a19c9165df19ba91e09e1f0 DIST git-htmldocs-2.45.2.tar.xz 1569148 BLAKE2B 5013a13da54d87728f621a09d04dee1cba7b44d230360394b86e04269bf276399cf44de74ffc14a76ec1724e1015b630300d551b3a268273a768e0edc1a7fa45 SHA512 272bb31d8d43b270d5281c5d1beadea8e5a580c738ece2580d2c6ba7e7fe6fdbca71b672a2811273119495e62613f7a4d34764b4dfbc26e4dbf9dee5797fb440 DIST git-htmldocs-2.45.3.tar.xz 1527700 BLAKE2B 1baf8df995d6a31b550d91425c94ac63425eb4efc5a334dd5a312cf1c8da84e132c30dbbb192d9bcdfcabfa9f7b758ff2445ed8d634ad31723d3835bef2ca49c SHA512 4e8b16e77f7606c279e7793cbd6f8e18973213339f56a379dbf1fc074b7d1f032783bb956de0ebb58fad7e8954b7a75ab990b265f1858b32321e7c33de414601 DIST git-htmldocs-2.48.1.tar.xz 1580120 BLAKE2B 4d57fc0ab8256d4cf5984696485610329f63bccce8ad6bcda20bca9abbaac0725dfac0aef385a62371c2c8e7d26e86c62e0de36321f40a3da667fa2b92e43ef4 SHA512 703f237c129d3d54cea9104dc1d47ad8881400a1c90e1a55153e63912c8e7d03e1000fef5cd1962933e8a600d71e11f28a94214853047ac8e748dc53ba906ac5 +DIST git-htmldocs-2.49.0.tar.xz 1602472 BLAKE2B d3b0d49b7f7046dfd802145e37760d31ef048ecbbfb75e5bf904edd8d0d0cad56c118d843e06d1d72b159917f6bd0f6fa2413bba3f6ba0de041d8e8fdc247f94 SHA512 effc0ecb3e84febb80de208ad4b8bb3859c171aedac24fdd4f52c07d33dedef16c20ac16bc6c6fbbb9d30b0926c08be22c78405614732d5e2cf24e90bd93384f DIST git-manpages-2.45.2.tar.xz 576428 BLAKE2B c89ebd25c0caf391fcd29cc8609252daf2cf742a8cc78ce5b64931befb126c951ebb7504bc8ccbee06b81727dc3e4ded67c69adf8d737f4df38dfda758e3c734 SHA512 d39a5c92c1cfcae145713b8ff1a84258947392a3cf1490e3f7d4f87836d05e79dc4fecbff16b7c1bc314572d6d32aa2c29e7fcde993b549b2fab71620734c19b DIST git-manpages-2.45.3.tar.xz 576480 BLAKE2B 61eeccea65dcae72e0151459ad4a225d455fd6c57dc55394aa2e5e8f3179643f63eb64c8d75ac51ae467b8c277df2ac9777c55134efcc05805bef16019171b30 SHA512 c06b97a8f2c43c7a11355dea95e4766bc58978a70c30d5ee4af86e45dadd5be11d1ba30e1750535c067169af7b6497d2d03ae5cc1f36aff1b96a80a1f34dbc1c DIST git-manpages-2.48.1.tar.xz 590608 BLAKE2B 54ff646cd1d5ce93e8e37eef4682e81a1c95f99903b2d760f70e51f2c9f02378f6de5464a5fcca24c08f8327ec114cdd1684eee07fd2512af7e9615c47104a99 SHA512 b086ac89e77b1af58beff26576fb5c3a1dfe8641315ab0b60819dcf0ba9e5be4173deaa77fa1f95d8594895a583ed629c469714b0a5e87fecd36e5be397ba8f5 +DIST git-manpages-2.49.0.tar.xz 594760 BLAKE2B c5a1810e1369cc94c93716db5baf9d217e9c47c824cab8e978128ff7e8fe38119b64dd43fe4186e561f2b230d9e82ec254da0080b9a568dc31ae7ea73e46d612 SHA512 6347bf0d580634c3c78ff93578e088b31ccd5ebd844678a1255f82c5ceb1a301829701daf4212d8ca0f508fcd03cfef52b727a11f1c6d37346adbd709d0b041a diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.49.0-meson-use-test_environment-conditionally.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.49.0-meson-use-test_environment-conditionally.patch new file mode 100644 index 0000000000..d9df28c4b5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.49.0-meson-use-test_environment-conditionally.patch @@ -0,0 +1,63 @@ +From 310a34bace801d288e369c6a01a8d04ffc4c3c06 Mon Sep 17 00:00:00 2001 +Message-ID: <310a34bace801d288e369c6a01a8d04ffc4c3c06.1741975400.git.sam@gentoo.org> +From: Sam James +Date: Fri, 14 Mar 2025 18:00:15 +0000 +Subject: [PATCH] meson: use test_environment conditionally. + +test_environment is only defined with -Dtests, so use it conditionally +and define a stub environment() instead, to avoid erroring out: + +``` +$ meson setup -Dtests=false -Dcontrib=subtree build +[...] + +contrib/subtree/meson.build:15:27: ERROR: Unknown variable "test_environment". +``` + +Do the same for 'netrc' in contrib/ as it uses the same pattern. +--- + contrib/credential/netrc/meson.build | 8 ++++++-- + contrib/subtree/meson.build | 8 ++++++-- + 2 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/contrib/credential/netrc/meson.build b/contrib/credential/netrc/meson.build +index a990dbb86d..6d815d01c4 100644 +--- a/contrib/credential/netrc/meson.build ++++ b/contrib/credential/netrc/meson.build +@@ -7,8 +7,12 @@ credential_netrc = custom_target( + install_dir: get_option('libexecdir') / 'git-core', + ) + +-credential_netrc_testenv = test_environment +-credential_netrc_testenv.set('CREDENTIAL_NETRC_PATH', credential_netrc.full_path()) ++if get_option('tests') ++ credential_netrc_testenv = test_environment ++ credential_netrc_testenv.set('CREDENTIAL_NETRC_PATH', credential_netrc.full_path()) ++else ++ credential_netrc_testenv = environment() ++endif + + test('t-git-credential-netrc', + shell, +diff --git a/contrib/subtree/meson.build b/contrib/subtree/meson.build +index 9c72b23625..d18f188216 100644 +--- a/contrib/subtree/meson.build ++++ b/contrib/subtree/meson.build +@@ -12,8 +12,12 @@ git_subtree = custom_target( + install_dir: get_option('libexecdir') / 'git-core', + ) + +-subtree_test_environment = test_environment +-subtree_test_environment.prepend('PATH', meson.current_build_dir()) ++if get_option('tests') ++ subtree_test_environment = test_environment ++ subtree_test_environment.prepend('PATH', meson.current_build_dir()) ++else ++ subtree_test_environment = environment() ++endif + + test('t7900-subtree', shell, + args: [ 't7900-subtree.sh' ], +-- +2.48.1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.1.ebuild index 99cdc1b166..38036e16bd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.1.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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.0-r1.ebuild new file mode 100644 index 0000000000..e5f4bb671f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.0-r1.ebuild @@ -0,0 +1,480 @@ +# Copyright 1999-2025 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_{10..13} ) + +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson + +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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi +fi + +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd" + +# Common to both DEPEND and RDEPEND +DEPEND=" + dev-libs/openssl:= + sys-libs/zlib + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + 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 + ) + keyring? ( virtual/pkgconfig ) + nls? ( sys-devel/gettext ) + test? ( + app-arch/unzip + app-crypt/gnupg + dev-lang/perl + ) +" + +# 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 ) + perforce? ( ${PYTHON_REQUIRED_USE} ) + subversion? ( perl ) + webdav? ( curl ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch + "${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.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 +} + +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 + fi + +} + +src_prepare() { + if ! use safe-directory ; then + # This patch neuters the "safe directory" detection. + # bugs #838271, #838223 + PATCHES+=( + "${FILESDIR}"/git-2.46.2-unsafe-directory.patch + ) + fi + + default +} + +src_configure() { + local contrib=( + completion + subtree + + $(usev perl 'contacts') + ) + local credential_helpers=( + $(usev keyring 'libsecret') + $(usev perl 'netrc') + ) + + # Needs macOS Frameworks that can't currently be built with GCC. + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then + credential_helpers+=( osxkeychain ) + fi + + local native_file="${T}"/meson.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + # We don't want to bake /usr/bin/sh from usrmerged systems into + # binaries. /bin/sh is required by POSIX. + sh='/bin/sh' + EOF + + local emesonargs=( + --native-file "${native_file}" + + $(meson_feature curl) + $(meson_feature cgi gitweb) + $(meson_feature webdav expat) + $(meson_feature iconv) + $(meson_feature nls gettext) + $(meson_feature pcre pcre2) + $(meson_feature perl) + $(meson_feature perforce python) + $(meson_use test tests) + + -Dcontrib=$(IFS=, ; echo "${contrib[*]}" ) + -Dcredential_helpers=$(IFS=, ; echo "${credential_helpers[*]}" ) + + -Dmacos_use_homebrew_gettext=false + -Dperl_cpan_fallback=false + # TODO: allow zlib-ng + -Dzlib_backend=zlib + ) + + [[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false ) + + # For non-live, we use a downloaded docs tarball instead. + if [[ ${PV} == *9999 ]] || use doc ; then + emesonargs+=( + -Ddocs="man$(usev doc ',html')" + ) + fi + + meson_src_configure + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + emesonargs=() + meson_src_configure + ) + fi +} + +git_emake() { + local mymakeargs=( + prefix="${EPREFIX}"/usr + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html + sysconfdir="${EPREFIX}"/etc + perllibdir="$(use perl && perl_get_raw_vendorlib)" + + CC="$(tc-getCC)" + CFLAGS="${CFLAGS}" + LDFLAGS="${LDFLAGS}" + PKG_CONFIG="$(tc-getPKG_CONFIG)" + OPTAR="$(tc-getAR)" + OPTCC="$(tc-getCC)" + OPTCFLAGS="${CFLAGS}" + OPTLDFLAGS="${LDFLAGS}" + + PERL_PATH="${EPREFIX}/usr/bin/perl" + PERL_MM_OPT="" + + V=1 + + "$@" + ) + + emake "${mymakeargs[@]}" +} + +src_compile() { + meson_src_compile + + if use mediawiki ; then + git_emake -C contrib/mw-to-git + fi + + if use tk ; then + git_emake -C git-gui + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + + fi + + if use doc ; then + # Workaround fragments that still use the Makefile and can't + # find the bits from Meson's out-of-source build + ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die + fi + + git_emake -C contrib/diff-highlight +} + +src_test() { + # t0610-reftable-basics.sh uses $A + local -x A= + + meson_src_test +} + +src_install() { + meson_src_install + + if use doc ; then + cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die + rm -rf "${ED}"/usr/share/doc/git-doc/ || die + 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} + + local d + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.adoc + done + docinto / + + 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 + + # 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 + + 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 - built seperately + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + local contrib_objects=( + buildsystems + fast-import + 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 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 perl ; then + dodir "$(perl_get_vendorlib)" + mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die + mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die + fi + + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install + 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 + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + + git_emake -C git-gui DESTDIR="${D}" install + 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 +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild index f90f10f55f..e5f4bb671f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild @@ -148,7 +148,8 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch + "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch + "${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch ) pkg_setup() { @@ -194,7 +195,33 @@ src_prepare() { } src_configure() { + local contrib=( + completion + subtree + + $(usev perl 'contacts') + ) + local credential_helpers=( + $(usev keyring 'libsecret') + $(usev perl 'netrc') + ) + + # Needs macOS Frameworks that can't currently be built with GCC. + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then + credential_helpers+=( osxkeychain ) + fi + + local native_file="${T}"/meson.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + # We don't want to bake /usr/bin/sh from usrmerged systems into + # binaries. /bin/sh is required by POSIX. + sh='/bin/sh' + EOF + local emesonargs=( + --native-file "${native_file}" + $(meson_feature curl) $(meson_feature cgi gitweb) $(meson_feature webdav expat) @@ -204,9 +231,18 @@ src_configure() { $(meson_feature perl) $(meson_feature perforce python) $(meson_use test tests) + + -Dcontrib=$(IFS=, ; echo "${contrib[*]}" ) + -Dcredential_helpers=$(IFS=, ; echo "${credential_helpers[*]}" ) + + -Dmacos_use_homebrew_gettext=false -Dperl_cpan_fallback=false + # TODO: allow zlib-ng + -Dzlib_backend=zlib ) + [[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false ) + # For non-live, we use a downloaded docs tarball instead. if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( @@ -215,6 +251,15 @@ src_configure() { fi meson_src_configure + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + emesonargs=() + meson_src_configure + ) + fi } git_emake() { @@ -247,25 +292,19 @@ git_emake() { src_compile() { meson_src_compile - if use perl ; then - git_emake -C contrib/credential/netrc - fi - - if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then - git_emake -C contrib/credential/osxkeychain - fi - - if use keyring ; then - git_emake -C contrib/credential/libsecret - fi - if use mediawiki ; then git_emake -C contrib/mw-to-git fi if use tk ; then - git_emake -C gitk-git git_emake -C git-gui + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -275,9 +314,6 @@ src_compile() { fi git_emake -C contrib/diff-highlight - git_emake -C contrib/subtree git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1 } src_test() { @@ -285,20 +321,11 @@ src_test() { local -x A= meson_src_test - - # TODO: Needs help finding built git with meson - #if use perl ; then - # git_emake -C contrib/credential/netrc testverbose - #fi } src_install() { meson_src_install - if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - if use doc ; then cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die rm -rf "${ED}"/usr/share/doc/git-doc/ || die @@ -310,15 +337,10 @@ src_install() { 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 + dodoc Documentation${d}*.adoc done docinto / @@ -335,17 +357,6 @@ src_install() { 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 - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -355,15 +366,6 @@ src_install() { 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 keyring ; then - dobin contrib/credential/libsecret/git-credential-libsecret - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -376,7 +378,7 @@ src_install() { # patches - stuff the Git guys made to go upstream to other places # persistent-https - TODO # mw-to-git - TODO - # subtree - build seperately + # subtree - built seperately # svnimport - use git-svn # thunderbird-patch-inline - fixes thunderbird local contrib_objects=( @@ -418,8 +420,6 @@ src_install() { dodir "$(perl_get_vendorlib)" mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die - - dobin contrib/credential/netrc/git-credential-netrc fi if use mediawiki ; then @@ -444,7 +444,12 @@ src_install() { fi if use tk ; then - git_emake -C gitk-git DESTDIR="${D}" install + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild index f90f10f55f..e5f4bb671f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild @@ -148,7 +148,8 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch + "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch + "${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch ) pkg_setup() { @@ -194,7 +195,33 @@ src_prepare() { } src_configure() { + local contrib=( + completion + subtree + + $(usev perl 'contacts') + ) + local credential_helpers=( + $(usev keyring 'libsecret') + $(usev perl 'netrc') + ) + + # Needs macOS Frameworks that can't currently be built with GCC. + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then + credential_helpers+=( osxkeychain ) + fi + + local native_file="${T}"/meson.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + # We don't want to bake /usr/bin/sh from usrmerged systems into + # binaries. /bin/sh is required by POSIX. + sh='/bin/sh' + EOF + local emesonargs=( + --native-file "${native_file}" + $(meson_feature curl) $(meson_feature cgi gitweb) $(meson_feature webdav expat) @@ -204,9 +231,18 @@ src_configure() { $(meson_feature perl) $(meson_feature perforce python) $(meson_use test tests) + + -Dcontrib=$(IFS=, ; echo "${contrib[*]}" ) + -Dcredential_helpers=$(IFS=, ; echo "${credential_helpers[*]}" ) + + -Dmacos_use_homebrew_gettext=false -Dperl_cpan_fallback=false + # TODO: allow zlib-ng + -Dzlib_backend=zlib ) + [[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false ) + # For non-live, we use a downloaded docs tarball instead. if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( @@ -215,6 +251,15 @@ src_configure() { fi meson_src_configure + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + emesonargs=() + meson_src_configure + ) + fi } git_emake() { @@ -247,25 +292,19 @@ git_emake() { src_compile() { meson_src_compile - if use perl ; then - git_emake -C contrib/credential/netrc - fi - - if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then - git_emake -C contrib/credential/osxkeychain - fi - - if use keyring ; then - git_emake -C contrib/credential/libsecret - fi - if use mediawiki ; then git_emake -C contrib/mw-to-git fi if use tk ; then - git_emake -C gitk-git git_emake -C git-gui + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -275,9 +314,6 @@ src_compile() { fi git_emake -C contrib/diff-highlight - git_emake -C contrib/subtree git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1 } src_test() { @@ -285,20 +321,11 @@ src_test() { local -x A= meson_src_test - - # TODO: Needs help finding built git with meson - #if use perl ; then - # git_emake -C contrib/credential/netrc testverbose - #fi } src_install() { meson_src_install - if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - if use doc ; then cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die rm -rf "${ED}"/usr/share/doc/git-doc/ || die @@ -310,15 +337,10 @@ src_install() { 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 + dodoc Documentation${d}*.adoc done docinto / @@ -335,17 +357,6 @@ src_install() { 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 - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -355,15 +366,6 @@ src_install() { 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 keyring ; then - dobin contrib/credential/libsecret/git-credential-libsecret - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -376,7 +378,7 @@ src_install() { # patches - stuff the Git guys made to go upstream to other places # persistent-https - TODO # mw-to-git - TODO - # subtree - build seperately + # subtree - built seperately # svnimport - use git-svn # thunderbird-patch-inline - fixes thunderbird local contrib_objects=( @@ -418,8 +420,6 @@ src_install() { dodir "$(perl_get_vendorlib)" mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die - - dobin contrib/credential/netrc/git-credential-netrc fi if use mediawiki ; then @@ -444,7 +444,12 @@ src_install() { fi if use tk ; then - git_emake -C gitk-git DESTDIR="${D}" install + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild index b9d2fdd442..e5f4bb671f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild @@ -148,7 +148,8 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch + "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch + "${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch ) pkg_setup() { @@ -194,7 +195,33 @@ src_prepare() { } src_configure() { + local contrib=( + completion + subtree + + $(usev perl 'contacts') + ) + local credential_helpers=( + $(usev keyring 'libsecret') + $(usev perl 'netrc') + ) + + # Needs macOS Frameworks that can't currently be built with GCC. + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then + credential_helpers+=( osxkeychain ) + fi + + local native_file="${T}"/meson.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + # We don't want to bake /usr/bin/sh from usrmerged systems into + # binaries. /bin/sh is required by POSIX. + sh='/bin/sh' + EOF + local emesonargs=( + --native-file "${native_file}" + $(meson_feature curl) $(meson_feature cgi gitweb) $(meson_feature webdav expat) @@ -204,10 +231,18 @@ src_configure() { $(meson_feature perl) $(meson_feature perforce python) $(meson_use test tests) + + -Dcontrib=$(IFS=, ; echo "${contrib[*]}" ) + -Dcredential_helpers=$(IFS=, ; echo "${credential_helpers[*]}" ) + -Dmacos_use_homebrew_gettext=false -Dperl_cpan_fallback=false + # TODO: allow zlib-ng + -Dzlib_backend=zlib ) + [[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false ) + # For non-live, we use a downloaded docs tarball instead. if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( @@ -216,6 +251,15 @@ src_configure() { fi meson_src_configure + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + emesonargs=() + meson_src_configure + ) + fi } git_emake() { @@ -248,25 +292,19 @@ git_emake() { src_compile() { meson_src_compile - if use perl ; then - git_emake -C contrib/credential/netrc - fi - - if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then - git_emake -C contrib/credential/osxkeychain - fi - - if use keyring ; then - git_emake -C contrib/credential/libsecret - fi - if use mediawiki ; then git_emake -C contrib/mw-to-git fi if use tk ; then - git_emake -C gitk-git git_emake -C git-gui + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -276,9 +314,6 @@ src_compile() { fi git_emake -C contrib/diff-highlight - git_emake -C contrib/subtree git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1 } src_test() { @@ -286,20 +321,11 @@ src_test() { local -x A= meson_src_test - - # TODO: Needs help finding built git with meson - #if use perl ; then - # git_emake -C contrib/credential/netrc testverbose - #fi } src_install() { meson_src_install - if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - if use doc ; then cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die rm -rf "${ED}"/usr/share/doc/git-doc/ || die @@ -311,15 +337,10 @@ src_install() { 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 + dodoc Documentation${d}*.adoc done docinto / @@ -336,17 +357,6 @@ src_install() { 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 - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -356,15 +366,6 @@ src_install() { 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 keyring ; then - dobin contrib/credential/libsecret/git-credential-libsecret - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -377,7 +378,7 @@ src_install() { # patches - stuff the Git guys made to go upstream to other places # persistent-https - TODO # mw-to-git - TODO - # subtree - build seperately + # subtree - built seperately # svnimport - use git-svn # thunderbird-patch-inline - fixes thunderbird local contrib_objects=( @@ -419,8 +420,6 @@ src_install() { dodir "$(perl_get_vendorlib)" mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die - - dobin contrib/credential/netrc/git-credential-netrc fi if use mediawiki ; then @@ -445,7 +444,12 @@ src_install() { fi if use tk ; then - git_emake -C gitk-git DESTDIR="${D}" install + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild index f90f10f55f..e5f4bb671f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild @@ -148,7 +148,8 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch + "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch + "${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch ) pkg_setup() { @@ -194,7 +195,33 @@ src_prepare() { } src_configure() { + local contrib=( + completion + subtree + + $(usev perl 'contacts') + ) + local credential_helpers=( + $(usev keyring 'libsecret') + $(usev perl 'netrc') + ) + + # Needs macOS Frameworks that can't currently be built with GCC. + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then + credential_helpers+=( osxkeychain ) + fi + + local native_file="${T}"/meson.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + # We don't want to bake /usr/bin/sh from usrmerged systems into + # binaries. /bin/sh is required by POSIX. + sh='/bin/sh' + EOF + local emesonargs=( + --native-file "${native_file}" + $(meson_feature curl) $(meson_feature cgi gitweb) $(meson_feature webdav expat) @@ -204,9 +231,18 @@ src_configure() { $(meson_feature perl) $(meson_feature perforce python) $(meson_use test tests) + + -Dcontrib=$(IFS=, ; echo "${contrib[*]}" ) + -Dcredential_helpers=$(IFS=, ; echo "${credential_helpers[*]}" ) + + -Dmacos_use_homebrew_gettext=false -Dperl_cpan_fallback=false + # TODO: allow zlib-ng + -Dzlib_backend=zlib ) + [[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false ) + # For non-live, we use a downloaded docs tarball instead. if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( @@ -215,6 +251,15 @@ src_configure() { fi meson_src_configure + + if use tk ; then + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + emesonargs=() + meson_src_configure + ) + fi } git_emake() { @@ -247,25 +292,19 @@ git_emake() { src_compile() { meson_src_compile - if use perl ; then - git_emake -C contrib/credential/netrc - fi - - if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then - git_emake -C contrib/credential/osxkeychain - fi - - if use keyring ; then - git_emake -C contrib/credential/libsecret - fi - if use mediawiki ; then git_emake -C contrib/mw-to-git fi if use tk ; then - git_emake -C gitk-git git_emake -C git-gui + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -275,9 +314,6 @@ src_compile() { fi git_emake -C contrib/diff-highlight - git_emake -C contrib/subtree git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1 } src_test() { @@ -285,20 +321,11 @@ src_test() { local -x A= meson_src_test - - # TODO: Needs help finding built git with meson - #if use perl ; then - # git_emake -C contrib/credential/netrc testverbose - #fi } src_install() { meson_src_install - if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - if use doc ; then cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die rm -rf "${ED}"/usr/share/doc/git-doc/ || die @@ -310,15 +337,10 @@ src_install() { 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 + dodoc Documentation${d}*.adoc done docinto / @@ -335,17 +357,6 @@ src_install() { 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 - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -355,15 +366,6 @@ src_install() { 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 keyring ; then - dobin contrib/credential/libsecret/git-credential-libsecret - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -376,7 +378,7 @@ src_install() { # patches - stuff the Git guys made to go upstream to other places # persistent-https - TODO # mw-to-git - TODO - # subtree - build seperately + # subtree - built seperately # svnimport - use git-svn # thunderbird-patch-inline - fixes thunderbird local contrib_objects=( @@ -418,8 +420,6 @@ src_install() { dodir "$(perl_get_vendorlib)" mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die - - dobin contrib/credential/netrc/git-credential-netrc fi if use mediawiki ; then @@ -444,7 +444,12 @@ src_install() { fi if use tk ; then - git_emake -C gitk-git DESTDIR="${D}" install + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi From ab3ad51fa29557c57e328a2bb8eb539e236c7b72 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:37 +0000 Subject: [PATCH 071/153] eclass/autotools: Sync with Gentoo It's from Gentoo commit 2b5a13c5a6b9f6e8d8fba44a1ad6577a35198459. --- .../src/third_party/portage-stable/eclass/autotools.eclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass index a36b6ba859..1545b88bc4 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass @@ -32,6 +32,7 @@ case ${EAPI} in esac GNUCONFIG_AUTO_DEPEND=no +LIBTOOL_AUTO_DEPEND=no inherit gnuconfig libtool # @ECLASS_VARIABLE: WANT_AUTOCONF @@ -152,6 +153,7 @@ fi # versions in *DEPEND format. AUTOTOOLS_DEPEND=" ${GNUCONFIG_DEPEND} + ${LIBTOOL_DEPEND} ${_automake_atom} ${_autoconf_atom} ${_libtool_atom} From a837f7869ef11d619da17a6e0907172f732c096c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:38 +0000 Subject: [PATCH 072/153] eclass/cargo: Sync with Gentoo It's from Gentoo commit 33cf31d11d5c81d59cc4ae36f44eaf0886547c16. --- .../third_party/portage-stable/eclass/cargo.eclass | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass index 25a2127f63..dae2b93f24 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass @@ -181,7 +181,7 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo" # functions will be exported. # # If you enable CARGO_OPTIONAL call at least cargo_gen_config manually -# before using other src_functions or cargo_env of this eclass. +# before using other src_* functions or cargo_env of this eclass. # Note that cargo_gen_config is automatically called by cargo_src_unpack. # @ECLASS_VARIABLE: myfeatures @@ -745,10 +745,15 @@ cargo_env() { # The default linker is "cc" so override by setting linker to CC in the # RUSTFLAGS. The given linker cannot include any arguments, so split these # into link-args along with LDFLAGS. + # + # Rust defaults to static linking (-C target-feature=+crt-static) on musl + # targets. We already patch dev-lang/rust to always prefer dynamic linking, + # but to ensure that behavior with dev-lang/rust-bin, set the opposite option + # (-C target-feature=-crt-static) in RUSTFLAGS. local -x CARGO_BUILD_TARGET=$(rust_abi) local TRIPLE=${CARGO_BUILD_TARGET//-/_} local TRIPLE=${TRIPLE^^} LD_A=( $(tc-getCC) ${LDFLAGS} ) - local -Ix CARGO_TARGET_"${TRIPLE}"_RUSTFLAGS+=" -C strip=none -C linker=${LD_A[0]}" + local -Ix CARGO_TARGET_"${TRIPLE}"_RUSTFLAGS+=" -C strip=none -C linker=${LD_A[0]} -C target-feature=-crt-static" [[ ${#LD_A[@]} -gt 1 ]] && local CARGO_TARGET_"${TRIPLE}"_RUSTFLAGS+="$(printf -- ' -C link-arg=%s' "${LD_A[@]:1}")" local CARGO_TARGET_"${TRIPLE}"_RUSTFLAGS+=" ${RUSTFLAGS}" @@ -779,7 +784,7 @@ cargo_src_compile() { # @FUNCTION: cargo_src_install # @DESCRIPTION: # Installs the binaries generated by cargo. -# In come cases workspaces need an alternative --path parameter. +# In some cases workspaces need an alternative --path parameter. # Defaults to '--path ./' if no path is specified. # '--path ./somedir' can be passed directly to cargo_src_install. cargo_src_install() { From d53013abbc5f97d5a3629fffe94d506b3e7a4ea9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:53 +0000 Subject: [PATCH 073/153] eclass/dist-kernel-utils: Sync with Gentoo It's from Gentoo commit bb7b3f56b8d85bb1c96d9d0b85a10769fb497005. --- .../eclass/dist-kernel-utils.eclass | 72 +++++++++++++------ 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/dist-kernel-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/dist-kernel-utils.eclass index 3d7315e9e9..49977c1879 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/dist-kernel-utils.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/dist-kernel-utils.eclass @@ -66,18 +66,37 @@ dist-kernel_get_image_path() { } # @FUNCTION: dist-kernel_install_kernel -# @USAGE: +# @USAGE: [] [] [] [] [...] # @DESCRIPTION: -# Install kernel using installkernel tool. specifies -# the kernel version, full path to the image, -# full path to System.map. +# Install kernel using installkernel. Takes the following arguments: +# +# -- the target kernel version (default: ${KV_FULL}) +# +# -- the full path to the kernel image (default: the image +# as reported by dist-kernel_get_image_path() in the ${KV_DIR}) +# +# -- the full path to the System.map +# (default: ${KV_DIR}/System.map}) +# +# -- the target directory to install to (default: ${EROOT}/boot) +# +# -- extra optional arguments for installkernel +# see man kernel-install and man installkernel. Requires at +# least version 56 of sys-kernel/installkernel. dist-kernel_install_kernel() { debug-print-function ${FUNCNAME} "$@" - [[ ${#} -eq 3 ]] || die "${FUNCNAME}: invalid arguments" - local version=${1} - local image=${2} - local map=${3} + local version=${1:-${KV_FULL}} + local image=${2:-${KV_DIR}/$(dist-kernel_get_image_path)} + local map=${3:-${KV_DIR}/System.map} + local dir=${4:-${EROOT}/boot} + + local installkernel_args=( + "${version}" "${image}" "${map}" "${dir}" + ) + if has_version ">=sys-kernel/installkernel-56"; then + installkernel_args+=( "${@:5}" --verbose ) + fi local success= # not an actual loop but allows error handling with 'break' @@ -107,8 +126,7 @@ dist-kernel_install_kernel() { ebegin "Installing the kernel via installkernel" # note: .config is taken relatively to System.map; # initrd relatively to bzImage - ARCH=$(tc-arch-kernel) installkernel "${version}" "${image}" "${map}" \ - "${EROOT}/boot" || break + ARCH=$(tc-arch-kernel) installkernel "${installkernel_args[@]}" || break eend ${?} || die -n "Installing the kernel failed" success=1 @@ -129,39 +147,49 @@ dist-kernel_install_kernel() { eerror "in the logs above and once you resolve the problems please" eerror "run the equivalent of the following command to try again:" eerror - eerror " emerge --config ${kernel}" + if has --all "${installkernel_args[@]}"; then + eerror " installkernel ${installkernel_args[*]}" + else + eerror " emerge --config ${kernel}" + fi die "Kernel install failed, please fix the problems and run emerge --config" fi } # @FUNCTION: dist-kernel_reinstall_initramfs -# @USAGE: +# @USAGE: [] [] [...] # @DESCRIPTION: # Rebuild and install initramfs for the specified dist-kernel. -# is the kernel source directory (${KV_DIR} from linux-info), -# while is the full kernel version (${KV_FULL}). -# The function will determine whether is actually -# a dist-kernel, and whether initramfs was used. +# Takes the following arguments: +# +# -- the full path to the target kernel (default: ${KV_DIR}) +# +# -- the target kernel version (default: ${KV_FULL}) +# +# -- extra optional arguments for installkernel +# see man kernel-install and man installkernel. Requires at +# least version 56 of sys-kernel/installkernel. # # This function is to be used in pkg_postinst() of ebuilds installing -# kernel modules that are included in the initramfs. +# kernel modules that are included in the initramfs. In order to +# reinstall *all* distribution kernels currently installed on the +# system add the --all argument (requires installkernel-56 or newer). dist-kernel_reinstall_initramfs() { debug-print-function ${FUNCNAME} "$@" - [[ ${#} -eq 2 ]] || die "${FUNCNAME}: invalid arguments" - local kernel_dir=${1} - local ver=${2} + local kernel_dir=${1:-${KV_DIR}} + local ver=${2:-${KV_FULL}} local image_path=${kernel_dir}/$(dist-kernel_get_image_path) if [[ ! -f ${image_path} ]]; then eerror "Kernel install missing, image not found:" eerror " ${image_path}" - eerror "Initramfs will not be updated. Please reinstall your kernel." + eerror "Initramfs will not be updated. Please reinstall kernel ${ver}." return fi dist-kernel_install_kernel "${ver}" "${image_path}" \ - "${kernel_dir}/System.map" + "${kernel_dir}/System.map" "${EROOT}/boot" "${@:3}" } # @FUNCTION: dist-kernel_PV_to_KV From a2fc6c9fa1494a6cc9be57f7c8a0bebff1eae28b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:08:27 +0000 Subject: [PATCH 074/153] eclass/libtool: Sync with Gentoo It's from Gentoo commit c263fc4e410d5f260eeb0969a350cf7ef00da6ba. --- .../portage-stable/eclass/libtool.eclass | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/libtool.eclass b/sdk_container/src/third_party/portage-stable/eclass/libtool.eclass index 8ffc06d6ff..18596a9223 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/libtool.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/libtool.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: libtool.eclass @@ -22,10 +22,23 @@ case ${EAPI} in *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -BDEPEND=">=app-portage/elt-patches-20240116" - inherit toolchain-funcs +# @ECLASS_VARIABLE: LIBTOOL_DEPEND +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# Contains dependency on app-portage/elt-patches in *DEPEND format. +LIBTOOL_DEPEND=">=app-portage/elt-patches-20250306" + +# @ECLASS_VARIABLE: LIBTOOL_AUTO_DEPEND +# @PRE_INHERIT +# @DESCRIPTION: +# Set to 'no' to disable automatically adding to DEPEND. This lets +# ebuilds form conditional depends by using ${LIBTOOL_DEPEND} in +# their own DEPEND string. +: "${LIBTOOL_AUTO_DEPEND:=yes}" +[[ ${LIBTOOL_AUTO_DEPEND} != "no" ]] && BDEPEND=${LIBTOOL_DEPEND} + # @FUNCTION: elibtoolize # @USAGE: [dirs] [--portage] [--reverse-deps] [--patch-only] [--remove-internal-dep=xxx] [--shallow] [--no-uclibc] # @DESCRIPTION: From 8f6331e169aeefe624bacb88da7b578bfe61ab04 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:08:32 +0000 Subject: [PATCH 075/153] eclass/llvm-utils: Sync with Gentoo It's from Gentoo commit b465171bf81e25c18bc6443185215e6f80838766. --- .../portage-stable/eclass/llvm-utils.eclass | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/llvm-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/llvm-utils.eclass index b105e169fb..abe8bb7d7d 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/llvm-utils.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/llvm-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: llvm-utils.eclass @@ -171,4 +171,19 @@ llvm_prepend_path() { export PATH=${new_path[*]} } +# @FUNCTION: llvm_cmake_use_musl +# @DESCRIPTION: +# Determine whether the given LLVM project should be built with musl +# support. That should be the case if the CTARGET (or CHOST) is a musl +# environment. +# +# If musl should be used, echo "ON", otherwise echo "OFF". +llvm_cmake_use_musl() { + if [[ "${CTARGET:-${CHOST}}" == *-*-*-musl* ]]; then + echo "ON" + else + echo "OFF" + fi +} + fi From 49274e2642fd48181fa21c6a63e808e297502f85 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:09:23 +0000 Subject: [PATCH 076/153] eclass/rust: Sync with Gentoo It's from Gentoo commit 8562c054ab313c75ce0bed12d2177f98e7020ae6. --- .../portage-stable/eclass/rust.eclass | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/rust.eclass b/sdk_container/src/third_party/portage-stable/eclass/rust.eclass index 9ead9d0057..41197ce4e3 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/rust.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/rust.eclass @@ -12,12 +12,12 @@ # An eclass to reliably depend on a Rust or Rust/LLVM combination for # a given Rust slot. To use the eclass: # -# 1. If required, set RUST_{MAX,MIN}_SLOT to the range of supported slots. +# 1. If required, set RUST_{MAX,MIN}_VER to the range of supported slots. # # 2. If rust is optional, set RUST_OPTIONAL to a non-empty value then -# appropriately gate ${RUST_DEPEND} +# appropriately gate ${RUST_DEPEND}. # -# 3. Use rust_pkg_setup, get_rust_prefix or RUST_SLOT. +# 3. Use rust_pkg_setup, get_rust_prefix, or RUST_SLOT. # Example use for a package supporting Rust 1.72.0 to 1.82.0: # @CODE @@ -116,7 +116,7 @@ declare -a -g -r _RUST_SLOTS_ORDERED=( # @USER_VARIABLE # @DESCRIPTION: # Specify the version (slot) of Rust to be used by the package. This is -# useful for troubleshooting and debugging purposes; If unset, the newest +# useful for troubleshooting and debugging purposes. If unset, the newest # acceptable Rust version will be used. May be combined with ERUST_TYPE_OVERRIDE. # This variable must not be set in ebuilds. @@ -144,6 +144,18 @@ declare -a -g -r _RUST_SLOTS_ORDERED=( # Lowest Rust slot supported by the package. Needs to be set before # rust_pkg_setup is called. If unset, no lower bound is assumed. +# @ECLASS_VARIABLE: RUST_SLOT +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# The selected Rust slot for building, from the range defined by +# RUST_MAX_VER and RUST_MIN_VER. This is set by rust_pkg_setup. + +# @ECLASS_VARIABLE: RUST_TYPE +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# The selected Rust type for building, either 'source' or 'binary'. +# This is set by rust_pkg_setup. + # @ECLASS_VARIABLE: RUST_NEEDS_LLVM # @DEFAULT_UNSET # @DESCRIPTION: @@ -175,7 +187,7 @@ declare -a -g -r _RUST_SLOTS_ORDERED=( # @DEFAULT_UNSET # @DESCRIPTION: # If set to a non-empty value, the Rust dependency will not be added -# to BDEPEND. This is useful for where packages need to gate rust behind +# to BDEPEND. This is useful for packages that need to gate rust behind # certain USE themselves. # @ECLASS_VARIABLE: RUST_REQ_USE @@ -303,12 +315,12 @@ unset -f _rust_set_globals # If -d is specified, the checks are performed relative to ESYSROOT, # and ESYSROOT-path is returned. # -# If RUST_M{AX,IN}_SLOT is non-zero, then only Rust versions that +# If RUST_M{AX,IN}_VER is non-zero, then only Rust versions that # are not newer or older than the specified slot(s) will be considered. -# Otherwise, all Rust versions are be considered acceptable. +# Otherwise, all Rust versions are considered acceptable. # # If the `rust_check_deps()` function is defined within the ebuild, it -# will be called to verify whether a particular slot is accepable. +# will be called to verify whether a particular slot is acceptable. # Within the function scope, RUST_SLOT and LLVM_SLOT will be defined. # # The function should return a true status if the slot is acceptable, @@ -443,7 +455,7 @@ _get_rust_slot() { # @FUNCTION: get_rust_path # @USAGE: prefix slot rust_type # @DESCRIPTION: -# Given argument of slot and rust_type, return an appropriate path +# Given arguments of prefix, slot, and rust_type, return an appropriate path # for the Rust install. The rust_type should be either "source" # or "binary". If the rust_type is not one of these, the function # will die. @@ -472,7 +484,7 @@ get_rust_path() { # and print an absolute path to it. If both -bin and regular Rust # are installed, the regular Rust is preferred. # -# The options and behavior are the same as get_rust_slot. +# The options and behavior are the same as _get_rust_slot. get_rust_prefix() { debug-print-function ${FUNCNAME} "$@" @@ -501,10 +513,10 @@ rust_prepend_path() { # `llvm-r1_pkg_setup` call should be made in addition to this function. # For path determination logic, please see the get_rust_prefix documentation. # -# The highest acceptable Rust slot can be set in RUST_MAX_VER variable. +# The highest acceptable Rust slot can be set in the RUST_MAX_VER variable. # If it is unset or empty, any slot is acceptable. # -# The lowest acceptable Rust slot can be set in RUST_MIN_VER variable. +# The lowest acceptable Rust slot can be set in the RUST_MIN_VER variable. # If it is unset or empty, any slot is acceptable. # # `CARGO` and `RUSTC` variables are set for the selected slot and exported. From 954865a94eac1e4d6ec01e6302604b6ac9d278ff Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:09:43 +0000 Subject: [PATCH 077/153] eclass/toolchain: Sync with Gentoo It's from Gentoo commit 9c4f5b81368474b9bb7fb8245945c7faba3cc3e5. --- .../portage-stable/eclass/toolchain.eclass | 41 ++++++++++++++----- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass index 693a356d54..bb8bb65123 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass @@ -340,6 +340,7 @@ if [[ ${PN} != kgcc64 && ${PN} != gcc-* ]] ; then tc_version_is_at_least 14.0.0_pre20230423 ${PV} && IUSE+=" rust" TC_FEATURES+=( rust ) tc_version_is_at_least 14.2.1_p20241026 ${PV} && IUSE+=" time64" tc_version_is_at_least 15.0.0_pre20241124 ${PV} && IUSE+=" libgdiagnostics" + tc_version_is_at_least 15.0.1_pre20250316 ${PV} && IUSE+=" cobol" fi if tc_version_is_at_least 10; then @@ -428,15 +429,15 @@ if [[ ${PN} != gnat-gpl ]] && tc_has_feature ada ; then ) " else - BDEPEND+=" - ada? ( - || ( - sys-devel/gcc:${SLOT}[ada] - Date: Mon, 17 Mar 2025 07:10:04 +0000 Subject: [PATCH 078/153] eclass/xorg-3: Sync with Gentoo It's from Gentoo commit aba106695eda9ab637305e3035a85175a323357e. --- .../src/third_party/portage-stable/eclass/xorg-3.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass b/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass index 2ca5959dd1..db2d8fa85d 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xorg-3.eclass @@ -135,7 +135,11 @@ if [[ ${PN} != util-macros ]] ; then # Required even by xorg-server [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0" fi -[[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}" +if [[ ${XORG_EAUTORECONF} == no ]] ; then + BDEPEND+=" ${LIBTOOL_DEPEND}" +else + BDEPEND+=" ${EAUTORECONF_DEPEND}" +fi unset EAUTORECONF_DEPEND # @ECLASS_VARIABLE: FONT_DIR From da9f1d5eb5b64b35b559951165249d4b8a0cc6dd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:04 +0000 Subject: [PATCH 079/153] media-libs/libpng: Sync with Gentoo It's from Gentoo commit bc33be3b0ad052c76a945429b6e4e431f9db8e9e. --- .../portage-stable/media-libs/libpng/Manifest | 2 + .../media-libs/libpng/libpng-1.6.46.ebuild | 2 +- .../media-libs/libpng/libpng-1.6.47.ebuild | 69 +++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.47.ebuild diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest b/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest index 3ded2bc40c..4a29aea5ae 100644 --- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest +++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest @@ -2,3 +2,5 @@ DIST libpng-1.6.44-apng-apng.patch.gz 10336 BLAKE2B 3c78cadd08b48466eee7c271ec82 DIST libpng-1.6.44.tar.xz 1045640 BLAKE2B 61064dd83f40a7e2e60ff723a568b7d0cda95aa80621a211aee7127b9783fbfc20cd82a2fe2d03584cbf9ab77c5444e3e008ac5ccc7f64af6e858ebcbcb78822 SHA512 bbd3e5e68d8b6fe3d85e59ca0babe8b522c19cac4b6ce0fcf21516cda7120b642be611eb1eaa565b7eabbacd22606593619aabd227b43a36f1efc707e7e11851 DIST libpng-1.6.46-apng-apng.patch.gz 10266 BLAKE2B 51d04187fa631fcc388fafa86683579fe20a58c3f5dafb721632b82a82568842dff6772e29de1d95ffa5cb2dc188338c67f3d4427b9ee69fe98d20ab825aa0ba SHA512 78b33e4e2c68e8486c6666a5e2bdc57457e34952e2d0f8eed710913c92b895b8f96b96f0cfe8600a1c47c0b368e025f2fc20f3f52c435e5b3574e9f5aa546863 DIST libpng-1.6.46.tar.xz 1054296 BLAKE2B 0cc4e4ca0a9394e1ee2778065ef03859854062103609c9356709a9540b8953a6198b5c44a5a05ae97d8f0e6035a171ab1797627f6523805cedf3f985960752c3 SHA512 80c4cb644e11d39533344e017faf61700fdfbf758531b1a9ffbeb0a2f8540d9ed373f4adab590ae994f5a17f7fd6eff8dac16ebfcc2a0c31e899fd63ae1e4c1e +DIST libpng-1.6.47-libpng-apng-apng.patch.gz 10697 BLAKE2B eadf410ea5ef073e444dd1158dfdb80900a594fb1cc41edfd1c63524bdd92195d10a9e0d0fbe1bf729a5df2970994d5617e56d85c861d0b845a815fdec3c4200 SHA512 5ea0e661f83a1966791eef3479ad7496787d3bc9eb6911475384da1c027444b1158bdb0f169d400ee9e1444c93e2bf435a4d8eb411901dd8e839b059baf9f38d +DIST libpng-1.6.47.tar.xz 1054664 BLAKE2B 3dafe005931cd5b7709278f8d1961250c1d80ade4e73b568a211b409e7cac44f42692c6501851620ccd549d5c466b697dc6bbecf56e969e00b54c22a7cde0d72 SHA512 932578dedd7916e2c502d8d11eef845e15733e84062510ba246b027d5467efe786725ff3dd22b9a33ff6a052c8dab3da3b45cb737a00caed43b6598c2bd8122b diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.46.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.46.ebuild index 17cfb6906c..f06ad61580 100644 --- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.46.ebuild +++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.46.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="libpng2" SLOT="0/16" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="apng cpu_flags_x86_sse static-libs test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.47.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.47.ebuild new file mode 100644 index 0000000000..fd9fc70c28 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.47.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit libtool multilib-minimal + +APNG_REPO=libpng-apng # sometimes libpng-apng is more up to date +APNG_VERSION="1.6.47" +DESCRIPTION="Portable Network Graphics library" +HOMEPAGE="http://www.libpng.org/" +SRC_URI=" + https://downloads.sourceforge.net/${PN}/${P}.tar.xz + apng? ( + https://downloads.sourceforge.net/${APNG_REPO}/${PN}$(ver_rs 1-2 '' $(ver_cut 1-2 ${APNG_VERSION}))/${PV}/${PN}-${APNG_VERSION}-apng.patch.gz -> ${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch.gz + https://downloads.sourceforge.net/${APNG_REPO}/${PN}$(ver_rs 1-2 '' $(ver_cut 1-2 ${APNG_VERSION}))/${PN}-${APNG_VERSION}-apng.patch.gz -> ${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch.gz + ) +" + +LICENSE="libpng2" +SLOT="0/16" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="apng cpu_flags_x86_sse static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO ) + +src_prepare() { + default + + if use apng; then + case ${APNG_REPO} in + apng) + eapply -p0 "${WORKDIR}"/${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch + ;; + libpng-apng) + eapply "${WORKDIR}"/${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch + ;; + *) + die "Unknown APNG_REPO!" + ;; + esac + + # Don't execute symbols check with apng patch, bug #378111 + sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die + fi + + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + $(multilib_native_enable tools) + $(use_enable test tests) + $(use_enable cpu_flags_x86_sse intel-sse) + $(use_enable static-libs static) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + default + + find "${ED}" \( -type f -o -type l \) -name '*.la' -delete || die +} From 8e60be89b3efe4fe8f6c3dbd91e33a77ab831d7b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:06 +0000 Subject: [PATCH 080/153] net-analyzer/tcpdump: Sync with Gentoo It's from Gentoo commit 43e8e3b723ab5bac9e8b201ffe0f71a7fe5ed352. --- .../portage-stable/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild | 4 ++-- .../portage-stable/net-analyzer/tcpdump/tcpdump-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild index 95b3ebb67c..90a87834a8 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-4.99.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ else 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="BSD" diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-9999.ebuild index c05930c1b4..249713bdec 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ else 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="BSD" From 954e83b33e9d980bb0d2d3763350348fb887f2bc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:09 +0000 Subject: [PATCH 081/153] net-dns/dnsmasq: Sync with Gentoo It's from Gentoo commit bc28838e03d4ee64011aab3a4670639eadcec36b. --- .../net-dns/dnsmasq/dnsmasq-2.90-r1.ebuild | 235 +++++++++++ .../dnsmasq/files/dnsmasq-2.90-gcc15.patch | 376 ++++++++++++++++++ 2 files changed, 611 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.90-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.90-gcc15.patch diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.90-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.90-r1.ebuild new file mode 100644 index 0000000000..85c1b1f6d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/dnsmasq-2.90-r1.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit flag-o-matic toolchain-funcs lua-single systemd + +DESCRIPTION="Small forwarding DNS server" +HOMEPAGE="https://thekelleys.org.uk/dnsmasq/doc.html" +SRC_URI="https://thekelleys.org.uk/dnsmasq/${P}.tar.xz" + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" +IUSE+=" +loop +inotify ipv6 lua nettlehash nls script selinux static tftp" + +DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) + +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +COMMON_DEPEND=" + acct-group/dnsmasq + acct-user/dnsmasq + dbus? ( sys-apps/dbus:= ) + idn? ( + !libidn2? ( net-dns/libidn:0= ) + libidn2? ( >=net-dns/libidn2-2.0:= ) + ) + lua? ( ${LUA_DEPS} ) + conntrack? ( net-libs/libnetfilter_conntrack:= ) + nls? ( sys-devel/gettext ) +" + +DEPEND="${COMMON_DEPEND} + dnssec? ( + dev-libs/nettle:=[gmp] + static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) + ) + nettlehash? ( + static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) + ) +" + +RDEPEND="${COMMON_DEPEND} + dnssec? ( + !static? ( >=dev-libs/nettle-3.4:=[gmp] ) + ) + nettlehash? ( + !static? ( dev-libs/nettle:=[gmp] ) + ) + selinux? ( sec-policy/selinux-dnsmasq ) +" + +REQUIRED_USE=" + dhcp-tools? ( dhcp ) + dnssec? ( !nettlehash ) + lua? ( + script + ${LUA_REQUIRED_USE} + ) + libidn2? ( idn ) +" + +PATCHES=( + "${FILESDIR}/dnsmasq-2.90-gcc15.patch" +) + +use_have() { + local no_only + if [[ ${1} == '-n' ]]; then + no_only=1 + shift + fi + local useflag="${1}" + shift + + local uword="${1:-${useflag}}" + shift + + while [[ ${uword} ]]; do + uword="${uword^^}" + + if ! use "${useflag}"; then + printf -- " -DNO_%s" "${uword}" + elif [[ -z "${no_only}" ]]; then + printf -- " -DHAVE_%s" "${uword}" + fi + uword="${1}" + shift + done +} + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +pkg_pretend() { + if use static; then + einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." + use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \ + "in this case the static USE flag does nothing." + fi +} + +src_prepare() { + default + + sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \ + dnsmasq.conf.example || die +} + +src_configure() { + COPTS=( + $(use_have -n auth-dns auth) + $(use_have conntrack) + $(use_have dbus) + $(use libidn2 || use_have idn) + $(use_have libidn2) + $(use_have -n inotify) + $(use_have -n dhcp dhcp dhcp6) + $(use_have -n ipv6 ipv6 dhcp6) + $(use_have -n id id) + $(use_have -n loop) + $(use_have lua luascript) + $(use_have -n script) + $(use_have -n tftp) + $(use_have dnssec) + $(use_have nettlehash) + $(use_have static dnssec_static) + $(use_have -n dumpfile) + ) +} + +src_compile() { + emake \ + PREFIX=/usr \ + MANDIR=/usr/share/man \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + COPTS="${COPTS[*]}" \ + CONFFILE="/etc/${PN}.conf" \ + all$(use nls && printf -- "-i18n\n") + + use dhcp-tools && emake -C contrib/lease-tools \ + PREFIX=/usr \ + MANDIR=/usr/share/man \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + all +} + +src_install() { + local lingua puid + emake \ + PREFIX=/usr \ + MANDIR=/usr/share/man \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + COPTS="${COPTS[*]}" \ + CONFFILE="/etc/${PN}.conf" \ + DESTDIR="${ED}" \ + install$(use nls && printf -- "-i18n\n") + + for lingua in "${DM_LINGUAS[@]}"; do + has ${lingua} ${LINGUAS-${lingua}} \ + || rm -rf "${ED}"/usr/share/locale/${lingua} + done + [[ -d "${D}"/usr/share/locale/ ]] && \ + rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/ + + dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example + dodoc -r logo + + docinto html/ + dodoc *.html + + newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN} + newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} + + insinto /etc/logrotate.d + newins "${FILESDIR}"/dnsmasq.logrotate ${PN} + + insinto /etc + newins dnsmasq.conf.example dnsmasq.conf + + insinto /usr/share/dnsmasq + doins trust-anchors.conf + + if use dhcp; then + keepdir /var/lib/misc + newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN} + fi + if use dbus; then + insinto /etc/dbus-1/system.d + doins dbus/dnsmasq.conf + + docinto + dodoc dbus/DBus-interface + fi + + if use dhcp-tools; then + dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} + doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 + if use ipv6; then + dosbin contrib/lease-tools/dhcp_release6 + doman contrib/lease-tools/dhcp_release6.1 + fi + fi + + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service +} + +pkg_preinst() { + [[ -f /var/lib/misc/dnsmasq.leases ]] && \ + cp /var/lib/misc/dnsmasq.leases "${T}" +} + +pkg_postinst() { + [[ -f "${T}"/dnsmasq.leases ]] && \ + cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases +} diff --git a/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.90-gcc15.patch b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.90-gcc15.patch new file mode 100644 index 0000000000..a0efca3ab6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dns/dnsmasq/files/dnsmasq-2.90-gcc15.patch @@ -0,0 +1,376 @@ +https://bugs.gentoo.org/943671 + +From da2cc84854a01dd08a8bb4161428be20b83a5ec7 Mon Sep 17 00:00:00 2001 +From: gen2dev +Date: Sun, 1 Dec 2024 22:53:16 +0000 +Subject: [PATCH] Fix GCC-15, C23 compatibility and + -Wincompatible-pointer-types errors + +A bug in gentoo linux https://bugs.gentoo.org/945183 reported that dnsmasq 2.90 fails to compile with GCC 15. + +The issue is that while previous versions of GCC defaulted to the C17 standard and C23 could be selected with +"-std=c23" or "-std=gnu23", GCC 15 defaults to C23. In C23 incompatible pointer types are an error instead of +a warning, so the "int (*callback)()" incomplete prototypes cause errors. + +For example, compiling dnsmasq 2.90 with gcc 14.2.1 and "-std=gnu23" fails with errors such as: + lease.c: In function `lease_find_interfaces': + lease.c:467:34: warning: passing argument 3 of `iface_enumerate' from incompatible pointer type [-Wincompatible-pointer-types[https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wincompatible-pointer-types]] + 467 | iface_enumerate(AF_INET, &now, find_interface_v4); + | ^~~~~~~~~~~~~~~~~ + | | + | int (*)(struct in_addr, int, char *, struct in_addr, struct in_addr, void *) + In file included from lease.c:17: + dnsmasq.h:1662:50: note: expected `int (*)(void)' but argument is of type `int (*)(struct in_addr, int, char *, struct in_addr, struct in_addr, void *)' + 1662 | int iface_enumerate(int family, void *parm, int (callback)()); + | ~~~~~^~~~~~~~~~~ + +This patch uses a typedef'ed union of pointer types to get type checking of the pointers. If that's too complicated, +another way might be to use (void *) casts to disable type checking. + +Also, some of the IPv6 callbacks had "int preferred, int valid" and some had +"unsigned int preferred, unsigned int valid". This patch changes them all to "unsigned int" +so they're the same and to avoid casting "u32" to "int", eg: + u32 preferred = 0xffffffff; + callback(..., (int)preferred, ...) +Even if those cast values aren't used in the callback, casting u32 to "int" feels bad, especially if "int" is 32 bits. +--- + src/arp.c | 2 +- + src/bpf.c | 14 +++++++------- + src/dhcp.c | 4 ++-- + src/dhcp6.c | 8 ++++---- + src/dnsmasq.h | 8 +++++++- + src/lease.c | 6 +++--- + src/netlink.c | 12 ++++++------ + src/network.c | 6 +++--- + src/radv.c | 14 +++++++------- + 9 files changed, 40 insertions(+), 34 deletions(-) + +diff --git a/src/arp.c b/src/arp.c +index 0a5a9bf..6ff1f01 100644 +--- a/src/arp.c ++++ b/src/arp.c +@@ -152,7 +152,7 @@ int find_mac(union mysockaddr *addr, unsigned char *mac, int lazy, time_t now) + if (arp->status != ARP_EMPTY) + arp->status = ARP_MARK; + +- iface_enumerate(AF_UNSPEC, NULL, filter_mac); ++ iface_enumerate(AF_UNSPEC, NULL, (callback_t){.af_unspec=filter_mac}); + + /* Remove all unconfirmed entries to old list. */ + for (arp = arps, up = &arps; arp; arp = tmp) +diff --git a/src/bpf.c b/src/bpf.c +index 62b589c..82d0125 100644 +--- a/src/bpf.c ++++ b/src/bpf.c +@@ -47,7 +47,7 @@ static union all_addr del_addr; + + #if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__) + +-int arp_enumerate(void *parm, int (*callback)()) ++int arp_enumerate(void *parm, callback_t callback) + { + int mib[6]; + size_t needed; +@@ -91,7 +91,7 @@ int arp_enumerate(void *parm, int (*callback)()) + rtm = (struct rt_msghdr *)next; + sin2 = (struct sockaddr_inarp *)(rtm + 1); + sdl = (struct sockaddr_dl *)((char *)sin2 + SA_SIZE(sin2)); +- if (!(*callback)(AF_INET, &sin2->sin_addr, LLADDR(sdl), sdl->sdl_alen, parm)) ++ if (!callback.af_unspec(AF_INET, &sin2->sin_addr, LLADDR(sdl), sdl->sdl_alen, parm)) + return 0; + } + +@@ -107,7 +107,7 @@ int iface_enumerate(int family, void *parm, int (*callback)()) + + if (family == AF_UNSPEC) + #if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__) +- return arp_enumerate(parm, callback); ++ return arp_enumerate(parm, callback.af_unspec); + #else + return 0; /* need code for Solaris and MacOS*/ + #endif +@@ -147,7 +147,7 @@ int iface_enumerate(int family, void *parm, int (*callback)()) + broadcast = ((struct sockaddr_in *) addrs->ifa_broadaddr)->sin_addr; + else + broadcast.s_addr = 0; +- if (!((*callback)(addr, iface_index, NULL, netmask, broadcast, parm))) ++ if (!callback.af_inet(addr, iface_index, NULL, netmask, broadcast, parm)) + goto err; + } + else if (family == AF_INET6) +@@ -212,8 +212,8 @@ int iface_enumerate(int family, void *parm, int (*callback)()) + addr->s6_addr[3] = 0; + } + +- if (!((*callback)(addr, prefix, scope_id, iface_index, flags, +- (int) preferred, (int)valid, parm))) ++ if (!callback.af_inet6(addr, prefix, scope_id, iface_index, flags, ++ (unsigned int) preferred, (unsigned int)valid, parm)) + goto err; + } + +@@ -223,7 +223,7 @@ int iface_enumerate(int family, void *parm, int (*callback)()) + /* Assume ethernet again here */ + struct sockaddr_dl *sdl = (struct sockaddr_dl *) addrs->ifa_addr; + if (sdl->sdl_alen != 0 && +- !((*callback)(iface_index, ARPHRD_ETHER, LLADDR(sdl), sdl->sdl_alen, parm))) ++ !callback.af_local(iface_index, ARPHRD_ETHER, LLADDR(sdl), sdl->sdl_alen, parm)) + goto err; + } + #endif +diff --git a/src/dhcp.c b/src/dhcp.c +index 2603c76..009c2a0 100644 +--- a/src/dhcp.c ++++ b/src/dhcp.c +@@ -317,7 +317,7 @@ void dhcp_packet(time_t now, int pxe_fd) + match.ind = iface_index; + + if (!daemon->if_addrs || +- !iface_enumerate(AF_INET, &match, check_listen_addrs) || ++ !iface_enumerate(AF_INET, &match, (callback_t){.af_inet=check_listen_addrs}) || + !match.matched) + return; + +@@ -330,7 +330,7 @@ void dhcp_packet(time_t now, int pxe_fd) + if (relay_upstream4(iface_index, mess, (size_t)sz)) + return; + +- if (!iface_enumerate(AF_INET, &parm, complete_context)) ++ if (!iface_enumerate(AF_INET, &parm, (callback_t){.af_inet=complete_context})) + return; + + /* Check for a relay again after iface_enumerate/complete_context has had +diff --git a/src/dhcp6.c b/src/dhcp6.c +index c9d54dc..303d33c 100644 +--- a/src/dhcp6.c ++++ b/src/dhcp6.c +@@ -239,7 +239,7 @@ void dhcp6_packet(time_t now) + relay_upstream6(if_index, (size_t)sz, &from.sin6_addr, from.sin6_scope_id, now)) + return; + +- if (!iface_enumerate(AF_INET6, &parm, complete_context6)) ++ if (!iface_enumerate(AF_INET6, &parm, (callback_t){.af_inet6=complete_context6})) + return; + + /* Check for a relay again after iface_enumerate/complete_context has had +@@ -617,7 +617,7 @@ void make_duid(time_t now) + newnow = now - 946684800; + #endif + +- iface_enumerate(AF_LOCAL, &newnow, make_duid1); ++ iface_enumerate(AF_LOCAL, &newnow, (callback_t){.af_local=make_duid1}); + + if(!daemon->duid) + die("Cannot create DHCPv6 server DUID: %s", NULL, EC_MISC); +@@ -667,7 +667,7 @@ struct cparam { + + static int construct_worker(struct in6_addr *local, int prefix, + int scope, int if_index, int flags, +- int preferred, int valid, void *vparam) ++ unsigned int preferred, unsigned int valid, void *vparam) + { + char ifrn_name[IFNAMSIZ]; + struct in6_addr start6, end6; +@@ -801,7 +801,7 @@ void dhcp_construct_contexts(time_t now) + if (context->flags & CONTEXT_CONSTRUCTED) + context->flags |= CONTEXT_GC; + +- iface_enumerate(AF_INET6, ¶m, construct_worker); ++ iface_enumerate(AF_INET6, ¶m, (callback_t){.af_inet6=construct_worker}); + + for (up = &daemon->dhcp6, context = daemon->dhcp6; context; context = tmp) + { +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index a9019ee..abb06c8 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -1662,7 +1662,13 @@ void route_sock(void); + #endif + + /* bpf.c or netlink.c */ +-int iface_enumerate(int family, void *parm, int (callback)()); ++typedef union { ++ int (*af_unspec)(int family, char *addrp, char *mac, size_t maclen, void *parmv); ++ int (*af_inet)(struct in_addr local, int if_index, char *label, struct in_addr netmask, struct in_addr broadcast, void *vparam); ++ int (*af_inet6)(struct in6_addr *local, int prefix, int scope, int if_index, int flags, unsigned int preferred, unsigned int valid, void *vparam); ++ int (*af_local)(int index, unsigned int type, char *mac, size_t maclen, void *parm); ++} callback_t; ++int iface_enumerate(int family, void *parm, callback_t callback); + + /* dbus.c */ + #ifdef HAVE_DBUS +diff --git a/src/lease.c b/src/lease.c +index a133021..06a6ae4 100644 +--- a/src/lease.c ++++ b/src/lease.c +@@ -411,7 +411,7 @@ static int find_interface_v4(struct in_addr local, int if_index, char *label, + #ifdef HAVE_DHCP6 + static int find_interface_v6(struct in6_addr *local, int prefix, + int scope, int if_index, int flags, +- int preferred, int valid, void *vparam) ++ unsigned int preferred, unsigned int valid, void *vparam) + { + struct dhcp_lease *lease; + +@@ -468,9 +468,9 @@ void lease_find_interfaces(time_t now) + for (lease = leases; lease; lease = lease->next) + lease->new_prefixlen = lease->new_interface = 0; + +- iface_enumerate(AF_INET, &now, find_interface_v4); ++ iface_enumerate(AF_INET, &now, (callback_t){.af_inet=find_interface_v4}); + #ifdef HAVE_DHCP6 +- iface_enumerate(AF_INET6, &now, find_interface_v6); ++ iface_enumerate(AF_INET6, &now, (callback_t){.af_inet6=find_interface_v6}); + #endif + + for (lease = leases; lease; lease = lease->next) +diff --git a/src/netlink.c b/src/netlink.c +index ef4b5fe..c706339 100644 +--- a/src/netlink.c ++++ b/src/netlink.c +@@ -151,7 +151,7 @@ static ssize_t netlink_recv(int flags) + family = AF_LOCAL finds MAC addresses. + returns 0 on failure, 1 on success, -1 when restart is required + */ +-int iface_enumerate(int family, void *parm, int (*callback)()) ++int iface_enumerate(int family, void *parm, callback_t callback) + { + struct sockaddr_nl addr; + struct nlmsghdr *h; +@@ -247,7 +247,7 @@ int iface_enumerate(int family, void *parm, int (*callback)()) + } + + if (addr.s_addr && callback_ok) +- if (!((*callback)(addr, ifa->ifa_index, label, netmask, broadcast, parm))) ++ if (!callback.af_inet(addr, ifa->ifa_index, label, netmask, broadcast, parm)) + callback_ok = 0; + } + else if (ifa->ifa_family == AF_INET6) +@@ -288,9 +288,9 @@ int iface_enumerate(int family, void *parm, int (*callback)()) + flags |= IFACE_PERMANENT; + + if (addrp && callback_ok) +- if (!((*callback)(addrp, (int)(ifa->ifa_prefixlen), (int)(ifa->ifa_scope), ++ if (!callback.af_inet6(addrp, (int)(ifa->ifa_prefixlen), (int)(ifa->ifa_scope), + (int)(ifa->ifa_index), flags, +- (int) preferred, (int)valid, parm))) ++ (unsigned int)preferred, (unsigned int)valid, parm)) + callback_ok = 0; + } + } +@@ -318,7 +318,7 @@ int iface_enumerate(int family, void *parm, int (*callback)()) + + if (!(neigh->ndm_state & (NUD_NOARP | NUD_INCOMPLETE | NUD_FAILED)) && + inaddr && mac && callback_ok) +- if (!((*callback)(neigh->ndm_family, inaddr, mac, maclen, parm))) ++ if (!callback.af_unspec(neigh->ndm_family, inaddr, mac, maclen, parm)) + callback_ok = 0; + } + #ifdef HAVE_DHCP6 +@@ -342,7 +342,7 @@ int iface_enumerate(int family, void *parm, int (*callback)()) + } + + if (mac && callback_ok && !((link->ifi_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) && +- !((*callback)((int)link->ifi_index, (unsigned int)link->ifi_type, mac, maclen, parm))) ++ !callback.af_local((int)link->ifi_index, (unsigned int)link->ifi_type, mac, maclen, parm)) + callback_ok = 0; + } + #endif +diff --git a/src/network.c b/src/network.c +index 0e93c4d..36d9262 100644 +--- a/src/network.c ++++ b/src/network.c +@@ -596,7 +596,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label, + + static int iface_allowed_v6(struct in6_addr *local, int prefix, + int scope, int if_index, int flags, +- int preferred, int valid, void *vparam) ++ unsigned int preferred, unsigned int valid, void *vparam) + { + union mysockaddr addr; + struct in_addr netmask; /* dummy */ +@@ -833,12 +833,12 @@ again: + + param.spare = spare; + +- ret = iface_enumerate(AF_INET6, ¶m, iface_allowed_v6); ++ ret = iface_enumerate(AF_INET6, ¶m, (callback_t){.af_inet6=iface_allowed_v6}); + if (ret < 0) + goto again; + else if (ret) + { +- ret = iface_enumerate(AF_INET, ¶m, iface_allowed_v4); ++ ret = iface_enumerate(AF_INET, ¶m, (callback_t){.af_inet=iface_allowed_v4}); + if (ret < 0) + goto again; + } +diff --git a/src/radv.c b/src/radv.c +index d2d3390..f39716c 100644 +--- a/src/radv.c ++++ b/src/radv.c +@@ -58,7 +58,7 @@ static int add_prefixes(struct in6_addr *local, int prefix, + unsigned int preferred, unsigned int valid, void *vparam); + static int iface_search(struct in6_addr *local, int prefix, + int scope, int if_index, int flags, +- int prefered, int valid, void *vparam); ++ unsigned int prefered, unsigned int valid, void *vparam); + static int add_lla(int index, unsigned int type, char *mac, size_t maclen, void *parm); + static void new_timeout(struct dhcp_context *context, char *iface_name, time_t now); + static unsigned int calc_lifetime(struct ra_interface *ra); +@@ -307,7 +307,7 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad + + /* If no link-local address then we can't advertise since source address of + advertisement must be link local address: RFC 4861 para 6.1.2. */ +- if (!iface_enumerate(AF_INET6, &parm, add_prefixes) || ++ if (!iface_enumerate(AF_INET6, &parm, (callback_t){.af_inet6=add_prefixes}) || + parm.link_pref_time == 0) + return; + +@@ -449,7 +449,7 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad + put_opt6_long(mtu); + } + +- iface_enumerate(AF_LOCAL, &send_iface, add_lla); ++ iface_enumerate(AF_LOCAL, &send_iface, (callback_t){.af_local=add_lla}); + + /* RDNSS, RFC 6106, use relevant DHCP6 options */ + (void)option_filter(parm.tags, NULL, daemon->dhcp_opts6); +@@ -823,7 +823,7 @@ time_t periodic_ra(time_t now) + param.iface = context->if_index; + new_timeout(context, param.name, now); + } +- else if (iface_enumerate(AF_INET6, ¶m, iface_search)) ++ else if (iface_enumerate(AF_INET6, ¶m, (callback_t){.af_inet6=iface_search})) + /* There's a context overdue, but we can't find an interface + associated with it, because it's for a subnet we dont + have an interface on. Probably we're doing DHCP on +@@ -856,7 +856,7 @@ time_t periodic_ra(time_t now) + aparam.iface = param.iface; + aparam.alias_ifs = NULL; + aparam.num_alias_ifs = 0; +- iface_enumerate(AF_LOCAL, &aparam, send_ra_to_aliases); ++ iface_enumerate(AF_LOCAL, &aparam, (callback_t){.af_local=send_ra_to_aliases}); + my_syslog(MS_DHCP | LOG_INFO, "RTR-ADVERT(%s) %s => %d alias(es)", + param.name, daemon->addrbuff, aparam.num_alias_ifs); + +@@ -871,7 +871,7 @@ time_t periodic_ra(time_t now) + those. */ + aparam.max_alias_ifs = aparam.num_alias_ifs; + aparam.num_alias_ifs = 0; +- iface_enumerate(AF_LOCAL, &aparam, send_ra_to_aliases); ++ iface_enumerate(AF_LOCAL, &aparam, (callback_t){.af_local=send_ra_to_aliases}); + for (; aparam.num_alias_ifs; aparam.num_alias_ifs--) + { + my_syslog(MS_DHCP | LOG_INFO, "RTR-ADVERT(%s) %s => i/f %d", +@@ -920,7 +920,7 @@ static int send_ra_to_aliases(int index, unsigned int type, char *mac, size_t ma + + static int iface_search(struct in6_addr *local, int prefix, + int scope, int if_index, int flags, +- int preferred, int valid, void *vparam) ++ unsigned int preferred, unsigned int valid, void *vparam) + { + struct search_param *param = vparam; + struct dhcp_context *context; +-- +2.20.1 + From 34d50f78e4ae63e800ee3ffb2380b9020b866561 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:13 +0000 Subject: [PATCH 082/153] net-libs/gnutls: Sync with Gentoo It's from Gentoo commit c77230bf79d0c920ef3f36e3b1c16cfbb8d3534c. --- .../portage-stable/net-libs/gnutls/Manifest | 2 - .../gnutls-3.8.7.1-configure-brotli.patch | 156 ---------------- .../gnutls/files/gnutls-3.8.7.1-tests.patch | 45 ----- .../net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild | 166 ------------------ .../net-libs/gnutls/gnutls-3.8.8.ebuild | 2 +- 5 files changed, 1 insertion(+), 370 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/gnutls/files/gnutls-3.8.7.1-configure-brotli.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/gnutls/files/gnutls-3.8.7.1-tests.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/Manifest index d5dd2ac23f..3b6051fad3 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/Manifest @@ -1,5 +1,3 @@ -DIST gnutls-3.8.7.1.tar.xz 6695404 BLAKE2B 43334190ce1e45c5302b195f17d06e767d1bea7376278bfbc6ff181a2f57423ba5f334c00ae1833938c7a7a8d15cf607ac862e57435a756ccfa98527d469fd3a SHA512 429cea78e227d838105791b28a18270c3d2418bfb951c322771e6323d5f712204d63d66a6606ce9604a92d236a8dd07d651232c717264472d27eb6de26ddc733 -DIST gnutls-3.8.7.1.tar.xz.sig 580 BLAKE2B ca627d7b3f089205c94f556bee9c06428ada9e0116bb50486dc7dd70f611ae744416d96b17452749d102ccd16bf7b400577b1886a7c8be55833c9e2fde85f9ae SHA512 53ebdaa9775ae22f7eb5e7d6f5411ec667c9c880cea84e23651b6d1994fb1398c09d8efa39b21c96f8be29fa09c2436bdd732a061308956ca1650e3e1878ed57 DIST gnutls-3.8.8.tar.xz 6696460 BLAKE2B d1498b0b9f14789599fd5b984d5370b632611f2702e9f4fc504ddba2a3e0dd4137bec858eb6150d031f9f50e6b3a3a7d905864f0a9f50a1f01e5ea8f37a44ba8 SHA512 4f617c63e8e8392e400d72c9e39989fcd782268b4a4c4e36bbfb0444a4b5bcb0f53054f04a6dce99ab89c0f38f57430c95aaaec6eb9209b8e9329140abf230c3 DIST gnutls-3.8.8.tar.xz.sig 580 BLAKE2B 11a30f09e3a478615df2c6a0e40c0b9b2aad5794a82ae0cc871fcf3699b5d9725c9d04708c6f0b983da6e21f90a81f7550e723d0d04f97d1a16d526efbe91b1e SHA512 fdff792511e9e5de203a1dfd66bf521c12fb74a19de651ffa1f7359dafdd1dad59ae57d0f95fa363c4167f798e6b624b4ae1f84d4e0737ff690c2fb0e5a5bdce DIST gnutls-3.8.9.tar.xz 6847364 BLAKE2B 0fd4751e24649a9c4b8ee7616350a4b6a504ec10b3ef39b450af25abc4935f30df9e8f732435166516f89c692ac7cb7a0aafb76c4c86c1faff53119840d26ae7 SHA512 b3b201671bf4e75325610a0291d4cd36a669718e22b3685246b64bde97b5bd94f463ab376ed817869869714115f4ff11bdc53c32604bb04a8ff8e10daa6d1fc7 diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/files/gnutls-3.8.7.1-configure-brotli.patch b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/files/gnutls-3.8.7.1-configure-brotli.patch deleted file mode 100644 index 1dac6f514f..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/files/gnutls-3.8.7.1-configure-brotli.patch +++ /dev/null @@ -1,156 +0,0 @@ -https://bugs.gentoo.org/937997 -https://gitlab.com/gnutls/gnutls/-/merge_requests/1867 - -From 292f96f26d7ce80e4a165c903c4fd569b85c1c1f Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Fri, 16 Aug 2024 09:42:15 +0900 -Subject: [PATCH 1/3] build: fix setting AM_CONDITIONAL for brotli and zstd - -As the with_{libbrotli,libzsttd} variables are unset if configured -with --without-{brotli,zstd}, check the unequality to "no" doesn't -work; use explicit matching with "yes" instead. - -Signed-off-by: Daiki Ueno ---- a/configure.ac -+++ b/configure.ac -@@ -1158,7 +1158,7 @@ if test x$ac_brotli != xno; then - else - AC_MSG_RESULT(no) - fi --AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" != "no" && test "$with_libbrotlidec" != "no") -+AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" = yes && test "$with_libbrotlidec" = yes) - - AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [ - save_CFLAGS=$CFLAGS -@@ -1203,7 +1203,7 @@ if test x$ac_zstd != xno; then - else - AC_MSG_RESULT(no) - fi --AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" != "no") -+AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" = yes) - - AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [ - save_CFLAGS=$CFLAGS --- -GitLab - - -From 546153198d2fb8fc4902f23de6254bb7988de534 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Fri, 16 Aug 2024 09:48:31 +0900 -Subject: [PATCH 2/3] build: don't emit Requires.private for dlopened libraries - -Signed-off-by: Daiki Ueno ---- a/configure.ac -+++ b/configure.ac -@@ -1100,11 +1100,6 @@ if test x$ac_zlib != xno; then - PKG_CHECK_EXISTS(zlib, ZLIB_HAS_PKGCONFIG=y, ZLIB_HAS_PKGCONFIG=n) - if test "$ZLIB_HAS_PKGCONFIG" = "y" ; then - PKG_CHECK_MODULES(ZLIB, [zlib]) -- if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then -- GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" -- else -- GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" -- fi - ac_zlib=yes - else - AC_LIB_HAVE_LINKFLAGS(z,, [#include ], [compress (0, 0, 0, 0);]) -@@ -1134,6 +1129,13 @@ AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [ - compress (0, 0, 0, 0);])]) - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -+], -+ [test "$ZLIB_HAS_PKGCONFIG" = y && test "$ac_zlib" = yes], [ -+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then -+ GNUTLS_REQUIRES_PRIVATE="Requires.private: zlib" -+ else -+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, zlib" -+ fi - ]) - - AC_ARG_WITH(brotli, -@@ -1146,11 +1148,6 @@ if test x$ac_brotli != xno; then - PKG_CHECK_MODULES(LIBBROTLIDEC, [libbrotlidec >= 1.0.0], [with_libbrotlidec=yes], [with_libbrotlidec=no]) - if test "${with_libbrotlienc}" = "yes" && test "${with_libbrotlidec}" = "yes"; then - AC_DEFINE([HAVE_LIBBROTLI], 1, [Define if BROTLI compression is enabled.]) -- if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then -- GNUTLS_REQUIRES_PRIVATE="Requires.private: libbrotlienc, libbrotlidec" -- else -- GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libbrotlienc, libbrotlidec" -- fi - need_ltlibdl=yes - else - AC_MSG_WARN(*** LIBBROTLI was not found. You will not be able to use BROTLI compression.) -@@ -1180,6 +1177,13 @@ AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [ - BrotliDecoderVersion();])]) - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -+], -+ [test "$with_libbrotlienc" = yes && test "$with_libbrotlidec" = yes], [ -+ if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then -+ GNUTLS_REQUIRES_PRIVATE="Requires.private: libbrotlienc, libbrotlidec" -+ else -+ GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libbrotlienc, libbrotlidec" -+ fi - ]) - - AC_ARG_WITH(zstd, -@@ -1191,11 +1195,6 @@ if test x$ac_zstd != xno; then - PKG_CHECK_MODULES(LIBZSTD, [libzstd >= 1.3.0], [with_libzstd=yes], [with_libzstd=no]) - if test "${with_libzstd}" = "yes"; then - AC_DEFINE([HAVE_LIBZSTD], 1, [Define if ZSTD compression is enabled.]) -- if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then -- GNUTLS_REQUIRES_PRIVATE="Requires.private: libzstd" -- else -- GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libzstd" -- fi - need_ltlibdl=yes - else - AC_MSG_WARN(*** LIBZSTD was not found. You will not be able to use ZSTD compression.) -@@ -1215,6 +1214,13 @@ AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [ - ZSTD_versionNumber();])]) - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -+], -+ [test "$with_libzstd" = yes], [ -+ if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then -+ GNUTLS_REQUIRES_PRIVATE="Requires.private: libzstd" -+ else -+ GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libzstd" -+ fi - ]) - - AC_ARG_WITH(liboqs, --- -GitLab - - -From 8d0ec0ccdfeaae0d56426169d4c7b490e3b07826 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Fri, 16 Aug 2024 13:35:47 +0900 -Subject: [PATCH 3/3] build: add liboqs in Requires.private in gnutls.pc if - needed - -When --with-liboqs is specified and liboqs cannot be dlopen'ed, it -will be linked at build time. In that case gnutls.pc should indicate -that through Requires.private. - -Signed-off-by: Daiki Ueno ---- a/configure.ac -+++ b/configure.ac -@@ -1256,6 +1256,13 @@ AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [ - OQS_version ();])]) - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -+], -+ [test "$have_liboqs" = yes], [ -+ if test "x$GNUTLS_REQUIRES_PRIVATE" = x; then -+ GNUTLS_REQUIRES_PRIVATE="Requires.private: liboqs" -+ else -+ GNUTLS_REQUIRES_PRIVATE="$GNUTLS_REQUIRES_PRIVATE, liboqs" -+ fi - ]) - - AM_CONDITIONAL(NEED_LTLIBDL, test "$need_ltlibdl" = yes) --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/files/gnutls-3.8.7.1-tests.patch b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/files/gnutls-3.8.7.1-tests.patch deleted file mode 100644 index 1e1b3b54f4..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/files/gnutls-3.8.7.1-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://gitlab.com/gnutls/gnutls/-/commit/f3e8eac0586a19f4dafd89f68006a536b826e65a - -From f3e8eac0586a19f4dafd89f68006a536b826e65a Mon Sep 17 00:00:00 2001 -From: Andreas Metzler -Date: Thu, 15 Aug 2024 16:22:02 +0200 -Subject: [PATCH] revert back to datefudge for "openssl ocsp". - -openssl's -attime only changes the verification logic but not the -generation. - -Broken by: d1bc7f644422c4d87edfcd9fafe7f292a1a3a6de - -Signed-off-by: Andreas Metzler ---- a/tests/ocsp-tests/ocsp-must-staple-connection.sh -+++ b/tests/ocsp-tests/ocsp-must-staple-connection.sh -@@ -48,6 +48,8 @@ fi - - . "${srcdir}/scripts/common.sh" - -+skip_if_no_datefudge -+ - eval "${GETPORT}" - # Port for gnutls-serv - TLS_SERVER_PORT=$PORT -@@ -69,7 +71,6 @@ fi - - CERTDATE="2016-04-28 00:00:00" - TESTDATE="2016-04-29 00:00:00" --EPOCHTESTDATE=1461888000 - EXP_OCSP_DATE="2016-03-27 00:00:00" - - OCSP_PID="" -@@ -129,8 +130,8 @@ cp "${srcdir}/ocsp-tests/certs/ocsp_index.txt.attr" ${ATTRFILE} - # SO_REUSEADDR usage. - PORT=${OCSP_PORT} - launch_bare_server \ -- "${OPENSSL}" ocsp -attime "${EPOCHTESTDATE}" \ -- -index "${INDEXFILE}" -text \ -+ "$FAKETIME" "${TESTDATE}" \ -+ "${OPENSSL}" ocsp -index "${INDEXFILE}" -text \ - -port "${OCSP_PORT}" \ - -rsigner "${srcdir}/ocsp-tests/certs/ocsp-server.pem" \ - -rkey "${srcdir}/ocsp-tests/certs/ocsp-server.key" \ --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild deleted file mode 100644 index 4bea59830e..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.7.1-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc -inherit autotools multilib-minimal verify-sig - -DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" -HOMEPAGE="https://www.gnutls.org/" -SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" -SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" -if [[ ${PV} == 3.8.7.1 ]] ; then - # Workaround for botched dist tarball - S="${WORKDIR}"/gnutls-3.8.7 -fi - -LICENSE="GPL-3 LGPL-2.1+" -# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot -# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds. -# Subslot format: -# . -SLOT="0/30.30" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" -REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 tls-heartbeat tools )" -RESTRICT="!test? ( test )" - -# >=nettle-3.10 as a workaround for bug #936011 -RDEPEND=" - >=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] - dev-libs/libunistring:=[${MULTILIB_USEDEP}] - >=dev-libs/nettle-3.10:=[gmp,${MULTILIB_USEDEP}] - >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] - brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] ) - dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) - nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) - pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) - idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) - zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - test-full? ( sys-libs/libseccomp ) -" -BDEPEND=" - dev-build/gtk-doc-am - >=virtual/pkgconfig-0-r1 - doc? ( dev-util/gtk-doc ) - nls? ( sys-devel/gettext ) - test-full? ( - app-crypt/dieharder - || ( sys-libs/libfaketime >=app-misc/datefudge-1.22 ) - dev-libs/softhsm:2[-bindist(-)] - net-dialup/ppp - net-misc/socat - ) - verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20240415 ) -" - -DOCS=( README.md doc/certtool.cfg ) - -HTML_DOCS=() - -QA_CONFIG_IMPL_DECL_SKIP=( - # gnulib FPs - MIN - alignof - static_assert -) - -PATCHES=( - "${FILESDIR}"/${PN}-3.8.7.1-configure-brotli.patch - "${FILESDIR}"/${PN}-3.8.7.1-tests.patch -) - -src_prepare() { - default - - # bug #520818 - export TZ=UTC - - use doc && HTML_DOCS+=( doc/gnutls.html ) - - # don't try to use system certificate store on macOS, it is - # confusingly ignoring our ca-certificates and more importantly - # fails to compile in certain configurations - sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die - - # Use sane .so versioning on FreeBSD. - #elibtoolize - - # Switch back to elibtoolize after 3.8.7.1 - eautoreconf -} - -multilib_src_configure() { - LINGUAS="${LINGUAS//en/en@boldquot en@quot}" - - local libconf=() - - # TPM needs to be tested before being enabled - # Note that this may add a libltdl dep when enabled. Check configure.ac. - libconf+=( - --without-tpm - --without-tpm2 - ) - - # hardware-accel is disabled on OSX because the asm files force - # GNU-stack (as doesn't support that) and when that's removed ld - # complains about duplicate symbols - [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - - # -fanalyzer substantially slows down the build and isn't useful for - # us. It's useful for upstream as it's static analysis, but it's not - # useful when just getting something built. - export gl_cv_warn_c__fanalyzer=no - - local myeconfargs=( - --disable-valgrind-tests - $(multilib_native_enable manpages) - $(multilib_native_use_enable doc gtk-doc) - $(multilib_native_use_enable doc) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable test-full full-test-suite) - $(multilib_native_use_enable test-full seccomp-tests) - $(multilib_native_use_enable tools) - $(use_enable cxx) - $(use_enable dane libdane) - $(use_enable nls) - $(use_enable openssl openssl-compatibility) - $(use_enable sslv2 ssl2-support) - $(use_enable sslv3 ssl3-support) - $(use_enable static-libs static) - $(use_enable tls-heartbeat heartbeat-support) - $(use_with brotli) - $(use_with idn) - $(use_with pkcs11 p11-kit) - $(use_with zlib) - $(use_with zstd) - --disable-rpath - --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt - --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt - --without-included-libtasn1 - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - - ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}" - - if [[ ${CHOST} == *-solaris* ]] ; then - # gnulib ends up defining its own pthread_mutexattr_gettype - # otherwise, which is causing versioning problems - echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >> config.h || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc doc/examples/*.c - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.8.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.8.ebuild index 4fb2c91560..97af7a7619 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.8.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-3 LGPL-2.1+" # Subslot format: # . SLOT="0/30.30" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 tls-heartbeat tools )" RESTRICT="!test? ( test )" From 3ad9bb4ca3ebcaf75d28857acb749bc0bd04a1f7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:29 +0000 Subject: [PATCH 083/153] net-libs/libnsl: Sync with Gentoo It's from Gentoo commit f771cc24352df67d3b7a5171c7af9b755dda0030. --- .../portage-stable/net-libs/libnsl/Manifest | 1 - .../net-libs/libnsl/libnsl-2.0.0-r1.ebuild | 46 ------------------- 2 files changed, 47 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libnsl/libnsl-2.0.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnsl/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/libnsl/Manifest index f977a140c7..29ac4d9729 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnsl/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/libnsl/Manifest @@ -1,3 +1,2 @@ DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620de4eb102f464bc1919b8f6d82f7b02a6108260122000bbac0307d9db05d406183dc533dd1b97683d08a7fc5f5 SHA512 a5a6c3ccb2d1e724c8c1f65e55dcd09383eb1ae019c55f4c09441eadf23ffbc2196cfad259805b0ac40ddf3a10af0da453e4d739d67d46829c64d0995dab4e55 -DIST libnsl-2.0.0.tar.xz 284408 BLAKE2B 843cd0346b45a688c59b88caebd9c5c938b0ef4b5e751b27599ae725a19f0ba2b88bc23b861edc75d79ae6c6bb829e4f82e9e3cd994d25d3385b1a75b9b58b8e SHA512 02ff41d335b7e965182c1f47a6448c1a71ae991a4d5a86ae5472cea7b38633a36b736469cc0d9fc407c706f3f144f90e4b7c9653643976805aa96fc319a69784 DIST libnsl-2.0.1.tar.xz 281892 BLAKE2B 91ad7558127a675bc861dee11d00d82a999462d34753f579a77c1579a7f8be1ded2eff11ecfde9dc81e2466118c288ee18a8b280453f6548cc2b4528021e1503 SHA512 0ffdf15b4380fc89bf11f4f64b74ed999099c0ab3ee39cafd52f933a5000f9b1ed3987c8c13533a7cd92474aadd4cc9909a2e1eabc9143f0cb11746385e5fc57 diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnsl/libnsl-2.0.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libnsl/libnsl-2.0.0-r1.ebuild deleted file mode 100644 index 1de61c58df..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnsl/libnsl-2.0.0-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal preserve-libs - -DESCRIPTION="Public client interface for NIS(YP) in a IPv6 ready version" -HOMEPAGE="https://github.com/thkukuk/libnsl" -SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz" - -# This is a core package which is depended on by e.g. PAM in some cases. -# Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users -# with FEATURES="-preserved-libs" or another package manager if SONAME -# changes. -SLOT="0/3" -LICENSE="LGPL-2.1+ BSD" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -DEPEND=">=net-libs/libtirpc-1.2.0:=[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND} - ! Date: Mon, 17 Mar 2025 07:10:34 +0000 Subject: [PATCH 084/153] net-libs/nghttp2: Sync with Gentoo It's from Gentoo commit 9f54d84a8a03f4584428fd24fc0a08f8cb3721b4. --- .../src/third_party/portage-stable/net-libs/nghttp2/Manifest | 2 +- .../nghttp2/{nghttp2-1.62.1.ebuild => nghttp2-1.65.0.ebuild} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/portage-stable/net-libs/nghttp2/{nghttp2-1.62.1.ebuild => nghttp2-1.65.0.ebuild} (89%) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest index b3a44115c6..5ade248bb1 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/Manifest @@ -1,2 +1,2 @@ -DIST nghttp2-1.62.1.tar.xz 1606084 BLAKE2B 460152f08b4ebd98453b95b737e0729648b95e808e845114a47a23e39fb3c68bf5d165d71467fbca8069fd5e64a63eeedd025919af4e2186da083caa21b93130 SHA512 d5d6b068712e9b467547b0e5380465b8540317134f3f26c2b0c60eb9c604be2f37b4517a98b371d5f5fb668ce2ee35603ddd944224f11e96382aa541a6a17b4c DIST nghttp2-1.64.0.tar.xz 1676124 BLAKE2B e2cad95fbe8447e99728af3ad7656d4dd2d1f51f31294bd38b6c69ee07e6e8e6302c124d47e6274a9a1531257a90bcc5833de390ac704b4b3adf435b9ce38fc9 SHA512 b544196c3b7a55faacd11700d11e2fe4f16a7418282c9abb24a668544a15293580fd1a2cc5f93367c8a17c7ee45335c6d2f5c68a72dd176d516fd033f203eeec +DIST nghttp2-1.65.0.tar.xz 1604848 BLAKE2B 8fb752f55936110a8b5c27873e7e262a0c84740beac46444a80596e25b256ca3a4b0f0cc97a91e104a0f1c59ac0304546310a2817af126efabd2ce26cfd0ee06 SHA512 e1ef685a425017474ea0412c8ad13a217a45a320322b3aee48e646be21457d9b1f374abb9f681f47595a0ad8feb07d076bd0aa3279d35c5c9b5b8c921d8dd39e diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.62.1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.65.0.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.62.1.ebuild rename to sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.65.0.ebuild index ea8616811e..c9976024b9 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.62.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.65.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz LICENSE="MIT" SLOT="0/1.14" # 1. -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" REQUIRED_USE="test? ( static-libs )" From b394cc523334fdd4f3495827a1a992f71647b770 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:37 +0000 Subject: [PATCH 085/153] net-misc/chrony: Sync with Gentoo It's from Gentoo commit 761fa21724bed7d968c8322f77a76e186f9944a8. --- .../portage-stable/net-misc/chrony/Manifest | 4 - .../net-misc/chrony/chrony-4.5.ebuild | 272 ------------------ .../net-misc/chrony/chrony-4.6.ebuild | 272 ------------------ 3 files changed, 548 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/chrony/chrony-4.5.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/chrony/chrony-4.6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-misc/chrony/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/chrony/Manifest index 0a4a6beecc..6005353620 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/chrony/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/chrony/Manifest @@ -1,6 +1,2 @@ -DIST chrony-4.5.tar.gz 620287 BLAKE2B e89665e6ff700805b41f89e9349d280579aebab31a30817512a165da939c8f39dc55ef9a17a50e3d7e298015620667638ab119901a71868a9188093606a95d32 SHA512 58a449e23186da799064b16ab16f799c1673296984b152b43e87c620d86e272c55365e83439d410fc89e4e0ba0befd7d5c625eac78a6665813b7ea75444f71b5 -DIST chrony-4.5.tar.gz.asc 833 BLAKE2B 7d680a4f5d86335b067b95cb900761615180701cabae5978d6f924063f7a43748534bb2e4f23cd9cd2e6919ed005014db6d396330fbfb5aa6d5f1c46f3c0c3a0 SHA512 05470e6cc34524fdab494f70cee71d46172b38bdd4acd8173ac79fdec12178239248880db474437690094aae7909002113289ac7f9305130c5e0a1d9364122cb DIST chrony-4.6.1.tar.gz 636076 BLAKE2B cc1299ba680eae158da9ebc6d4451ffc8b352b9b0da47056e4ccd21495589d88ee9f8cb9ef8508e7c1a1b0a14b6679453a6d324111308a00888123a265eca788 SHA512 646ae08f2587366236796f2399d8ab3eb570979e0d82f5d13f5cec49939054c876cc93dc20c8d38e105fd3500e1720d05a223a15076783cd882d0de43afd9c7e DIST chrony-4.6.1.tar.gz.asc 833 BLAKE2B 19e7359220beb93ede262cad7fec4963b15873510530690eefcdc28c69222ac40e41849487b9514665443dff888fbeeea1a2cbef0517da38a210a6573f4e9c99 SHA512 992b706636bf3a7eb6d502562a4990c9d8e20e5f3011d2cdb2ceb32220e9a1c2bfa6eca767212cee49b811823872602dc33f9e7201a7f9a93cc9c90e81b1db49 -DIST chrony-4.6.tar.gz 631899 BLAKE2B b94e49aa5b9da2cde06d91b674a732a02eee552e88fa169877504cf75645a55dc78a0234a2356d35953b6204095a1c3e9973cc502cafdb6e92bb1231c74f8156 SHA512 84926b6c9eb90824ab98333412b001b18de9342dacb898d195ee8de52868b1945700a8b161de6b603c231460d290e02df6712c1dcb7f034ba45754b38466c8bd -DIST chrony-4.6.tar.gz.asc 833 BLAKE2B 38d7402b5e8f2063dbe8a0f454ae87143a0a74d916d117270a7ed39e003eb7a5f816a37613c6ca1f2a1e8b14d94718d88b11c96090a5f5e855d64e552d112d95 SHA512 f735c1d52f1474d2af656e55d3a9abfd33b4ed706b983a393c7e3852b766b5179fe4098425ee7f32bb5db4a2e4170e8c5930cf63d20884be6c0eac338a3d26db diff --git a/sdk_container/src/third_party/portage-stable/net-misc/chrony/chrony-4.5.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/chrony/chrony-4.5.ebuild deleted file mode 100644 index e33e867ea9..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/chrony/chrony-4.5.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo systemd tmpfiles toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony-project.org/" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc - inherit verify-sig - - SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz" - SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" - - if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86" - fi -fi - -S="${WORKDIR}/${P/_/-}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux" -# nettle > nss > libtomcrypt in configure -REQUIRED_USE=" - sechash? ( || ( nettle nss libtomcrypt ) ) - nettle? ( !nss ) - nss? ( !nettle ) - libtomcrypt? ( !nettle !nss ) - !sechash? ( !nss ) - !sechash? ( !nts? ( !nettle ) ) -" - -DEPEND=" - caps? ( - sys-libs/libcap - ) - libtomcrypt? ( dev-libs/libtomcrypt:= ) - nettle? ( dev-libs/nettle:= ) - nss? ( dev-libs/nss:= ) - nts? ( net-libs/gnutls:= ) - pps? ( net-misc/pps-tools ) - readline? ( dev-libs/libedit ) - seccomp? ( sys-libs/libseccomp ) -" -RDEPEND=" - ${DEPEND} - caps? ( - acct-group/ntp - acct-user/ntp - ) - selinux? ( sec-policy/selinux-chronyd ) -" -BDEPEND=" - caps? ( - acct-group/ntp - acct-user/ntp - ) - html? ( dev-ruby/asciidoctor ) - nts? ( virtual/pkgconfig ) - sechash? ( - nettle? ( virtual/pkgconfig ) - nss? ( virtual/pkgconfig ) - ) -" - -if [[ ${PV} == 9999 ]] ; then - # Needed for doc generation in 9999 - REQUIRED_USE+=" html" - BDEPEND+=" - app-alternatives/yacc - virtual/w3m - " -else - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch -) - -QA_CONFIG_IMPL_DECL_SKIP=( - # FP, checks with macro afterwards (bug #907877) - recvmmsg -) - -src_prepare() { - default - - sed -i \ - -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ - doc/* examples/* || die - - cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die -} - -src_configure() { - if ! use caps ; then - sed -i \ - -e 's/ -u ntp//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - if ! use seccomp ; then - sed -i \ - -e 's/ -F 2//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - tc-export CC PKG_CONFIG - - # Update from time to time with output from "date +%s" - # on a system that is time-synced. - export SOURCE_DATE_EPOCH=1607976314 - - # Not an autotools generated script - local myconf=( - $(use_enable seccomp scfilter) - - $(usev !caps '--disable-linuxcaps') - $(usev !cmdmon '--disable-cmdmon') - $(usev debug '--enable-debug') - - # USE=readline here means "readline-like functionality" - # chrony only supports libedit in terms of the library providing - # it. - $(usev !readline '--without-editline --disable-readline') - - $(usev !libtomcrypt '--without-tomcrypt') - $(usev !nettle '--without-nettle') - $(usev !nss '--without-nss') - $(usev !ntp '--disable-ntp') - $(usev !nts '--disable-nts') - $(usev !nts '--without-gnutls') - $(usev !phc '--disable-phc') - $(usev !pps '--disable-pps') - $(usev !refclock '--disable-refclock') - $(usev !rtc '--disable-rtc') - $(usev samba '--enable-ntp-signd') - $(usev !sechash '--disable-sechash') - - --chronysockdir="${EPREFIX}/run/chrony" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --mandir="${EPREFIX}/usr/share/man" - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc/chrony" - --with-hwclockfile="${EPREFIX}/etc/adjtime" - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - - ${EXTRA_ECONF} - ) - - # Print the ./configure call - edo ./configure "${myconf[@]}" || die -} - -src_compile() { - if [[ ${PV} == 9999 ]] ; then - # Uses w3m - emake -C doc man txt - fi - - emake all docs $(usev !html 'ADOC=true') -} - -src_install() { - default - - # Compatibility with other distributions who install to /etc/chrony.conf (bug #835461) - dosym -r /etc/chrony/chrony.conf /etc/chrony.conf - - newinitd "${FILESDIR}"/chronyd.init-r2 chronyd - newconfd "${T}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" - - if use html ; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - if use caps ; then - # Prepare a directory for the chrony.drift file (a la ntpsec) - # Ensures the environment is sane on new installs - # bug #711058 - fowners -R ntp:ntp /var/{lib,log}/chrony - fperms -R 770 /var/lib/chrony - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_dounit examples/chronyd.service - systemd_dounit examples/chrony-wait.service - systemd_enable_ntpunit 50-chrony chronyd.service -} - -pkg_preinst() { - HAD_CAPS=0 - HAD_SECCOMP=0 - HAD_PRE_NEW_SECCOMP_LEVEL=0 - - # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5 - # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand - if has_version 'net-misc/chrony[caps]' ; then - HAD_CAPS=1 - fi - - if has_version 'net-misc/chrony[seccomp]' ; then - HAD_SECCOMP=1 - fi - - if has_version '>=net-misc/chrony-4.1[seccomp]' ; then - # This version introduced a new filter level: -F 2 - # It's a limited set of seccomp filters designed to be 'bare minimum' - HAD_PRE_NEW_SECCOMP_LEVEL=1 - fi -} - -pkg_postinst() { - tmpfiles_process chronyd.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then - # bug #719876 - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" - ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" - ewarn "This is necessary for chrony to drop privileges" - elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" - fi - fi - - # See bug #783915 for general discussion on enabling seccomp filtering - # by default. - local show_seccomp_enable_msg=0 - - # Was seccomp disabled before and now enabled? - if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then - show_seccomp_enable_msg=1 - fi - - # Are we coming from an old version without the new 'minimal' filter? - # (-F 2) - if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then - show_seccomp_enable_msg=1 - fi - - if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then - elog "To enable seccomp in a stricter mode, please modify:" - elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC" - elog "- systemctl edit chronyd for systemd" - elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" - elog "By default, we now use -F 2 which is a baseline/minimal filter." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/chrony/chrony-4.6.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/chrony/chrony-4.6.ebuild deleted file mode 100644 index e33e867ea9..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/chrony/chrony-4.6.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo systemd tmpfiles toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="https://chrony-project.org/" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.com/chrony/chrony.git" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc - inherit verify-sig - - SRC_URI="https://chrony-project.org/releases/${P/_/-}.tar.gz" - SRC_URI+=" verify-sig? ( https://chrony-project.org/releases/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" - - if [[ ${PV} != *_pre* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv sparc x86" - fi -fi - -S="${WORKDIR}/${P/_/-}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux" -# nettle > nss > libtomcrypt in configure -REQUIRED_USE=" - sechash? ( || ( nettle nss libtomcrypt ) ) - nettle? ( !nss ) - nss? ( !nettle ) - libtomcrypt? ( !nettle !nss ) - !sechash? ( !nss ) - !sechash? ( !nts? ( !nettle ) ) -" - -DEPEND=" - caps? ( - sys-libs/libcap - ) - libtomcrypt? ( dev-libs/libtomcrypt:= ) - nettle? ( dev-libs/nettle:= ) - nss? ( dev-libs/nss:= ) - nts? ( net-libs/gnutls:= ) - pps? ( net-misc/pps-tools ) - readline? ( dev-libs/libedit ) - seccomp? ( sys-libs/libseccomp ) -" -RDEPEND=" - ${DEPEND} - caps? ( - acct-group/ntp - acct-user/ntp - ) - selinux? ( sec-policy/selinux-chronyd ) -" -BDEPEND=" - caps? ( - acct-group/ntp - acct-user/ntp - ) - html? ( dev-ruby/asciidoctor ) - nts? ( virtual/pkgconfig ) - sechash? ( - nettle? ( virtual/pkgconfig ) - nss? ( virtual/pkgconfig ) - ) -" - -if [[ ${PV} == 9999 ]] ; then - # Needed for doc generation in 9999 - REQUIRED_USE+=" html" - BDEPEND+=" - app-alternatives/yacc - virtual/w3m - " -else - BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch - "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch -) - -QA_CONFIG_IMPL_DECL_SKIP=( - # FP, checks with macro afterwards (bug #907877) - recvmmsg -) - -src_prepare() { - default - - sed -i \ - -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ - doc/* examples/* || die - - cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die -} - -src_configure() { - if ! use caps ; then - sed -i \ - -e 's/ -u ntp//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - if ! use seccomp ; then - sed -i \ - -e 's/ -F 2//' \ - "${T}"/chronyd.conf examples/chronyd.service || die - fi - - tc-export CC PKG_CONFIG - - # Update from time to time with output from "date +%s" - # on a system that is time-synced. - export SOURCE_DATE_EPOCH=1607976314 - - # Not an autotools generated script - local myconf=( - $(use_enable seccomp scfilter) - - $(usev !caps '--disable-linuxcaps') - $(usev !cmdmon '--disable-cmdmon') - $(usev debug '--enable-debug') - - # USE=readline here means "readline-like functionality" - # chrony only supports libedit in terms of the library providing - # it. - $(usev !readline '--without-editline --disable-readline') - - $(usev !libtomcrypt '--without-tomcrypt') - $(usev !nettle '--without-nettle') - $(usev !nss '--without-nss') - $(usev !ntp '--disable-ntp') - $(usev !nts '--disable-nts') - $(usev !nts '--without-gnutls') - $(usev !phc '--disable-phc') - $(usev !pps '--disable-pps') - $(usev !refclock '--disable-refclock') - $(usev !rtc '--disable-rtc') - $(usev samba '--enable-ntp-signd') - $(usev !sechash '--disable-sechash') - - --chronysockdir="${EPREFIX}/run/chrony" - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --mandir="${EPREFIX}/usr/share/man" - --prefix="${EPREFIX}/usr" - --sysconfdir="${EPREFIX}/etc/chrony" - --with-hwclockfile="${EPREFIX}/etc/adjtime" - --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" - - ${EXTRA_ECONF} - ) - - # Print the ./configure call - edo ./configure "${myconf[@]}" || die -} - -src_compile() { - if [[ ${PV} == 9999 ]] ; then - # Uses w3m - emake -C doc man txt - fi - - emake all docs $(usev !html 'ADOC=true') -} - -src_install() { - default - - # Compatibility with other distributions who install to /etc/chrony.conf (bug #835461) - dosym -r /etc/chrony/chrony.conf /etc/chrony.conf - - newinitd "${FILESDIR}"/chronyd.init-r2 chronyd - newconfd "${T}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example1 chrony.conf - - docinto examples - dodoc examples/*.example* - - newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" - - if use html ; then - docinto html - dodoc doc/*.html - fi - - keepdir /var/{lib,log}/chrony - - if use caps ; then - # Prepare a directory for the chrony.drift file (a la ntpsec) - # Ensures the environment is sane on new installs - # bug #711058 - fowners -R ntp:ntp /var/{lib,log}/chrony - fperms -R 770 /var/lib/chrony - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony - - systemd_dounit examples/chronyd.service - systemd_dounit examples/chrony-wait.service - systemd_enable_ntpunit 50-chrony chronyd.service -} - -pkg_preinst() { - HAD_CAPS=0 - HAD_SECCOMP=0 - HAD_PRE_NEW_SECCOMP_LEVEL=0 - - # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5 - # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand - if has_version 'net-misc/chrony[caps]' ; then - HAD_CAPS=1 - fi - - if has_version 'net-misc/chrony[seccomp]' ; then - HAD_SECCOMP=1 - fi - - if has_version '>=net-misc/chrony-4.1[seccomp]' ; then - # This version introduced a new filter level: -F 2 - # It's a limited set of seccomp filters designed to be 'bare minimum' - HAD_PRE_NEW_SECCOMP_LEVEL=1 - fi -} - -pkg_postinst() { - tmpfiles_process chronyd.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then - # bug #719876 - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" - ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" - ewarn "This is necessary for chrony to drop privileges" - elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then - ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" - fi - fi - - # See bug #783915 for general discussion on enabling seccomp filtering - # by default. - local show_seccomp_enable_msg=0 - - # Was seccomp disabled before and now enabled? - if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then - show_seccomp_enable_msg=1 - fi - - # Are we coming from an old version without the new 'minimal' filter? - # (-F 2) - if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then - show_seccomp_enable_msg=1 - fi - - if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then - elog "To enable seccomp in a stricter mode, please modify:" - elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC" - elog "- systemctl edit chronyd for systemd" - elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" - elog "By default, we now use -F 2 which is a baseline/minimal filter." - fi -} From 8c0512cda40642f1cb12e53dc75ed84b9434f198 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:38 +0000 Subject: [PATCH 086/153] net-misc/curl: Sync with Gentoo It's from Gentoo commit fe621e66f692e842778b3f0b5ed61f19343e4022. --- .../portage-stable/net-misc/curl/Manifest | 8 +- .../net-misc/curl/curl-8.10.1-r2.ebuild | 383 ----------------- ....12.0-r1.ebuild => curl-8.13.0_rc1.ebuild} | 22 +- .../net-misc/curl/curl-8.9.1-r2.ebuild | 384 ------------------ .../net-misc/curl/curl-9999.ebuild | 18 +- 5 files changed, 28 insertions(+), 787 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.10.1-r2.ebuild rename sdk_container/src/third_party/portage-stable/net-misc/curl/{curl-8.12.0-r1.ebuild => curl-8.13.0_rc1.ebuild} (94%) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.9.1-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest index 1300283d44..0f4efc9986 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest @@ -1,10 +1,6 @@ -DIST curl-8.10.1.tar.xz 2726748 BLAKE2B bfdfa24f6d652884044c5e8eea5d70daad651b46255c99c9df502f9595a2dcbf8c4034446becf9e87f8e8a3f397a8fda29ab3e0d6020ac0dae62dd42b8136b78 SHA512 f1c7a12492dcfb8ba08be69b96a83ce9074592cbaa6b95c72b3c16fc58ad35e9f9deec7b72baca7d360d013b0b1c7ea38bd4edae464903ac67aa3c76238d8c6c -DIST curl-8.10.1.tar.xz.asc 488 BLAKE2B 8e8f2b628d4e8964a76c1c43c5557aacbfc2d2dbc51be8a0fa1b157c257f15f29aedba842cba7cb270c4adcf0b4a5d9c8b0b3d49633c48b061fb3e1472303d66 SHA512 21d6d560c027efc9e3e5db182a77501d6376442221ba910df817e2ec980bee44a9fe2afc698205f8d5e8313ae47915a341d60206a46b46e816d73ee357a894ac DIST curl-8.11.1.tar.xz 2751236 BLAKE2B a87ec2c78c5d6daf44eee4cf8e3ed124849d067f6c63145205fda18f33ddd3adce386058ead8f9b713f8e595f5e059acd13479eb00edc226247aabd3c2234112 SHA512 7c7c47a49505575b610c56b455f0919ea5082a993bf5483eeb258ead167aadb87078d626b343b417dcfc5439c53556425c8fb4fe3b01b53a87b47c01686a3e57 DIST curl-8.11.1.tar.xz.asc 488 BLAKE2B 53d58ebb8ab722d8394b7ce94b646c876324cd89b3e47d9129bddcfbb6db338c1dbe93a5e72a25caf7be9ddd450c2b0832cfee17beb8ba701bdeefe653235d53 SHA512 c09bedb67e83fb8ca3ad73c5bd0d92fed7fc2c26dbe5a71cccb193fd151c7219713241a9fe74baefcd1d008cfafba78142bf04cec24dd4a88d67179184d35824 -DIST curl-8.12.0.tar.xz 2777552 BLAKE2B b38c7465a38f6bbdc6daa1e8a27dc810f970c9172ddf532881e83965e1fa6001beff1bf358e5138e1a0ae1121d877f6a5a4f38ef7ea7e03c8b06dc46fbf24022 SHA512 ed35f0020541050ce387f4ba80f9e87562ececd99082da1bae85840dee81c49b86a4a55909e15fcbf4eb116106a796c29a9b2678dee11326f80db75992c6edc5 -DIST curl-8.12.0.tar.xz.asc 488 BLAKE2B 8977dabab96b6f188e8b16497e7a4e589f05b5512a9bc6ec0ee36797615c720b9cb5c34bc90df6ee037d898b8fa7f708ad2b2ff789163adcb5308a2e0d7cf9df SHA512 8526554ffb2187b48b6a4c6a0d4a8c73d484ef3ce4c3791add0e759baf953ac7ae0b2f88d688365b1f09c5745198611fa1761aa14d02ddf52823c4ff238779cd DIST curl-8.12.1.tar.xz 2768160 BLAKE2B 2b3e3d91041881c0951ad470736266105d3b9720440b808fe382baa493a30075aba52eb1d329fb1f148e27cd76290d82e121e7f4abf695f215456a10e26ade3e SHA512 88915468fa1bb7256e3dd6c9d058ada6894faa1e3e7800c7d9bfee3e8be4081ae57e7f2bf260c5342b709499fc4302ddc2d7864e25bfa3300fa07f118a3de603 DIST curl-8.12.1.tar.xz.asc 488 BLAKE2B 2a6563609c9f7ada84ca2c7048ad9406809eef4cc958760d2ab3d1b7be58d26247e579bd025870609e80ebb00295026aae30614b84e3a81bdf3ed3dbd0f5ed70 SHA512 41fc5582935090d13940d86974fdea3ea901dd5dab156c16029a87f811d2535172c59dc8dc366f2ffc37bcf85accbecb5aa765bc7b83c2991a3ef402bf25af69 -DIST curl-8.9.1.tar.xz 2782364 BLAKE2B 6e38e20e2b03ab5bfbb8d9797442dfdd9644fc80d7b1f7c1efb1f44e0d730524e82ccf7413b2c6f4555bd61ae42f91ec7c0201e2c0d563811c85164aa234aada SHA512 a0fe234402875db194aad4e4208b7e67e7ffc1562622eea90948d4b9b0122c95c3dde8bbe2f7445a687cb3de7cb09f20e5819d424570442d976aa4c913227fc7 -DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 437268f6e5ba5db73f205fd87f3ded1e5fc200e8bf63a83cdb7e21dfbf2f4a4620e598cd0bf5d8fa1548ade08d45b386599542cd988df46a238b85790409f42e SHA512 18acd58436d70900ab6912b84774da2c451b9dbfc83d6d00f85bbbe7894b67075918e58956fdb753fcc1486e4f10caa31139d7c68b037d7c83dc2e9c2fae9f9b +DIST curl-8.13.0-rc1.tar.xz 2788060 BLAKE2B eb82b73ac51e93fc8e9e6040a85ce54924edc1179cc670327009c984a1d2ddd62d29080de6ee83e7fd2657b9ef2778c4324abebef846d6afd85e5016dd282129 SHA512 6890dae4abf9c9d4017c28ea8ced84ef457aa911574b261af97b81ab1631e04deef188928d015a19c861d8dd319a23d9a7725d93046fc07a39694c5dc445562e +DIST curl-8.13.0-rc1.tar.xz.asc 488 BLAKE2B cb4ec7c0ceee7b7bb4c92569d37b1620b7543db5b5db0939a8c03f875f7b1e495584fd9cd7d84071a477dc85b54fc4127197814f1c765e232f445b050c1869d3 SHA512 aeb6f5abcf1bd19d836ae688bebd0193c673060ed74afa7c5b63c2a0ecf7eaf00a223110cd7aa77d19183e8ba757bd0b8fb481e279cf1141c4b459f92604a740 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.10.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.10.1-r2.ebuild deleted file mode 100644 index fefabb8b13..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.10.1-r2.ebuild +++ /dev/null @@ -1,383 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintainers should subscribe to the 'curl-distros' ML for backports etc -# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/ -# https://lists.haxx.se/listinfo/curl-distros - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc -inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.se/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/curl/curl.git" -else - SRC_URI=" - https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) - " - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="BSD curl ISC test? ( BSD-4 )" -SLOT="0" -IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3" -IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd" -# These select the default tls implementation / which quic impl to use -IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" -RESTRICT="!test? ( test )" - -# Only one default ssl / quic provider can be enabled -# The default provider needs its USE satisfied -# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day. -# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e -REQUIRED_USE=" - quic? ( - ^^ ( - curl_quic_openssl - curl_quic_ngtcp2 - ) - http3 - ssl - ) - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_openssl - curl_ssl_rustls - ) - ) - curl_quic_openssl? ( - curl_ssl_openssl - quic - !gnutls - !mbedtls - !rustls - ) - curl_quic_ngtcp2? ( - curl_ssl_gnutls - quic - !mbedtls - !openssl - !rustls - ) - curl_ssl_gnutls? ( gnutls ) - curl_ssl_mbedtls? ( mbedtls ) - curl_ssl_openssl? ( openssl ) - curl_ssl_rustls? ( rustls ) - http3? ( alt-svc quic ) -" - -# cURL's docs and CI/CD are great resources for confirming supported versions -# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: -# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) -# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) -# - https://github.com/curl/curl/blob/master/.github/workflows/http3-linux.yml (CI/CD for TCP/2) -# However 'supported' vs 'works' are two entirely different things; be sane but -# don't be afraid to require a later version. -# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time. -RDEPEND=" - >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] - adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] ) - http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] ) - idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) - psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] ) - quic? ( - curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] ) - curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] ) - ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - app-misc/ca-certificates - >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:=[${MULTILIB_USEDEP}] - ) - mbedtls? ( - app-misc/ca-certificates - net-libs/mbedtls:0=[${MULTILIB_USEDEP}] - ) - openssl? ( - >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] - ) - rustls? ( - >=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}] - ) - ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - dev-lang/perl - virtual/pkgconfig - test? ( - sys-apps/diffutils - http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) - http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) - ) - verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) -" - -DOCS=( 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 -) - -QA_CONFIG_IMPL_DECL_SKIP=( - __builtin_available - closesocket - CloseSocket - getpass_r - ioctlsocket - IoctlSocket - mach_absolute_time - setmode - _fseeki64 - # custom AC_LINK_IFELSE code fails to link even without -Werror - OSSL_QUIC_client_method -) - -PATCHES=( - "${FILESDIR}"/${PN}-prefix-2.patch - "${FILESDIR}"/${PN}-respect-cflags-3.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 ) - if use ssl; then - myconf+=( --without-gnutls --without-mbedtls --without-rustls ) - - if use gnutls; then - multilib_is_native_abi && einfo "SSL provided by gnutls" - myconf+=( --with-gnutls ) - fi - if use mbedtls; then - multilib_is_native_abi && einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - fi - if use openssl; then - multilib_is_native_abi && einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use rustls; then - multilib_is_native_abi && einfo "SSL provided by rustls" - myconf+=( --with-rustls ) - fi - if use curl_ssl_gnutls; then - multilib_is_native_abi && einfo "Default SSL provided by gnutls" - myconf+=( --with-default-ssl-backend=gnutls ) - elif use curl_ssl_mbedtls; then - multilib_is_native_abi && einfo "Default SSL provided by mbedtls" - myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_openssl; then - multilib_is_native_abi && einfo "Default SSL provided by openssl" - myconf+=( --with-default-ssl-backend=openssl ) - elif use curl_ssl_rustls; then - multilib_is_native_abi && einfo "Default SSL provided by rustls" - myconf+=( --with-default-ssl-backend=rustls ) - else - eerror "We can't be here because of REQUIRED_USE." - die "Please file a bug, hit impossible condition w/ USE=ssl handling." - 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-basic-auth - --enable-bearer-auth - --enable-digest-auth - --enable-kerberos-auth - --enable-negotiate-auth - --enable-aws - --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 - $(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 - --enable-ipv6 - --enable-largefile - --enable-manual - --enable-mime - --enable-netrc - $(use_enable progress-meter) - --enable-proxy - --enable-socketpair - --disable-sspi - $(use_enable static-libs static) - --enable-pthreads - --enable-threaded-resolver - --disable-versioned-symbols - --without-amissl - --without-bearssl - $(use_with brotli) - --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d - $(use_with http2 nghttp2) - --without-hyper - $(use_with idn libidn2) - $(use_with kerberos gssapi "${EPREFIX}"/usr) - --without-libgsasl - $(use_with psl libpsl) - --without-msh3 - $(use_with http3 nghttp3) - $(use_with curl_quic_ngtcp2 ngtcp2) - $(use_with curl_quic_openssl openssl-quic) - --without-quiche - $(use_with rtmp librtmp) - --without-schannel - --without-secure-transport - --without-test-caddy - --without-test-httpd - --without-test-nghttpx - $(use_enable websockets) - --without-winidn - --without-wolfssl - --with-zlib - $(use_with zstd) - --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions - ) - - if use debug; then - myconf+=( - --enable-debug - ) - fi - - if use test && multilib_is_native_abi && ( use http2 || use http3 ); then - myconf+=( - --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" - ) - fi - - if [[ ${CHOST} == *mingw* ]] ; then - myconf+=( - --disable-pthreads - ) - fi - - ECONF_SOURCE="${S}" econf "${myconf[@]}" - - if ! multilib_is_native_abi; then - # Avoid building the client (we just want libcurl for multilib) - sed -i -e '/SUBDIRS/s:src::' Makefile || die - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die - fi - -} - -multilib_src_compile() { - default - - if multilib_is_native_abi; then - # Shell completions - ! tc-is-cross-compiler && emake -C scripts - fi -} - -# There is also a pytest harness that tests for bugs in some very specific -# situations; we can rely on upstream for this rather than adding additional test deps. -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 that 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 skip specific tests. See e.g. Fedora's packaging - # or just read https://github.com/curl/curl/tree/master/tests#run. - # Note: we don't run the testsuite for cross-compilation. - # Upstream recommend 7*nproc as a starting point for parallel tests, but - # this ends up breaking when nproc is huge (like -j80). - # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped - # as most gentoo users don't have an 'ip6-localhost' - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi; then - # Shell completions - ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die - rm -rf "${ED}"/etc/ || die -} - -pkg_postinst() { - if use debug; then - ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose." - ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger." - ewarn "hic sunt dracones; you have been warned." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.12.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.13.0_rc1.ebuild similarity index 94% rename from sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.12.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.13.0_rc1.ebuild index 7acb873fe0..13cfd90ad6 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.12.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.13.0_rc1.ebuild @@ -17,11 +17,17 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/curl/curl.git" else + if [[ ${P} == *rc* ]]; then + CURL_URI="https://curl.se/rc/" + S="${WORKDIR}/${P//_/-}" + else + CURL_URI="https://curl.se/download/" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi SRC_URI=" - https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + ${CURL_URI}${P//_/-}.tar.xz + verify-sig? ( ${CURL_URI}${P//_/-}.tar.xz.asc ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD curl ISC test? ( BSD-4 )" @@ -83,7 +89,7 @@ REQUIRED_USE=" # don't be afraid to require a later version. # ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time. RDEPEND=" - >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.5[${MULTILIB_USEDEP}] adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] ) @@ -97,7 +103,7 @@ RDEPEND=" curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] ) ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.2.8[${MULTILIB_USEDEP}] ) ssl? ( gnutls? ( app-misc/ca-certificates @@ -109,7 +115,7 @@ RDEPEND=" net-libs/mbedtls:0=[${MULTILIB_USEDEP}] ) openssl? ( - >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/openssl-1.0.2:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) rustls? ( >=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}] @@ -158,7 +164,6 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}/${PN}-prefix-4.patch" "${FILESDIR}/${PN}-respect-cflags-3.patch" - "${FILESDIR}/${P}-multi.patch" ) src_prepare() { @@ -362,7 +367,8 @@ multilib_src_test() { # this ends up breaking when nproc is huge (like -j80). # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped # as most gentoo users don't have an 'ip6-localhost' - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083" + # 1022 does not like `-rc` in the version string; fixed upstream. + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083 !1022" } multilib_src_install() { diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.9.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.9.1-r2.ebuild deleted file mode 100644 index 0648465d56..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.9.1-r2.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Maintainers should subscribe to the 'curl-distros' ML for backports etc -# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/ -# https://lists.haxx.se/listinfo/curl-distros - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc -inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.se/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/curl/curl.git" -else - SRC_URI=" - https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) - " - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="BSD curl ISC test? ( BSD-4 )" -SLOT="0" -IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3" -IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" -# These select the default tls implementation / which quic impl to use -IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls" -RESTRICT="!test? ( test )" - -# Only one default ssl / quic provider can be enabled -# The default provider needs its USE satisfied -# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day. -# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e -REQUIRED_USE=" - quic? ( - ^^ ( - curl_quic_openssl - curl_quic_ngtcp2 - ) - http3 - ssl - ) - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_openssl - curl_ssl_rustls - ) - ) - curl_quic_openssl? ( - curl_ssl_openssl - quic - !gnutls - !mbedtls - !rustls - ) - curl_quic_ngtcp2? ( - curl_ssl_gnutls - quic - !mbedtls - !openssl - !rustls - ) - curl_ssl_gnutls? ( gnutls ) - curl_ssl_mbedtls? ( mbedtls ) - curl_ssl_openssl? ( openssl ) - curl_ssl_rustls? ( rustls ) - http3? ( alt-svc quic ) -" - -# cURL's docs and CI/CD are great resources for confirming supported versions -# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: -# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) -# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) -# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2) -# However 'supported' vs 'works' are two entirely different things; be sane but -# don't be afraid to require a later version. -# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time. -RDEPEND=" - >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] - adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] ) - http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] ) - idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) - psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] ) - quic? ( - curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] ) - curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] ) - ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - app-misc/ca-certificates - >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:=[${MULTILIB_USEDEP}] - ) - mbedtls? ( - app-misc/ca-certificates - net-libs/mbedtls:0=[${MULTILIB_USEDEP}] - ) - openssl? ( - >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] - ) - rustls? ( - >=net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}] - ) - ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - dev-lang/perl - virtual/pkgconfig - test? ( - sys-apps/diffutils - http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] ) - http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) - ) - 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 -) - -QA_CONFIG_IMPL_DECL_SKIP=( - __builtin_available - closesocket - CloseSocket - getpass_r - ioctlsocket - IoctlSocket - mach_absolute_time - setmode - _fseeki64 - # custom AC_LINK_IFELSE code fails to link even without -Werror - OSSL_QUIC_client_method -) - -PATCHES=( - "${FILESDIR}"/${PN}-prefix-2.patch - "${FILESDIR}"/${PN}-respect-cflags-3.patch - "${FILESDIR}"/${PN}-8.9.1-sigpipe.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 ) - if use ssl; then - myconf+=( --without-gnutls --without-mbedtls --without-rustls ) - - if use gnutls; then - multilib_is_native_abi && einfo "SSL provided by gnutls" - myconf+=( --with-gnutls ) - fi - if use mbedtls; then - multilib_is_native_abi && einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - fi - if use openssl; then - multilib_is_native_abi && einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use rustls; then - multilib_is_native_abi && einfo "SSL provided by rustls" - myconf+=( --with-rustls ) - fi - if use curl_ssl_gnutls; then - multilib_is_native_abi && einfo "Default SSL provided by gnutls" - myconf+=( --with-default-ssl-backend=gnutls ) - elif use curl_ssl_mbedtls; then - multilib_is_native_abi && einfo "Default SSL provided by mbedtls" - myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_openssl; then - multilib_is_native_abi && einfo "Default SSL provided by openssl" - myconf+=( --with-default-ssl-backend=openssl ) - elif use curl_ssl_rustls; then - multilib_is_native_abi && einfo "Default SSL provided by rustls" - myconf+=( --with-default-ssl-backend=rustls ) - else - eerror "We can't be here because of REQUIRED_USE." - die "Please file a bug, hit impossible condition w/ USE=ssl handling." - 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-basic-auth - --enable-bearer-auth - --enable-digest-auth - --enable-kerberos-auth - --enable-negotiate-auth - --enable-aws - --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 - $(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 - --enable-ipv6 - --enable-largefile - --enable-manual - --enable-mime - --enable-netrc - $(use_enable progress-meter) - --enable-proxy - --enable-socketpair - --disable-sspi - $(use_enable static-libs static) - --enable-pthreads - --enable-threaded-resolver - --disable-versioned-symbols - --without-amissl - --without-bearssl - $(use_with brotli) - --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d - $(use_with http2 nghttp2) - --without-hyper - $(use_with idn libidn2) - $(use_with kerberos gssapi "${EPREFIX}"/usr) - --without-libgsasl - $(use_with psl libpsl) - --without-msh3 - $(use_with http3 nghttp3) - $(use_with curl_quic_ngtcp2 ngtcp2) - $(use_with curl_quic_openssl openssl-quic) - --without-quiche - $(use_with rtmp librtmp) - --without-schannel - --without-secure-transport - --without-test-caddy - --without-test-httpd - --without-test-nghttpx - $(use_enable websockets) - --without-winidn - --without-wolfssl - --with-zlib - $(use_with zstd) - --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions - ) - - if use debug; then - myconf+=( - --enable-debug - ) - fi - - if use test && multilib_is_native_abi && ( use http2 || use http3 ); then - myconf+=( - --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" - ) - fi - - if [[ ${CHOST} == *mingw* ]] ; then - myconf+=( - --disable-pthreads - ) - fi - - ECONF_SOURCE="${S}" econf "${myconf[@]}" - - if ! multilib_is_native_abi; then - # Avoid building the client (we just want libcurl for multilib) - sed -i -e '/SUBDIRS/s:src::' Makefile || die - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die - fi - -} - -multilib_src_compile() { - default - - if multilib_is_native_abi; then - # Shell completions - ! tc-is-cross-compiler && emake -C scripts - fi -} - -# There is also a pytest harness that tests for bugs in some very specific -# situations; we can rely on upstream for this rather than adding additional test deps. -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 skip specific tests. See e.g. Fedora's packaging - # or just read https://github.com/curl/curl/tree/master/tests#run. - # Note: we don't run the testsuite for cross-compilation. - # Upstream recommend 7*nproc as a starting point for parallel tests, but - # this ends up breaking when nproc is huge (like -j80). - # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped - # as most gentoo users don't have an 'ip6-localhost' - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi; then - # Shell completions - ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die - rm -rf "${ED}"/etc/ || die -} - -pkg_postinst() { - if use debug; then - ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose." - ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger." - ewarn "hic sunt dracones; you have been warned." - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-9999.ebuild index f8c6055018..5af80a37e9 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-9999.ebuild @@ -17,11 +17,17 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/curl/curl.git" else + if [[ ${P} == *rc* ]]; then + CURL_URI="https://curl.se/rc/" + S="${WORKDIR}/${P//_/-}" + else + CURL_URI="https://curl.se/download/" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi SRC_URI=" - https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + ${CURL_URI}${P//_/-}.tar.xz + verify-sig? ( ${CURL_URI}${P//_/-}.tar.xz.asc ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD curl ISC test? ( BSD-4 )" @@ -83,7 +89,7 @@ REQUIRED_USE=" # don't be afraid to require a later version. # ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time. RDEPEND=" - >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.5[${MULTILIB_USEDEP}] adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] ) @@ -97,7 +103,7 @@ RDEPEND=" curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] ) ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.2.8[${MULTILIB_USEDEP}] ) ssl? ( gnutls? ( app-misc/ca-certificates @@ -109,7 +115,7 @@ RDEPEND=" net-libs/mbedtls:0=[${MULTILIB_USEDEP}] ) openssl? ( - >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/openssl-1.0.2:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) rustls? ( >=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}] From fb32c5abbbf17286f0d308daf210447247394cb8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:42 +0000 Subject: [PATCH 087/153] net-misc/openssh: Sync with Gentoo It's from Gentoo commit 6c2eebf0ab69d219820a1c440c5ee9e7acd02306. --- .../portage-stable/net-misc/openssh/Manifest | 2 - .../files/openssh-9.6_p1-CVE-2024-6387.patch | 19 - .../files/openssh-9.6_p1-chaff-logic.patch | 16 - .../net-misc/openssh/files/sshd.service.1 | 15 - .../net-misc/openssh/openssh-9.9_p1.ebuild | 439 ------------------ .../net-misc/openssh/openssh-9.9_p2.ebuild | 2 +- 6 files changed, 1 insertion(+), 492 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/openssh/files/openssh-9.6_p1-CVE-2024-6387.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/openssh/files/openssh-9.6_p1-chaff-logic.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/openssh/files/sshd.service.1 delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/openssh/openssh-9.9_p1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-misc/openssh/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/openssh/Manifest index 7ddef4fb2b..09abf06970 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/openssh/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/openssh/Manifest @@ -1,6 +1,4 @@ DIST openssh-9.8p1.tar.gz 1910393 BLAKE2B 3bf983c4ef5358054ed0104cd51d3e0069fbc2b80d8522d0df644d5508ec1d26a67bf061b1b5698d1cdf0d2cbba16b4cdca12a4ce30da24429094576a075e192 SHA512 95dec2f18e58eb47994f3de4430253e0665e185564b65088ca5f4108870e05feddef8cda8d3c0a4b75f18b98cc2c024df0e27de53b48c1a16da8da483cb8292a DIST openssh-9.8p1.tar.gz.asc 833 BLAKE2B 5291e8c03ab9a75acb44285cd7fc010f4a33551f142499624165dac708fc05a6d077df81555aa41037b45f6301e4e5db3161a7a23404473f8a233a877fc55cc3 SHA512 4df1f1be2c6ab7f3aebaedd0a773b0e8c8929abb30cd3415873ad55d012cfa113f792e888e5e772dd468c394aeb7e35d62893a514dbc0ab1a03acd79918657f7 -DIST openssh-9.9p1.tar.gz 1964864 BLAKE2B 817d267e42b8be74a13e0cfd7999bdb4dab6355c7f62c1a4dd89adad310c5fb7fe3f17109ce1a36cd269a3639c1b8f1d18330c615ab3b419253ec027cfa20997 SHA512 3cc0ed97f3e29ecbd882eca79239f02eb5a1606fce4f3119ddc3c5e86128aa3ff12dc85000879fccc87b60e7d651cfe37376607ac66075fede2118deaa685d6d -DIST openssh-9.9p1.tar.gz.asc 833 BLAKE2B 0e19668eb5cadea0e7b06caf2bc2f4cee7e7656a780a128090dcdf2acc25c6e0e0fc7c4c83c95ffcd567cd03941ec772b0f5b273e6f79ff4e440e1d9f22bcdb7 SHA512 916e975c54eb68c0b2f0b0006522b241cbe54c4caa88d31537a6278490c93d9d732c2ab3a080ac084bf75cbdd5402901ec68583cbe7c7cde4a8e40e7a8b78c28 DIST openssh-9.9p2.tar.gz 1944499 BLAKE2B 1b5bc09482b3a807ccfee52c86c6be3c363acf0c8e774862e0ae64f76bfeb4ce7cf29b3ed2f99c04c89bb4977da0cf50a7a175b15bf1d9925de1e03c66f8306d SHA512 4c6d839aa3189cd5254c745f2bd51cd3f468b02f8e427b8d7a16b9ad017888a41178d2746dc51fb2d3fec5be00e54b9ab7c32c472ca7dec57a1dea4fc9840278 DIST openssh-9.9p2.tar.gz.asc 833 BLAKE2B 21d9ef3da2b54be47420327f1c724e38eef951ea11d646de81ac3ee2abf3d81f218424432cf5ac7d60cdae72e2190001f923dbdf5bed57f4a105ee1895261c9d SHA512 e7f9bc74d27e5cf8cbf4f5831fddd1d8ad00b03e51e7deb7f95ef17c5017ab7ce0116f4770374aaf6bd3a5f6013dab651a7651b21fa303d05ad6d14b537ab955 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/openssh/files/openssh-9.6_p1-CVE-2024-6387.patch b/sdk_container/src/third_party/portage-stable/net-misc/openssh/files/openssh-9.6_p1-CVE-2024-6387.patch deleted file mode 100644 index 7b7fb70380..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/openssh/files/openssh-9.6_p1-CVE-2024-6387.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/935271 -Backport proposed by upstream at https://marc.info/?l=oss-security&m=171982317624594&w=2. ---- a/log.c -+++ b/log.c -@@ -451,12 +451,14 @@ void - sshsigdie(const char *file, const char *func, int line, int showfunc, - LogLevel level, const char *suffix, const char *fmt, ...) - { -+#ifdef SYSLOG_R_SAFE_IN_SIGHAND - va_list args; - - va_start(args, fmt); - sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, - suffix, fmt, args); - va_end(args); -+#endif - _exit(1); - } - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/openssh/files/openssh-9.6_p1-chaff-logic.patch b/sdk_container/src/third_party/portage-stable/net-misc/openssh/files/openssh-9.6_p1-chaff-logic.patch deleted file mode 100644 index 90544d1a45..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/openssh/files/openssh-9.6_p1-chaff-logic.patch +++ /dev/null @@ -1,16 +0,0 @@ -"Minor logic error in ObscureKeystrokeTiming" -https://marc.info/?l=oss-security&m=171982317624594&w=2 ---- a/clientloop.c -+++ b/clientloop.c -@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct timespec *timeout, - if (timespeccmp(&now, &chaff_until, >=)) { - /* Stop if there have been no keystrokes for a while */ - stop_reason = "chaff time expired"; -- } else if (timespeccmp(&now, &next_interval, >=)) { -- /* Otherwise if we were due to send, then send chaff */ -+ } else if (timespeccmp(&now, &next_interval, >=) && -+ !ssh_packet_have_data_to_write(ssh)) { -+ /* If due to send but have no data, then send chaff */ - if (send_chaff(ssh)) - nchaff++; - } diff --git a/sdk_container/src/third_party/portage-stable/net-misc/openssh/files/sshd.service.1 b/sdk_container/src/third_party/portage-stable/net-misc/openssh/files/sshd.service.1 deleted file mode 100644 index a541164cd7..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/openssh/files/sshd.service.1 +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=OpenSSH server daemon -After=network.target auditd.service - -[Service] -ExecStartPre=/usr/bin/ssh-keygen -A -ExecStart=/usr/sbin/sshd -D -e -ExecReload=/bin/kill -HUP $MAINPID -KillMode=process -OOMPolicy=continue -Restart=on-failure -RestartSec=42s - -[Install] -WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/portage-stable/net-misc/openssh/openssh-9.9_p1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/openssh/openssh-9.9_p1.ebuild deleted file mode 100644 index a3eebf352d..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/openssh/openssh-9.9_p1.ebuild +++ /dev/null @@ -1,439 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Remember to check the upstream release/stable branches for patches -# to backport! See https://marc.info/?l=openssh-unix-dev&m=172723798122122&w=2. - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc -inherit user-info flag-o-matic autotools optfeature pam systemd toolchain-funcs verify-sig eapi9-ver - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI=" - mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) -" -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit debug kerberos ldns legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - xmss? ( ssl ) - test? ( ssl ) -" - -# tests currently fail with XMSS -REQUIRED_USE+="test? ( !xmss )" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - net-libs/ldns[ecdsa(+),ssl(+)] - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) - virtual/libcrypt:=[static-libs(+)] - >=sys-libs/zlib-1.2.3:=[static-libs(+)] -" -RDEPEND=" - acct-group/sshd - acct-user/sshd - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) - kerberos? ( virtual/krb5 ) -" -DEPEND=" - ${RDEPEND} - virtual/os-headers - kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) - static? ( ${LIB_DEPEND} ) -" -RDEPEND=" - ${RDEPEND} - !net-misc/openssh-contrib - pam? ( >=sys-auth/pambase-20081028 ) - !prefix? ( sys-apps/shadow ) -" -BDEPEND=" - dev-build/autoconf - virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-openssh ) -" - -PATCHES=( - "${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch" - "${FILESDIR}/${PN}-9.6_p1-fix-xmss-c99.patch" - "${FILESDIR}/${PN}-9.7_p1-config-tweaks.patch" - # Backports from upstream release branch - "${FILESDIR}/${PV}" - # Our own backports - "${FILESDIR}/${P}-x-forwarding-slow.patch" -) - -pkg_pretend() { - local i enabled_eol_flags disabled_eol_flags - for i in hpn sctp X509; do - if has_version "net-misc/openssh[${i}]"; then - enabled_eol_flags+="${i}," - disabled_eol_flags+="-${i}," - fi - done - - if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then - # Skip for binary packages entirely because of environment saving, bug #907892 - [[ ${MERGE_TYPE} == binary ]] && return - - ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore." - ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality," - ewarn "since these USE flags required third-party patches that often trigger bugs" - ewarn "and are of questionable provenance." - ewarn - ewarn "If you must continue relying on this functionality, switch to" - ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your" - ewarn "world file first: 'emerge --deselect net-misc/openssh'" - ewarn - ewarn "In order to prevent loss of SSH remote login access, we will abort the build." - ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib" - ewarn "variant, when re-emerging you will have to set" - ewarn - ewarn " OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" - - die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes" - fi - - # Make sure people who are using tcp wrappers are notified of its removal. #531156 - if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then - ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" - ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." - fi -} - -src_prepare() { - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - [[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) - - default - - # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox - sed -e '/\t\tpercent \\/ d' \ - -i regress/Makefile || die - - tc-export PKG_CONFIG - local sed_args=( - -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" - # Disable fortify flags ... our gcc does this for us - -e 's:-D_FORTIFY_SOURCE=2::' - ) - - # _XOPEN_SOURCE causes header conflicts on Solaris - [[ ${CHOST} == *-solaris* ]] && sed_args+=( - -e 's/-D_XOPEN_SOURCE//' - ) - sed -i "${sed_args[@]}" configure{.ac,} || die - - eautoreconf -} - -src_configure() { - addwrite /dev/ptmx - - use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG - use static && append-ldflags -static - use xmss && append-cflags -DWITH_XMSS - - if [[ ${CHOST} == *-solaris* ]] ; then - # Solaris' glob.h doesn't have things like GLOB_TILDE, configure - # doesn't check for this, so force the replacement to be put in - # place - append-cppflags -DBROKEN_GLOB - fi - - # use replacement, RPF_ECHO_ON doesn't exist here - [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no - - local myconf=( - --with-ldflags="${LDFLAGS}" - --disable-strip - --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX}"/etc/ssh - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX}"/usr/share/openssh - --with-privsep-path="${EPREFIX}"/var/empty - --with-privsep-user=sshd - # optional at runtime; guarantee a known path - --with-xauth="${EPREFIX}"/usr/bin/xauth - - # --with-hardening adds the following in addition to flags we - # already set in our toolchain: - # * -ftrapv (which is broken with GCC anyway), - # * -ftrivial-auto-var-init=zero (which is nice, but not the end of - # the world to not have) - # * -fzero-call-used-regs=used (history of miscompilations with - # Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086, - # gcc PR104820, gcc PR104817, gcc PR110934)). - # - # Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK, - # so we cannot just disable -fzero-call-used-regs=used. - # - # Therefore, just pass --without-hardening, given it doesn't negate - # our already hardened toolchain defaults, and avoids adding flags - # which are known-broken in both Clang and GCC and haven't been - # proven reliable. - --without-hardening - - $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX}"/usr) - $(use_with ldns) - $(use_enable legacy-ciphers dsa-keys) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(use_with security-key security-key-builtin) - $(use_with ssl openssl) - $(use_with ssl ssl-engine) - ) - - if use elibc_musl; then - # musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230) - myconf+=( --disable-utmp --disable-wtmp ) - fi - - # Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all - # bug #869839 (https://github.com/llvm/llvm-project/issues/57692) - tc-is-clang && myconf+=( --without-hardening ) - - econf "${myconf[@]}" -} - -create_config_dropins() { - local locale_vars=( - # These are language variables that POSIX defines. - # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 - LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME - - # These are the GNU extensions. - # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html - LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE - ) - - mkdir -p "${WORKDIR}"/etc/ssh/ssh{,d}_config.d || die - - cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die - # Send locale environment variables (bug #367017) - SendEnv ${locale_vars[*]} - - # Send COLORTERM to match TERM (bug #658540) - SendEnv COLORTERM - EOF - - cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die - RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts" - EOF - - cat <<-EOF > "${WORKDIR}"/etc/ssh/ssh_revoked_hosts || die - # https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/ - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== - EOF - - cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die - # Allow client to pass locale environment variables (bug #367017) - AcceptEnv ${locale_vars[*]} - - # Allow client to pass COLORTERM to match TERM (bug #658540) - AcceptEnv COLORTERM - EOF - - cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-subsystem.conf || die - # override default of no subsystems - Subsystem sftp ${EPREFIX}/usr/$(get_libdir)/misc/sftp-server - EOF - - if use pam ; then - cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die - UsePAM yes - # This interferes with PAM. - PasswordAuthentication no - # PAM can do its own handling of MOTD. - PrintMotd no - PrintLastLog no - EOF - fi - - if use livecd ; then - cat <<-EOF > "${WORKDIR}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die - # Allow root login with password on livecds. - PermitRootLogin Yes - EOF - fi -} - -src_compile() { - default - create_config_dropins -} - -src_test() { - local tests=( compat-tests ) - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - ewarn "user, so we will run a subset only." - tests+=( interop-tests ) - else - tests+=( tests ) - fi - - local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 - mkdir -p "${HOME}"/.ssh || die - emake -j1 "${tests[@]}" /dev/null 2>&1; then - ewarn "The ebuild will now attempt to restart OpenSSH to avoid" - ewarn "bricking the running instance. See bug #709748." - ebegin "Attempting to restart openssh via 'systemctl try-restart sshd'" - systemctl try-restart sshd - eend $? - elif [[ -d /run/openrc ]]; then - # We don't check for sshd -t here because the OpenRC init script - # has a stop_pre() which does checkconfig, i.e. we defer to it - # to give nicer output for a failed sanity check. - ewarn "The ebuild will now attempt to restart OpenSSH to avoid" - ewarn "bricking the running instance. See bug #709748." - ebegin "Attempting to restart openssh via 'rc-service -q --ifstarted --nodeps sshd restart'" - rc-service -q --ifstarted --nodeps sshd restart - eend $? - fi -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/openssh/openssh-9.9_p2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/openssh/openssh-9.9_p2.ebuild index e4185459a1..558ddce64e 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/openssh/openssh-9.9_p2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/openssh/openssh-9.9_p2.ebuild @@ -23,7 +23,7 @@ S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # Probably want to drop ssl defaulting to on in a future version. IUSE="abi_mips_n32 audit debug kerberos ldns legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss" From 6a2ab5a2c534a4c5f79375831300b2d6bd6e0d3e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:47 +0000 Subject: [PATCH 088/153] net-nds/rpcbind: Sync with Gentoo It's from Gentoo commit 6622ad38e9560917e284bd8208d81c77d97268da. --- .../portage-stable/net-nds/rpcbind/Manifest | 1 + .../net-nds/rpcbind/rpcbind-1.2.7.ebuild | 64 +++++++++++++++++++ .../net-nds/rpcbind/rpcbind-9999.ebuild | 27 ++++---- 3 files changed, 80 insertions(+), 12 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/net-nds/rpcbind/rpcbind-1.2.7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/Manifest b/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/Manifest index 33851a3036..83b0903cfd 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/Manifest @@ -1 +1,2 @@ DIST rpcbind-1.2.6.tar.bz2 124590 BLAKE2B bb0e9f81e4747f8a732c9e25af561e79f2b6cd1c1955db586833871901b6da73f4b7ef32149a81b75daa81359b9c0554726670460b28857042dd66a2f861cac2 SHA512 fb89c61be4c533fe2e6057749d97079a2d1c9fac0d35d6be1a159a0edbf86092b3fc121f19fa920e75aac5ecdd3f59f5978e6401d5cad16cd438c977736206a7 +DIST rpcbind-1.2.7.tar.bz2 125792 BLAKE2B f1e79b304ce5fe06c1c256d3512d999daffca782d956440f612b8a957ad7ddb35356b47aa4f4105d5b24d820daab32ec3a0f4a3b8ac76bb7adf5c3ed22d2ef01 SHA512 ca1517bdab86221d13c645042cc31b25b4d2b574d63ebaa20da4f5392b611cf58811f267214293e953f504d364e5daaa5875eab7aa68a04b89e68fd5508e3926 diff --git a/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/rpcbind-1.2.7.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/rpcbind-1.2.7.ebuild new file mode 100644 index 0000000000..dae4c2ee6a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/rpcbind-1.2.7.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +DESCRIPTION="portmap replacement which supports RPC over various protocols" +HOMEPAGE="https://sourceforge.net/projects/rpcbind/" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git" + inherit autotools git-r3 +else + SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="debug remotecalls selinux systemd tcpd warmstarts" +REQUIRED_USE="systemd? ( warmstarts )" + +DEPEND=" + >=net-libs/libtirpc-0.2.3:= + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-rpcbind ) +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + [[ ${PV} == "9999" ]] && eautoreconf +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/sbin + --sbindir="${EPREFIX}"/sbin + --with-statedir="${EPREFIX}"/run/${PN} + --with-systemdsystemunitdir=$(usex systemd "$(systemd_get_systemunitdir)" "no") + $(use_enable debug) + $(use_enable remotecalls rmtcalls) + $(use_enable warmstarts) + $(use_enable tcpd libwrap) + ) + + # Avoid using rpcsvc headers + # https://bugs.gentoo.org/705224 + export ac_cv_header_rpcsvc_mount_h=no + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} diff --git a/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/rpcbind-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/rpcbind-9999.ebuild index 0827a2daf2..dae4c2ee6a 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/rpcbind-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/rpcbind/rpcbind-9999.ebuild @@ -1,33 +1,36 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd +DESCRIPTION="portmap replacement which supports RPC over various protocols" +HOMEPAGE="https://sourceforge.net/projects/rpcbind/" + if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git" inherit autotools git-r3 else SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -DESCRIPTION="portmap replacement which supports RPC over various protocols" -HOMEPAGE="https://sourceforge.net/projects/rpcbind/" - LICENSE="BSD" SLOT="0" IUSE="debug remotecalls selinux systemd tcpd warmstarts" REQUIRED_USE="systemd? ( warmstarts )" -DEPEND=">=net-libs/libtirpc-0.2.3:= +DEPEND=" + >=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers )" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-rpcbind )" -BDEPEND=" - virtual/pkgconfig" + tcpd? ( sys-apps/tcp-wrappers ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-rpcbind ) +" +BDEPEND="virtual/pkgconfig" src_prepare() { default From d7ed4ad13b07185115b4bba06c73463281b58b74 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:49 +0000 Subject: [PATCH 089/153] profiles: Sync with Gentoo It's from Gentoo commit efa521bc5f8cc66fd82964c5023e4b51339253ed. --- .../profiles/arch/alpha/package.use.mask | 20 +- .../profiles/arch/amd64/package.use.mask | 22 ++ .../arch/amd64/package.use.stable.mask | 7 + .../profiles/arch/amd64/x32/package.mask | 1 - .../profiles/arch/arm/package.use | 1 + .../profiles/arch/arm/package.use.mask | 6 + .../profiles/arch/arm/package.use.stable.mask | 6 +- .../portage-stable/profiles/arch/arm/use.mask | 1 + .../profiles/arch/arm64/package.use | 1 + .../profiles/arch/arm64/package.use.mask | 25 +- .../arch/arm64/package.use.stable.mask | 5 + .../profiles/arch/base/package.use.mask | 18 ++ .../profiles/arch/hppa/package.use.mask | 9 + .../arch/hppa/package.use.stable.mask | 3 +- .../profiles/arch/loong/package.use.force | 5 - .../profiles/arch/loong/package.use.mask | 11 + .../profiles/arch/m68k/package.use.mask | 3 +- .../profiles/arch/mips/package.mask | 3 +- .../profiles/arch/mips/package.use.mask | 26 +- .../profiles/arch/powerpc/package.use.mask | 5 +- .../arch/powerpc/ppc32/package.use.mask | 3 +- .../powerpc/ppc32/package.use.stable.mask | 2 + .../profiles/arch/ppc/package.use.mask | 1 + .../profiles/arch/riscv/package.use | 3 +- .../profiles/arch/riscv/package.use.mask | 6 +- .../profiles/arch/s390/package.use.mask | 1 + .../profiles/arch/sparc/package.use.force | 8 +- .../profiles/arch/sparc/package.use.mask | 21 +- .../arch/sparc/package.use.stable.mask | 13 +- .../profiles/arch/x86/package.use.mask | 5 + .../profiles/arch/x86/package.use.stable.mask | 4 + .../profiles/arch/x86/use.stable.mask | 5 + .../profiles/base/package.use.force | 4 + .../profiles/base/package.use.mask | 20 +- .../profiles/base/package.use.stable.mask | 14 +- .../portage-stable/profiles/base/use.mask | 5 +- .../profiles/base/use.stable.mask | 5 + .../portage-stable/profiles/categories | 1 + .../linux/amd64/17.0/musl/package.mask | 4 + .../linux/amd64/23.0/musl/package.mask | 4 + .../amd64/23.0/split-usr/musl/package.mask | 4 + .../linux/ppc64/23.0/musl/package.use.force | 6 - .../23.0/split-usr/musl/package.use.force | 6 - .../linux/ppc64le/23.0/musl/package.use.force | 6 - .../23.0/split-usr/musl/package.use.force | 6 - .../20.0/rv64gc/lp64/musl/package.use.force | 6 - .../20.0/rv64gc/lp64d/musl/package.use.force | 6 - .../23.0/rv64/lp64/musl/package.use.force | 6 - .../23.0/rv64/lp64d/musl/package.use.force | 6 - .../split-usr/lp64/musl/package.use.force | 6 - .../split-usr/lp64d/musl/package.use.force | 6 - .../profiles/desc/php_targets.desc | 1 + .../features/big-endian/package.use.mask | 2 + .../profiles/features/llvm/package.use.force | 3 +- .../profiles/features/musl/package.mask | 5 +- .../profiles/features/musl/package.use.mask | 23 +- .../features/prefix/package.use.force | 9 - .../profiles/features/selinux/make.defaults | 3 +- .../features/selinux/package.use.mask | 12 +- .../profiles/features/wd40/package.use.mask | 3 +- .../portage-stable/profiles/package.mask | 241 +++++++----------- .../prefix/darwin/macos/package.use.mask | 3 +- .../profiles/targets/desktop/package.use | 6 + .../portage-stable/profiles/updates/1Q-2025 | 23 ++ .../portage-stable/profiles/updates/4Q-2021 | 1 - 65 files changed, 408 insertions(+), 298 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/23.0/musl/package.use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/23.0/split-usr/musl/package.use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/23.0/musl/package.use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/23.0/split-usr/musl/package.use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/20.0/rv64gc/lp64/musl/package.use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/package.use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/lp64/musl/package.use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/package.use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/package.use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/package.use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use.force diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask index 676b01c1c8..cf81f08e67 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask @@ -1,6 +1,15 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2025-03-10) +# media-libs/libopenmpt is not keyworded here +media-video/ffmpeg openmpt +media-video/ffmpeg-compat openmpt + +# Sam James (2025-03-04) +# qt is not keyworded here +net-wireless/wpa_supplicant gui + # Matt Jolly (2025-01-29) # Needs dev-lang/go which is not keyworded here x11-wm/fvwm3 go @@ -68,6 +77,7 @@ mail-filter/pyzor redis test # Andreas Sturmlechner (2024-06-29) # media-libs/libplacebo is not keyworded media-video/ffmpeg libplacebo +media-video/ffmpeg-compat libplacebo # MichaÅ‚ Górny (2024-05-08) # Requires sys-devel/{clang,llvm}:16. @@ -95,7 +105,8 @@ media-video/ffmpeg glslang # matoro (2023-11-24) # media-libs/shaderc not keyworded here. ->=media-video/ffmpeg-5 shaderc +media-video/ffmpeg shaderc +media-video/ffmpeg-compat shaderc # matoro (2023-11-14) # dev-db/mysql not keyworded here. @@ -207,6 +218,7 @@ media-libs/freetype svg # Adel Kara Slimane (2022-03-14) # Untested useflag on other arches, needs keywording media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # Sam James (2022-01-29) # app-text/ronn-ng not keyworded here, bug #801103 @@ -215,6 +227,7 @@ app-accessibility/espeak-ng man # James Beddek (2022-01-15) # media-libs/svt-av1 is not keyworded here media-video/ffmpeg svt-av1 +media-video/ffmpeg-compat svt-av1 # Sam James (2021-11-05) # Avoid keywording unnecessary depenencies for now, bug #804115 @@ -278,6 +291,7 @@ sci-libs/umfpack cholmod # bug #769098, bug #769122 media-libs/openal sndio media-video/ffmpeg sndio +media-video/ffmpeg-compat sndio media-sound/moc sndio media-libs/libsdl2 sndio media-libs/libao sndio @@ -366,6 +380,7 @@ sys-block/thin-provisioning-tools test # Mask USE=dav1d, media-libs/dav1d is not keyworded # Mask USE=libaribb24, media-libs/aribb24 is not keyworded media-video/ffmpeg dav1d libaribb24 libtesseract +media-video/ffmpeg-compat dav1d libaribb24 libtesseract # Andrey Utkin (2020-03-11) # USE=bpf depends on llvm-core/clang which is not keyworded on alpha. @@ -452,6 +467,7 @@ net-libs/gnutls test-full # Tobias Klausmann (2017-03-02) # libilbc has not been ported to alpha and likely never will be. media-video/ffmpeg libilbc +media-video/ffmpeg-compat libilbc # Tobias Klausmann (2016-01-25) # The tests use hypothesis which complains about too-slow tests on @@ -493,6 +509,7 @@ app-admin/conky cmus irc # Tobias Klausmann (2016-06-07) # nasm is x86/x86-64 only media-video/ffmpeg openh264 +media-video/ffmpeg-compat openh264 # Tobias Klausmann (2016-02-04) # sys-cluster/ceph is not broken per se, but a maintenance burden. @@ -553,6 +570,7 @@ app-accessibility/orca braille # Tobias Klausmann # media-libs/x265 doesn't work on alpha (bug 519046) media-video/ffmpeg x265 +media-video/ffmpeg-compat x265 # Pacho Ramos (2014-02-22) # Missing keywords, bug #495250 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 75dd18accf..c5a41dc29c 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,26 @@ #--- END OF EXAMPLES --- +# # Sam James (2025-03-11) +# The COBOL frontend only allows building on a small number of platforms +# for now until more testing and integration is done. +sys-devel/gcc -cobol + +# Ionen Wolkens (2025-03-10) +# dev-util/nvidia-cuda-toolkit is keyworded here +media-video/ffmpeg -npp +media-video/ffmpeg-compat -npp + +# Ionen Wolkens (2025-03-10) +# Old versions of ffmpeg needing old nv-codec-codecs complicate slots +# (done here due to the unmasking in arch/amd64). + (2025-03-09) +# Google DNS dependencies available (bug 949851) +app-crypt/certbot -certbot-dns-google + # Nowa Ammerlaan (2025-02-03) # QtWebView is available here dev-python/pyside -webview @@ -211,6 +231,7 @@ net-misc/curl -rustls -curl_ssl_rustls # Quick Sync Video (through intel-mediasdk or libvpl) is # only keyworded on amd64 media-video/ffmpeg -qsv +media-video/ffmpeg-compat -qsv # WANG Xuerui (2022-10-07) # sys-libs/libsmbios is available here. @@ -239,6 +260,7 @@ media-libs/libva-intel-driver -hybrid # Adel Kara Slimane (2022-02-17) # Unmask AMF keyword on amd64 only media-video/ffmpeg -amf +media-video/ffmpeg-compat -amf media-video/handbrake -amf # James Le Cuirot (2021-10-22) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask index 2d89b4ff1d..42293449a3 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask @@ -17,6 +17,11 @@ #--- END OF EXAMPLES --- +# Ionen Wolkens (2025-03-10) +# dev-util/nvidia-cuda-toolkit may never be stabilized +media-video/ffmpeg npp +media-video/ffmpeg-compat npp + # Sam James (2025-02-13) # sys-cluster/corosync is marked stable here sys-fs/mdadm -corosync @@ -80,11 +85,13 @@ net-misc/curl rustls curl_ssl_rustls # Sam James (2022-12-07) # Needs unstable media-libs/libvpl media-video/ffmpeg qsv +media-video/ffmpeg-compat qsv media-video/handbrake qsv # Adel Kara Slimane (2022-03-14) # needs stabilizing media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # Joonas Niilola (2021-08-13) # dev-libs/efl is stabilized on amd64. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask index c97ab027f2..a370355c9f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask @@ -165,7 +165,6 @@ gnome-extra/gnome-shell-extension-pop-shell # Andreas K. Hüttel (2020-09-20) # Binary-only with no x32 support app-office/libreoffice-bin -app-office/libreoffice-bin-debug # Hasan ÇALIÅžIR (2019-10-28) # requires net-libs/nodejs | sys-apps/yarn diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use index 651d66ae82..8ff3ebe821 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use @@ -5,4 +5,5 @@ # Apply additional FFmpeg patches for efficient playback on some SoCs. media-tv/kodi soc media-video/ffmpeg libdrm soc +media-video/ffmpeg-compat soc media-video/mpv soc 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 4c3eb494e3..058f253aab 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,6 +1,10 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andreas Sturmlechner (2025-03-08) +# Needs kde-frameworks/{kwallet,ki18n,kconfig} stable +dev-vcs/subversion kwallet + # Alfred Wingate (2025-02-22) # media-libs/zint is not keyworded here media-libs/zxing-cpp experimental @@ -103,6 +107,7 @@ sys-kernel/installkernel -grub # Leonardo Hernández Hernández (2023-11-15) # media-libs/shaderc in not keyworded media-video/ffmpeg shaderc +media-video/ffmpeg-compat shaderc # Jon Janzen (2023-09-11) # librttopo has not been tested on this arch @@ -167,6 +172,7 @@ app-text/enchant nuspell # Adel Kara Slimane (2022-03-14) # Untested useflag on other arches, needs keywording media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # Sam James (2022-03-10) # Boost has support for ARM32 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask index d8aa2a4fdd..a609e9cd3e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask @@ -16,6 +16,7 @@ x11-misc/xdg-utils plasma # Andreas Sturmlechner (2024-06-29) # media-libs/libplacebo is not stable here media-video/ffmpeg libplacebo +media-video/ffmpeg-compat libplacebo # Nowa Ammerlaan (2024-03-21) # Experimental, virt-firmware is keyworded only unstable @@ -102,10 +103,6 @@ dev-util/geany-plugins markdown # virtual/jdk is not stable here. sci-mathematics/z3 java -# Andreas Sturmlechner (2019-02-10) -# Needs kde-frameworks/{kwallet,ki18n,kconfig} stable -dev-vcs/subversion kwallet - # Andreas Sturmlechner (2019-02-10) # Needs kde-plasma/{polkit-kde-agent,plasma-workspace} stable sys-auth/polkit kde @@ -143,6 +140,7 @@ media-sound/mpd fluidsynth # Alexis Ballier (2017-05-29) # frei0r-plugins is not stable yet, mask it on stable versions media-video/ffmpeg frei0r +media-video/ffmpeg-compat frei0r # Michael Weber (2017-04-01) # no stable jdk diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask index edfc08209a..c3c31da706 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask @@ -10,6 +10,7 @@ ada_target_gnat_2021 # Sam James (2024-06-13) # Needs as-yet-unkeyworded KF6 (bug #934215) +kde kf6compat # Andreas Sturmlechner (2023-02-06) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use index 14f8b65ef2..2a1e113cf3 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use @@ -11,6 +11,7 @@ # Apply additional FFmpeg patches for efficient playback on some SoCs. media-tv/kodi soc media-video/ffmpeg libdrm soc +media-video/ffmpeg-compat soc media-video/mpv soc # Alexis Ballier (2017-07-10) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask index bad25872af..5783d4f0fa 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask @@ -1,6 +1,26 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2025-03-11) +# The COBOL frontend only allows building on a small number of platforms +# for now until more testing and integration is done. +sys-devel/gcc -cobol + +# Ionen Wolkens (2025-03-10) +# dev-util/nvidia-cuda-toolkit is keyworded here +media-video/ffmpeg -npp +media-video/ffmpeg-compat -npp + +# Ionen Wolkens (2025-03-10) +# Old versions of ffmpeg needing old nv-codec-codecs complicate slots +# (done here due to the unmasking in arch/arm64). + (2025-03-09) +# Google DNS dependencies available (bug 949851) +app-crypt/certbot -certbot-dns-google + # Paul Zander (2025-02-23) # Not part of the arm64 archive dev-util/nvidia-cuda-toolkit -examples -rdma @@ -31,7 +51,7 @@ dev-python/qtpy remoteobjects >=sys-devel/gcc-11 -ada # Alexey Shvetsov (2024-11-21) -# sci-libs/caffe2 is not keyworded on arm64 +# sci-ml/caffe2 is not keyworded on arm64 sci-chemistry/gromacs nnpot # Joonas Niilola (2024-11-16) @@ -117,6 +137,7 @@ app-arch/rpm -sequoia # Leonardo Hernández Hernández (2023-11-15) # media-libs/shaderc in not keyworded media-video/ffmpeg shaderc +media-video/ffmpeg-compat shaderc # Jimi Huotari (2023-10-21) # Unmask on specific arches where it's available. @@ -180,6 +201,7 @@ app-text/enchant nuspell # Adel Kara Slimane (2022-03-14) # Untested useflag on other arches, needs keywording media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # Sam James (2022-02-26) # Supports 64-bit NEON @@ -397,6 +419,7 @@ media-libs/mlt -sdl media-libs/openal -sdl media-sound/mpg123 -sdl media-video/ffmpeg -sdl +media-video/ffmpeg-compat -sdl media-video/mplayer -sdl media-video/mpv -sdl >=x11-libs/wxGTK-3 -sdl diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask index d4526b664c..5e3a95ef25 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask @@ -1,6 +1,11 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2025-03-12) +# dev-util/nvidia-cuda-toolkit may never be stabilized +media-video/ffmpeg npp +media-video/ffmpeg-compat npp + # Eli Schwartz (2025-01-27) # Dependencies e.g. pypy not stable here. dev-build/meson test-full 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 08fc31c1b1..8d11766e0f 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,22 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2025-03-11) +# The COBOL frontend only allows building on a small number of platforms +# for now until more testing and integration is done. +sys-devel/gcc cobol + +# Ionen Wolkens (2025-03-10) +# dev-util/nvidia-cuda-toolkit has very few keywords +media-video/ffmpeg npp +media-video/ffmpeg-compat npp + +# Thibaud CANALE (2025-03-09) +# Too many dependencies are not keyworded (bug 949851) +# - dev-python/google-api-python-client +# - dev-python/google-auth +app-crypt/certbot certbot-dns-google + # Nowa Ammerlaan (2025-02-03) # QtWebView is not available everywhere dev-python/pyside webview @@ -176,6 +192,7 @@ net-misc/curl rustls curl_ssl_rustls # Quick Sync Video (through intel-mediasdk or oneVPL) is # only keyworded on amd64 media-video/ffmpeg qsv +media-video/ffmpeg-compat qsv # Georgy Yakovlev (2022-12-01) # Only supported on ppc64le. @@ -222,6 +239,7 @@ sys-boot/grub grub_platforms_loongson grub_platforms_qemu-mips # Mask AMF keyword on non-amd64 arches # It is unusable, for now, in other arches media-video/ffmpeg amf +media-video/ffmpeg-compat amf media-video/handbrake amf # Sam James (2021-11-15) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask index 1706428078..f954f68764 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask @@ -4,6 +4,11 @@ # NOTE: When masking a USE flag due to missing keywords, please file a keyword # request bug for the hppa arch. +# Ionen Wolkens (2025-03-10) +# media-libs/libopenmpt is not keyworded here +media-video/ffmpeg openmpt +media-video/ffmpeg-compat openmpt + # Sam James (2025-01-14) # dev-cpp/benchmark isn't (yet) keyworded here, although >=1.9.1 should # work fine with patching as the ebuild does. @@ -103,6 +108,7 @@ media-libs/libv4l bpf # Leonardo Hernández Hernández (2023-11-15) # Vulkan is not available here media-video/ffmpeg glslang shaderc vulkan +media-video/ffmpeg-compat shaderc vulkan # Violet Purcell (2023-10-12) # dev-build/samurai is not keyworded here. @@ -218,6 +224,7 @@ media-libs/xine-lib dav1d # Adel Kara Slimane (2022-03-14) # Untested useflag on other arches, needs keywording media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # Sam James (2022-03-06) # Unkeyworded dependencies @@ -345,6 +352,7 @@ media-sound/vorbis-tools kate # Rolf Eike Beer (2020-04-14) # dependencies not keyworded media-video/ffmpeg dav1d libaribb24 libtesseract vidstab +media-video/ffmpeg-compat dav1d libaribb24 libtesseract vidstab # Rolf Eike Beer (2020-04-11) # media-gfx/nvidia-texture-tools, media-libs/allegro not keyworded on hppa @@ -422,6 +430,7 @@ app-forensics/sleuthkit java # media-libs/libilbc has not been ported to HPPA # media-libs/zimg triggers a toolchain issue (bug #597152) media-video/ffmpeg libilbc zimg +media-video/ffmpeg-compat libilbc zimg # Justin Lecher (2017-01-15) # unkeyworded rev deps 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 4e7b74a3ce..ad506be865 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-2024 Gentoo Authors +# Copyright 1999-2025 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 @@ -258,6 +258,7 @@ media-gfx/imagemagick raw # media-libs/{libdc1394,x264} is not stable. # media-libs/game-music-emu is not stable. media-video/ffmpeg gme ieee1394 x264 +media-video/ffmpeg-compat gme ieee1394 x264 # Andreas Sturmlechner (2018-05-06) # sci-visualization/gnuplot is not stable. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.force index 66e574a891..84d4b3cc47 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.force @@ -5,11 +5,6 @@ # We only have MariaDB on loong, not MySQL. dev-perl/DBD-MariaDB mariadb -# WANG Xuerui (2023-08-05) -# 1.71.0 is the first Rust version with loong support, so there's no previous -# version to bootstrap from -dev-lang/rust:stable/1.71 system-bootstrap - # Ionen Wolkens (2023-07-26) # MPV currently[1] has no plans to support >=lua5-3 making luajit # the only choice for maintained lua. Apply mask/force to override diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask index 93e9d7a25c..4a64c1ccfb 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask @@ -1,6 +1,15 @@ # Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2025-03-10) +# media-libs/libopenmpt is not keyworded here +media-video/ffmpeg openmpt +media-video/ffmpeg-compat openmpt + +# WANG Xuerui (2025-03-04) +# this target has support for sanitizers +sys-devel/gcc -sanitize + # Alfred Wingate (2025-02-22) # media-libs/zint is not keyworded here media-libs/zxing-cpp experimental @@ -50,6 +59,7 @@ media-libs/libass libunibreak # WANG Xuerui (2024-09-27) # media-libs/libilbc needs porting media-video/ffmpeg libilbc +media-video/ffmpeg-compat libilbc net-analyzer/wireshark ilbc net-libs/pjproject ilbc net-misc/asterisk ilbc @@ -248,6 +258,7 @@ app-cdr/brasero tracker dev-cpp/libcmis man media-libs/opencv tesseract media-video/ffmpeg libtesseract +media-video/ffmpeg-compat libtesseract # WANG Xuerui (2022-12-05) # sys-auth/sssd isn't keyworded here yet 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 1846266023..fedd05d2ea 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # James Le Cuirot (2024-07-13) @@ -35,6 +35,7 @@ sys-apps/systemd tpm xkb # Adel Kara Slimane (2022-03-14) # Untested useflag on other arches, needs keywording media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # James Le Cuirot (2022-01-09) # Most usage of KMS requires GBM, which is provided by Mesa, which currently diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.mask index f96d719f45..c69b9dad14 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.mask @@ -1,10 +1,9 @@ -# Copyright 2006-2024 Gentoo Authors +# Copyright 2006-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Arthur Zamarin (2024-09-08) # requires (2025-03-10) +# net-libs/rabbitmq-c is not keyworded here +media-video/ffmpeg rabbitmq +media-video/ffmpeg-compat rabbitmq + +# Ionen Wolkens (2025-03-10) +# media-libs/libopenmpt is not keyworded here +media-video/ffmpeg openmpt +media-video/ffmpeg-compat openmpt + +# Sam James (2025-03-04) +# qt is not keyworded here +net-wireless/wpa_supplicant gui + # Sam James (2025-02-21) # media-video/rav1e is not yet keyworded here media-video/ffmpeg rav1e +media-video/ffmpeg-compat rav1e # Pacho Ramos (2025-01-26) # Needs unkeyworded net-libs/msgraph @@ -50,7 +65,7 @@ gnome-base/gvfs google test # MichaÅ‚ Górny (2024-09-08) # libcxx is broken on mips, https://bugs.gentoo.org/939297#c2 llvm-core/clang-common default-libcxx -llvm-core/clang-runtime libcxx +llvm-core/clang-runtime default-libcxx libcxx # Hans de Graaff (2024-09-08) # Requires large parts of dev-ruby/rails to be keyworded @@ -64,6 +79,7 @@ app-crypt/gcr:4 gtk # Arthur Zamarin (2024-09-06) # media-libs/vidstab is not keyworded media-video/ffmpeg vidstab +media-video/ffmpeg-compat vidstab # Arthur Zamarin (2024-09-06) # media-video/rav1e isn't keyworded here @@ -138,6 +154,7 @@ dev-util/maturin doc # Andreas Sturmlechner (2024-06-29) # media-libs/libplacebo is not keyworded media-video/ffmpeg libplacebo +media-video/ffmpeg-compat libplacebo # MichaÅ‚ Górny (2024-05-08) # Requires sys-devel/{clang,llvm}:16. @@ -173,10 +190,12 @@ dev-lang/php capstone # media-libs/libjxl casualties # https://github.com/libjxl/libjxl/issues/2433 media-video/ffmpeg jpegxl +media-video/ffmpeg-compat jpegxl # matoro (2023-12-15) # media-libs/libvpx casualties (#700902) media-video/ffmpeg vpx +media-video/ffmpeg-compat vpx media-plugins/gst-plugins-meta vpx # matoro (2023-11-26) @@ -189,7 +208,8 @@ net-analyzer/rrdtool rados # matoro (2023-11-24) # media-libs/shaderc not keyworded here. ->=media-video/ffmpeg-5 shaderc +media-video/ffmpeg shaderc +media-video/ffmpeg-compat shaderc # matoro (2023-11-22) # PyQt 6 is not keyworded here @@ -203,6 +223,7 @@ net-p2p/bitcoin-core gui qrcode # media-libs/libaom casualties # https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 media-video/ffmpeg libaom +media-video/ffmpeg-compat libaom media-libs/libavif aom media-libs/libheif aom @@ -252,6 +273,7 @@ app-text/enchant nuspell # Adel Kara Slimane (2022-03-14) # Untested useflag on other arches, needs keywording media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # James Le Cuirot (2022-02-24) # These GRUB platforms are only for MIPS. 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 5c1746b3c0..e55fd975a9 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Yongxiang Liang (2024-10-10) @@ -132,6 +132,7 @@ app-text/enchant nuspell # Adel Kara Slimane (2022-03-14) # Untested useflag on other arches, needs keywording media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # Sam James (2021-11-15) # librtas is available on (only) ppc* @@ -286,7 +287,7 @@ app-forensics/sleuthkit java # MichaÅ‚ Górny (2017-03-24) # libcxx fails to compile on ppc*, #595744. llvm-core/clang-common default-libcxx -llvm-core/clang-runtime libcxx +llvm-core/clang-runtime default-libcxx libcxx # James Le Cuirot (2016-12-14) # DOSBox + OpenGLide is untested on this arch. 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 d67f12ae17..0a25bfe946 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 @@ -4,6 +4,7 @@ # Sam James (2025-02-21) # media-video/rav1e is not yet keyworded here media-video/ffmpeg rav1e +media-video/ffmpeg-compat rav1e # Pacho Ramos (2025-01-26) # Needs unkeyworded net-libs/msgraph @@ -187,7 +188,7 @@ dev-lang/php avif # Sam James (2021-02-28) # compiler-rt* has no support for ppc32 (yet?) # bug #708344 -llvm-core/clang-runtime compiler-rt sanitize +llvm-core/clang-runtime compiler-rt default-compiler-rt sanitize llvm-core/clang-common default-compiler-rt # Florian Schmaus (2020-12-03) 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 0cb37eecca..5fe6b61f40 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 @@ -39,6 +39,7 @@ dev-ruby/kramdown unicode # Sam James (2022-11-19) # Deps not stable on ppc llvm-core/clang-common default-lld +llvm-core/clang-runtime default-lld llvm-core/llvm binutils-plugin z3 xar # Sam James (2022-07-27) @@ -53,6 +54,7 @@ net-fs/nfs-utils nfsv4 net-fs/samba client gnome-base/gvfs samba media-video/ffmpeg samba +media-video/ffmpeg-compat samba media-video/vlc samba # Sam James (2022-03-03) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ppc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ppc/package.use.mask index 406a9252e1..97b34e145e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/ppc/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ppc/package.use.mask @@ -36,3 +36,4 @@ app-admin/syslog-ng grpc # Leonardo Hernández Hernández (2023-11-15) # media-libs/shaderc in not keyworded media-video/ffmpeg shaderc +media-video/ffmpeg-compat shaderc diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use index dd7d9ebd37..f8dec229b2 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use @@ -1,10 +1,11 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # James Le Cuirot (2023-12-16) # Apply additional FFmpeg patches for efficient playback on some SoCs. media-tv/kodi soc media-video/ffmpeg libdrm soc +media-video/ffmpeg-compat soc media-video/mpv soc # Yixun Lan (2021-07-20) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask index 07bc3e7174..46bdf7ed26 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask @@ -1,12 +1,8 @@ # Copyright 2019-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Alfred Wingate (2025-02-22) -# media-libs/zint is not keyworded here -media-libs/zxing-cpp experimental - # Alexey Shvetsov (2024-11-21) -# sci-libs/caffe2 is not keyworded on riscv +# sci-ml/caffe2 is not keyworded on riscv sci-chemistry/gromacs nnpot # Benda Xu (2024-10-10) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask index f39f5b057b..4f89ecfd47 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask @@ -238,6 +238,7 @@ app-portage/nattka depgraph-order # Adel Kara Slimane (2022-03-14) # Untested useflag on other arches, needs keywording media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # Sam James (2021-11-05) # Avoid keywording unnecessary depenencies for now, bug #804115 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.force index 8468ce0df8..fc29ed979e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.force @@ -1,12 +1,6 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Sam James (2022-06-25) -# 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 -# or existing installed rust). bug #842246, bug #869680. -dev-lang/rust system-bootstrap - # Sam James (2022-02-19) # New enough SpiderMonkey not (yet?) keyworded here, bug #753221 sys-auth/polkit duktape diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask index 2b8ff1ac18..32defbe168 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask @@ -1,9 +1,19 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2025-03-10) +# media-libs/libopenmpt is not keyworded here +media-video/ffmpeg openmpt +media-video/ffmpeg-compat openmpt + +# Sam James (2025-03-04) +# qt is not keyworded here +net-wireless/wpa_supplicant gui + # Sam James (2025-02-21) # media-video/rav1e is not yet keyworded here media-video/ffmpeg rav1e +media-video/ffmpeg-compat rav1e # Matt Jolly (2025-01-29) # Needs dev-lang/go which is not keyworded here @@ -69,6 +79,7 @@ x11-misc/xdg-utils plasma # Andreas Sturmlechner (2024-06-29) # media-libs/libplacebo is not keyworded here media-video/ffmpeg libplacebo +media-video/ffmpeg-compat libplacebo # Sam James (2024-06-23) # app-crypt/gcr:4[gtk] is not available here @@ -138,6 +149,7 @@ media-libs/libavif rav1e # Leonardo Hernández Hernández (2023-11-15) # Vulkan is not available here media-video/ffmpeg glslang shaderc vulkan +media-video/ffmpeg-compat shaderc vulkan # MichaÅ‚ Górny (2023-10-22) # This is not ISDN CAPI, so unmask it. @@ -277,6 +289,7 @@ media-libs/freetype svg # Adel Kara Slimane (2022-03-14) # Untested useflag on other arches, needs keywording media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # Sam James (2022-03-06) # Unkeyworded dependencies @@ -326,7 +339,7 @@ dev-cpp/eigen test # Sam James (2021-04-27) # Deps not yet tested/keyworded. llvm-core/clang-common default-compiler-rt default-lld -llvm-core/clang-runtime compiler-rt +llvm-core/clang-runtime compiler-rt default-compiler-rt default-lld llvm-core/llvm z3 # Sam James (2021-03-19) @@ -443,6 +456,7 @@ net-analyzer/snort open-appid # Rolf Eike Beer (2020-04-14) # net-libs/srt is -sparc media-video/ffmpeg srt +media-video/ffmpeg-compat srt # Andreas Sturmlechner (2020-04-11) # git useflag requires dev-libs/libgit2 @@ -579,10 +593,6 @@ net-dns/bind dnstap # networkmanager USE masked due to missing keywords gnome-extra/nm-applet teamd -# Pacho Ramos (2016-01-31) -# Missing keywords, bug #560382 -media-video/ffmpeg snappy - # Justin Lecher (2015-11-18) # requires dev-python/restkit which requires # dev-python/socketpool which requires dev-python/gevent which requires @@ -625,6 +635,7 @@ dev-libs/libpeas lua # Alexis Ballier (2015-02-11) # Missing ffmpeg deps, bug #510340 media-video/ffmpeg x265 +media-video/ffmpeg-compat x265 # Pacho Ramos (2014-01-10) # Missing keywords 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 0d6bd09a08..911f4676d8 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,6 +1,11 @@ # Copyright 2019-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2025-03-12) +# app-arch/snappy is not stable here yet +media-video/ffmpeg snappy +media-video/ffmpeg-compat snappy + # Eli Schwartz (2024-02-05) # app-text/mupdf is not stable. bug #923811 net-print/cups-filters pdf @@ -17,12 +22,6 @@ www-client/links avif # dev-ruby/stringex is not marked stable here yet dev-ruby/kramdown unicode -# 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 -# or existing installed rust). bug #842246, bug #869680. -dev-lang/rust -system-bootstrap - # Sam James (2022-06-10) # gstreamer not marked stable on sparc media-sound/pulseaudio-daemon aptx ldac @@ -39,6 +38,7 @@ net-fs/nfs-utils nfsv4 net-fs/samba client gnome-base/gvfs samba media-video/ffmpeg samba +media-video/ffmpeg-compat samba media-video/vlc samba # Sam James (2022-05-10) @@ -102,6 +102,7 @@ media-sound/vorbis-tools kate # Rolf Eike Beer (2020-04-14) # dependencies not stable on sparc media-video/ffmpeg codec2 dav1d libaom libaribb24 libilbc libtesseract lv2 rubberband vidstab +media-video/ffmpeg-compat codec2 dav1d libaom libaribb24 libilbc libtesseract lv2 rubberband vidstab # Rolf Eike Beer (2020-04-10) # gnome-online-accounts not stable on sparc diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask index 50737a6100..8d1d325157 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Thibaud CANALE (2025-03-09) +# Google DNS dependencies available (bug 949851) +app-crypt/certbot -certbot-dns-google + # Alfred Wingate (2025-02-22) # media-libs/zint is not keyworded here media-libs/zxing-cpp experimental @@ -189,6 +193,7 @@ lxqt-base/lxqt-meta desktop-portal # Adel Kara Slimane (2022-03-14) # Untested useflag on other arches, needs keywording media-video/ffmpeg vmaf +media-video/ffmpeg-compat vmaf # Sam James (2022-03-10) # dev-util/hip and its rocm dependencies not keyworded here 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 3f7e98548d..17de34b8fd 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 @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2025-03-07) +# KDE Frameworks is no longer stable on x86 +x11-themes/QGnomePlatform qt5 + # Sam James (2025-02-13) # sys-cluster/corosync is marked stable here sys-fs/mdadm -corosync 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 8309eabe2e..f791b36944 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 @@ -4,6 +4,11 @@ # New entries go on top. # Please use the same syntax as in use.mask. +# Andreas Sturmlechner (2025-03-07) +# KDE Frameworks is not stable +kde +kwallet + # Paul Zander (2024-02-14) # sci-libs/atlas is not stable atlas 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 1b44176c41..1f239ebb9c 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,6 +1,10 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Joonas Niilola (2025-03-05) +# 136.0 can't be compiled with "-rust-extensions". +~mail-client/thunderbird-136.0 rust-extensions + # Ionen Wolkens (2024-12-24) # ebuild currently only support luajit, spare users from having # to set it by forcing it here (bug #946881) 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 d4a0180e87..e0869fc181 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 @@ -6,6 +6,14 @@ # New entries go on top. +# MichaÅ‚ Górny (2025-03-05) +# Mask until we have keyworded dev-util/spirv-llvm-translator:20 release. +llvm-core/libclc llvm_slot_20 + +# MichaÅ‚ Górny (2025-03-05) +# Mask until we have keyworded dev-lang/rust{,-bin} / slot 20 release. +www-client/chromium llvm_slot_20 + # Paul Zander (2025-02-24) # Only builds with ffmpeg-4.x, upstream has no timeline to fix it. # https://tracker.dev.opencascade.org/view.php?id=32871 @@ -103,7 +111,6 @@ dev-python/qtpy pyside2 # Joonas Niilola (2024-11-16) # Wasm support is (currently) only available on amd64 and arm64. -www-client/firefox wasm www-client/firefox wasm-sandbox # Matt Jolly (2024-11-11) @@ -234,11 +241,6 @@ sys-libs/glibc cet # https://github.com/linuxmint/wayland/issues gnome-extra/cinnamon wayland -# James Le Cuirot (2024-02-11) -# The Raspberry Pi patch set is very heavy and will probably fail to apply -# against a live checkout. ->=media-video/ffmpeg-9999 soc - # Michael Orlitzky (2024-01-24) # A missing "-o pipefail" in the gap-pkg eclass caused me to # miss a few crashes in dev-gap packages when GAP itself is @@ -335,7 +337,10 @@ dev-lang/ruby jemalloc # Joonas Niilola (2023-07-14) # Calendar is broken with some languages on 115.0 release. Bug #910229 ->=mail-client/thunderbird-115.0 system-icu +# Update on 136.0: Thunderbird upstream still carries the patch for bundled icu +# and in icu upstream, the issue is unresolved. "system-icu" still doesn't +# work properly in 136.0, bug #950687. +mail-client/thunderbird system-icu # Marek Szuba (2023-07-10) # dev-python/mkdocs-material is by design directly integrated with @@ -864,6 +869,7 @@ dev-db/mysql client-libs # This flag can be sensibly enabled only on macos. # Can be unmasked in prefix/darwin/macos profiles. Bug #637482 media-video/ffmpeg appkit +media-video/ffmpeg-compat appkit # Andreas K. Huettel (2017-09-09) # Potentially destructive. Use it only if you know what you're doing. 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 b92c056639..b78d205f67 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 @@ -4,6 +4,11 @@ # New entries go on top. # Please use the same syntax as in package.use.mask. +# Sam James (2025-03-07) +# Gradually unmask for newer Rust to avoid making users recompile for +# the change. See bug #735154. + (2025-02-03) # Requires dev-util/shelltestrunner app-arch/mt-st test @@ -45,6 +50,7 @@ sci-physics/lammps hip # Sam James (2022-12-07) # Needs unstable media-libs/libvpl media-video/ffmpeg qsv +media-video/ffmpeg-compat qsv media-video/handbrake qsv # Guillermo Joandet (2022-11-22) @@ -138,7 +144,7 @@ app-emulation/winetricks test # Georgy Yakovlev (2019-12-21) # For bleeding edge features and testing, not generally suitable # for stable systems -dev-lang/rust nightly system-bootstrap +dev-lang/rust nightly # Andreas Sturmlechner (2019-12-09) # Declared experimental, and dev-cpp/websocketpp not stable yet @@ -154,12 +160,6 @@ dev-perl/Template-Toolkit gd media-fonts/unifont utils fontforge media-video/vdrsync dvdr -# Georgy Yakovlev (2019-05-10) -# needs llvm slots which are not stable #678908 -# also prone to weird compilation failures -# masking this for now, will readjust as situation changes ->=dev-lang/rust-1.34 system-llvm - # Mart Raudsepp (2019-04-14) # Needs media-plugins/gst-plugins-chromaprint, which is not stable # anywhere yet. diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask index fbfe251fd8..d1ffecbdc3 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask @@ -4,10 +4,13 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Sam James (2025-03-09) +# Obsolete in favour of gcc_*. gnat-gpl will be removed soon. +ada_target_gnat_2021 + # MichaÅ‚ Górny (2024-12-31) # LLVM slots with no keyworded releases yet. llvm_slot_21 -llvm_slot_20 # Andreas Sturmlechner (2024-12-11) # dev-db/firebird last-rites preparation 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 f38e5e82c7..a20d2f136b 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 @@ -4,6 +4,11 @@ # New entries go on top. # Please use the same syntax as in use.mask. +# MichaÅ‚ Górny (2024-12-31) +# LLVM slots with no stable releases yet. +llvm_slot_21 +llvm_slot_20 + # Hans de Graaff (2024-12-26) # Currently in testing and not ready to go stable yet. ruby_targets_ruby34 diff --git a/sdk_container/src/third_party/portage-stable/profiles/categories b/sdk_container/src/third_party/portage-stable/profiles/categories index eb23eea4ae..40dc2fa551 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/categories +++ b/sdk_container/src/third_party/portage-stable/profiles/categories @@ -135,6 +135,7 @@ sci-geosciences sci-libs sci-mathematics sci-misc +sci-ml sci-physics sci-visualization sec-keys 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 ce270aa1d9..33ea67e2c2 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 @@ -8,3 +8,7 @@ # Georgy Yakovlev (2020-01-28) # rust-bin is available on amd64 musl -dev-lang/rust-bin + +# Sebastian Parborg (2025-01-21) +# blender-bin is only compatible with glibc +media-gfx/blender-bin diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.mask index 25a5df5e91..10ed6ac4d0 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/musl/package.mask @@ -9,3 +9,7 @@ dev-java/openjdk-bin:8 # Georgy Yakovlev (2020-01-28) # rust-bin is available on amd64 musl -dev-lang/rust-bin + +# Sebastian Parborg (2025-01-21) +# blender-bin is only compatible with glibc +media-gfx/blender-bin diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.mask index 25a5df5e91..10ed6ac4d0 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/23.0/split-usr/musl/package.mask @@ -9,3 +9,7 @@ dev-java/openjdk-bin:8 # Georgy Yakovlev (2020-01-28) # rust-bin is available on amd64 musl -dev-lang/rust-bin + +# Sebastian Parborg (2025-01-21) +# blender-bin is only compatible with glibc +media-gfx/blender-bin diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/23.0/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/23.0/musl/package.use.force deleted file mode 100644 index fd3ef27d89..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/23.0/musl/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Arthur Zamarin (2024-08-16) -# We build our riscv musl binaries ourselves, #936643 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/23.0/split-usr/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/23.0/split-usr/musl/package.use.force deleted file mode 100644 index fd3ef27d89..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/23.0/split-usr/musl/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Arthur Zamarin (2024-08-16) -# We build our riscv musl binaries ourselves, #936643 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/23.0/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/23.0/musl/package.use.force deleted file mode 100644 index fd3ef27d89..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/23.0/musl/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Arthur Zamarin (2024-08-16) -# We build our riscv musl binaries ourselves, #936643 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/23.0/split-usr/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/23.0/split-usr/musl/package.use.force deleted file mode 100644 index fd3ef27d89..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/23.0/split-usr/musl/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Arthur Zamarin (2024-08-16) -# We build our riscv musl binaries ourselves, #936643 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/20.0/rv64gc/lp64/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/20.0/rv64gc/lp64/musl/package.use.force deleted file mode 100644 index 1205c80865..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/20.0/rv64gc/lp64/musl/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# matoro -# We build our riscv musl binaries ourselves, #936643 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/package.use.force deleted file mode 100644 index 1205c80865..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/20.0/rv64gc/lp64d/musl/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# matoro -# We build our riscv musl binaries ourselves, #936643 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/lp64/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/lp64/musl/package.use.force deleted file mode 100644 index 1205c80865..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/lp64/musl/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# matoro -# We build our riscv musl binaries ourselves, #936643 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/package.use.force deleted file mode 100644 index 1205c80865..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/lp64d/musl/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# matoro -# We build our riscv musl binaries ourselves, #936643 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/package.use.force deleted file mode 100644 index 1205c80865..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64/musl/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# matoro -# We build our riscv musl binaries ourselves, #936643 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/package.use.force deleted file mode 100644 index 1205c80865..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/riscv/23.0/rv64/split-usr/lp64d/musl/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# matoro -# We build our riscv musl binaries ourselves, #936643 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc index 029dd62dce..441b63a1db 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc @@ -3,6 +3,7 @@ # This file contains descriptions of the PHP_TARGETS USE_EXPAND flags +php8-4 - Build against PHP 8.4 php8-3 - Build against PHP 8.3 php8-2 - Build against PHP 8.2 php8-1 - Build against PHP 8.1 diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/big-endian/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/big-endian/package.use.mask index 7b11c936a2..8469f44a3f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/big-endian/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/big-endian/package.use.mask @@ -17,6 +17,7 @@ media-libs/gexiv2 test # matoro (2023-11-16) # media-libs/libvpx casualties (#700902) media-video/ffmpeg vpx +media-video/ffmpeg-compat vpx www-client/firefox system-libvpx www-client/seamonkey system-libvpx media-video/vlc vpx @@ -36,6 +37,7 @@ games-engines/scummvm vpx # media-libs/libaom casualties # https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 media-video/ffmpeg libaom +media-video/ffmpeg-compat libaom www-client/firefox system-av1 www-client/seamonkey system-av1 media-video/vlc aom diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.use.force index a9959f2773..69e173188c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.use.force @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Ionen Wolkens (2023-08-11) @@ -13,3 +13,4 @@ app-emulation/wine-vanilla mingw # profile settings expect it. # TODO: Make a profile without default-libcxx too? llvm-core/clang-common default-compiler-rt default-lld default-libcxx +llvm-core/clang-runtime default-compiler-rt default-lld default-libcxx 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 5ad7199cad..7b377e8238 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,10 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# NHOrus (2025-03-13) +# uses functions musl will not implement, bug #942215 +app-admin/sud + # NHOrus (2025-02-01) # not ported to musl, bug #713434 app-crypt/mit-krb5-appl @@ -267,7 +271,6 @@ app-misc/kryoflux-dtc app-office/drawio-desktop-bin app-office/joplin-desktop app-office/libreoffice-bin -app-office/libreoffice-bin-debug app-office/onlyoffice-bin app-shells/pwsh-bin app-text/master-pdf-editor 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 8127476c7c..ec15d698d4 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,6 +1,24 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2025-03-10) +# Been failing to build for a long time for musl with modern compilers, +# so mask until there is a proper fix. Note that this does not disable +# v4l support entirely (always enabled), only libv4l use (bug #911499). +# +# Old ebuilds had a different meaning for USE=v4l (has *both* a libv4l +# and v4l) and it should not be masked, can be removed after cleanup. +media-video/ffmpeg v4l +=media-video/ffmpeg-4.4.5-r1 libv4l -v4l +=media-video/ffmpeg-6.1.2-r0 libv4l -v4l +=media-video/ffmpeg-7.1-r0 libv4l -v4l +media-video/ffmpeg-compat v4l + +# Ionen Wolkens (2025-03-10) +# dev-util/nvidia-cuda-toolkit is unavailable on musl +media-video/ffmpeg npp +media-video/ffmpeg-compat npp + # Sam James (2025-01-08) # Depends on currently-masked elogind version on musl profiles (bug #947739) sys-libs/pam elogind @@ -158,17 +176,18 @@ net-irc/ngircd test # Sam James (2022-10-04) # Rolling mask for all USE flags which pull in a masked binary package # (linked against glibc). Use for all such packages. -dev-libs/oneDNN mkl +sci-ml/oneDNN mkl kde-apps/kdenetwork-meta dropbox media-libs/opencv atlas mkl media-video/ffmpeg amf +media-video/ffmpeg-compat amf media-video/handbrake amf net-fs/openafs tsm net-analyzer/nagios-plugin-check_raid megaraid-sas sys-apps/hwloc gl sci-chemistry/gromacs mkl sci-libs/armadillo mkl -sci-libs/caffe2 mkl +sci-ml/caffe2 mkl sci-libs/dlib mkl sci-libs/trilinos mkl www-client/qutebrowser widevine diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use.force deleted file mode 100644 index c8e401afcc..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use.force +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Georgy Yakovlev (2021-04-03) -# We want to use rust-bin (with fixes) or source-built rust -# to bootstrap rust properly. -# See https://github.com/gentoo/gentoo/pull/19815 for discussion -# and bug #682370, bug #682370 -dev-lang/rust system-bootstrap diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/make.defaults index e5a1534aae..d7e8ef2aaf 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/make.defaults @@ -11,7 +11,8 @@ USE="selinux" FEATURES="selinux sesandbox sfperms -pid-sandbox" -POLICY_TYPES="strict targeted" +# Build all policy types by default +POLICY_TYPES="strict targeted mcs mls" PORTAGE_T="portage_t" PORTAGE_FETCH_T="portage_fetch_t" PORTAGE_SANDBOX_T="portage_sandbox_t" diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.use.mask index c632ae715d..e4ca8cc41d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/selinux/package.use.mask @@ -3,9 +3,9 @@ # Brian Dolbec (2014-09-17) # mask pypy for several utilities due to incompatibility with libselinux -sys-apps/portage python_targets_pypy3 -app-portage/elicense python_targets_pypy3 -app-portage/elogv python_targets_pypy3 -app-portage/gentoolkit python_targets_pypy3 -app-portage/smart-live-rebuild python_targets_pypy3 -app-portage/gentoopm python_targets_pypy3 +sys-apps/portage python_targets_pypy3 python_targets_pypy3_11 +app-portage/elicense python_targets_pypy3 python_targets_pypy3_11 +app-portage/elogv python_targets_pypy3 python_targets_pypy3_11 +app-portage/gentoolkit python_targets_pypy3 python_targets_pypy3_11 +app-portage/smart-live-rebuild python_targets_pypy3 python_targets_pypy3_11 +app-portage/gentoopm python_targets_pypy3 python_targets_pypy3_11 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 5777370486..33bd3c54c2 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 @@ -3,7 +3,8 @@ # Sam James (2025-02-21) # Needs Rust -media-video/ffmpeg rav1e +media-video/ffmpeg rav1e svg +media-video/ffmpeg-compat rav1e svg # Viorel Munteanu (2025-01-24) # Requires dev-python/asyncssh. 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 e9a5ca50f0..a12adb9d68 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask @@ -33,6 +33,92 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2025-03-17) +# Database migration issues on upgrade, bug #951486 +>=app-office/kmymoney-5.1.92 + +# Arthur Zamarin (2025-03-15) +# EAPI=7, uses deprecated Go eclasses. Isn't maintained in Gentoo +# since 2019, with awaiting version bump (upstream is still active). +# Has open security vulnerabilities. +# Removal on 2025-04-14. Bugs #951417, #631076, #679948, #695310, +# #771051, #844727, #880151, #908590, #948207, #813702, #866356. +sys-cluster/teleport + +# Sam James (2025-03-13) +# Causes build failures in reverse dependencies (bug #951062, bug #951120) +=dev-util/spirv-headers-1.4.304.0-r1 +=dev-util/spirv-llvm-translator-15.0.10-r1 +=dev-util/spirv-llvm-translator-16.0.10-r1 +=dev-util/spirv-llvm-translator-17.0.10-r1 +=dev-util/spirv-llvm-translator-18.1.10-r1 +=dev-util/spirv-llvm-translator-19.1.5-r1 + +# Sam James (2025-03-09) +# Obsolete in favour of dev-lang/ada-bootstrap. Using sys-devel/gcc[ada] +# should now Just Work. Removal on 2025-04-10. +dev-lang/gnat-gpl + +# Sam James (2025-03-09) +# Breaks distutils.ccompiler with a lot of fallout. bug #950978 and +# many others. +=dev-python/setuptools-75.9.0 +=dev-python/setuptools-75.9.1 +=dev-python/setuptools-76.0.0 +=dev-python/ensurepip-setuptools-75.9.0 +=dev-python/ensurepip-setuptools-75.9.1 +=dev-python/ensurepip-setuptools-76.0.0 + +# Arthur Zamarin (2025-03-08) +# EAPI=7. Broken CLI for packages.g.o. +# Removal on 2025-04-07. +app-portage/pgo + +# Anna (navi) Figueiredo Gomes (2025-03-08) +# User services is merged and released in openrc-0.60, this fork +# is now unmaintained and superseded. +# Removal on 2025-04-08. Bug #950367 +sys-apps/openrc-navi + +# Andreas Sturmlechner (2025-03-07) +# No more revdeps after kde-apps/knotes last-rites and Gear 24.08.3 cleanup. +# Removal on 2025-03-31. +kde-apps/akonadi-notes + +# Andreas Sturmlechner (2025-03-07) +# Downstream-split fallback package for KF5-based revdeps without any +# revdeps left. Removal on 2025-03-31. +kde-apps/kdesdk-thumbnailers-common +media-libs/ksanecore-common +net-misc/kio-zeroconf-common + +# Sam James (2025-03-07) +# May cause emerge to hang (bug #950707). Tests hang on one machine +# and another strange report upstream: https://github.com/pkgconf/pkgconf/issues/383. +# Mask out of caution for now. +=dev-util/pkgconf-2.4.1 + +# Andreas Sturmlechner (2025-03-06) +# Last release in 2018 and no upstream activity ever since. +# Please migrate to an alternative backup solution. Bug #947894 +# Removal on 2025-04-15. +app-backup/luckybackup + +# MichaÅ‚ Górny (2025-03-06) +# This package is clearly unmaintained. It has lost all CPython +# versions, and retained PyPy3 likely only because it wasn't versioned. +# Also, since it's eclass usage used to be broken, it went under the +# radar. Removal on 2025-04-05. Bug #950702. +dev-vcs/notify-webhook + +# Joonas Niilola (2025-03-05) +# New release channel deemed as stable. Package.masked for the early +# adopters - make sure to have ~/.thunderbird backed up, since +# downgrading back to esr channel (128) might be impossible due to +# changed database schemas. +>=mail-client/thunderbird-136.0 +>=mail-client/thunderbird-bin-136.0 + # John Helmert III (2025-03-02) # Doesn't seem to cleanly load, see: # https://github.com/lkrg-org/lkrg/issues/364 @@ -50,13 +136,6 @@ sci-biology/clustalx # various upstream reports. Bug #947621. Removal on 2025-03-31. media-sound/qtscrobbler -# Andreas Sturmlechner (2025-03-01) -# Currently packaged version released 12 years ago; dead upstream, -# possibly GPL violating piece of very expensive software not available -# to "new" customers in most countries even for a 5-figure USD sum. -# Bug #947239. Removal on 2025-03-31. -app-text/diffpdf - # Andreas Sturmlechner (2025-03-01) # Last release 10 years ago, dead upstream, does not build with Qt6, # no one else packages this. Removal on 2025-03-31. @@ -137,13 +216,6 @@ dev-python/pyside6-tools # Removal on 2025-03-18. sci-electronics/eagle -# Andreas Sturmlechner (2025-02-16) -# KF5/Qt5 based and no signs of porting or even life upstream. -# kde-frameworks/kcalendarcore:5 has no more revdeps after this. -# Removal on 2025-03-16. -app-office/calligraplan -kde-frameworks/kcalendarcore:5 - # Andreas K. Hüttel (2025-02-16) # Discontinued, please use xournal++ instead. # Removal on 2025-03-16. Bug 948200. @@ -184,42 +256,10 @@ app-text/fictionup # Removal on 2025-03-16. app-emulation/vkd3d -# Andreas Sturmlechner (2025-02-13) -# Last release 10 years ago, dead upstream, depends on Qt5, no one else -# packages this. Removal on 2025-03-14. -x11-misc/kaqaz - -# Andreas Sturmlechner (2025-02-12) -# Depends on deprecated Qt5Script, gone closed-source upstream, multiple -# open bugs #912829, #913106, #922304, #922306, #926039, #935772, #935887, -# no response from maintainer. Removal on 2025-03-14. -net-analyzer/ostinato - -# Andreas Sturmlechner (2025-02-12) -# Last release from 2021 even if not yet dead upstream; however completely -# unmaintained in Gentoo, with the ensuing multiple longstanding bugs -# #832614, #866935, #895806, #915790, #944379, #945060; ebuild still based -# on EAPI-7, USE=javascript depending on deprecated Qt5Script, USE=qt5 -# blocking qt5-removal, etc. This package was already problematic during -# transition from Qt4 to Qt5, I will not deal with it this time. -# Removal on 2025-03-14. -net-p2p/eiskaltdcpp - # Maciej Barć (2025-02-12) # Masked for testing. Fails to update from previous version. See bug #949626. >=x11-themes/fluent-icon-theme-2025.02.10 -# Ionen Wolkens (2025-02-11) -# Fails to build with >=gcc14 and >=clang16 (Modern C) and tests fail -# among several other accumulating issues. Hasn't received a release -# since 2013 and snapshots been difficult due to upstream often doing -# refactoring leading to various runtime regressions, and testing the -# state downstream is not obvious (current snapshot has some runtime -# issues too). Re-adding could be considered if there is ever a proper -# release. Recommend using games-fps/darkplaces instead. -# Removal on 2025-03-13. Bugs #931506, #926463, #919237, #908709, ... -games-fps/quakeforge - # Matt Jolly (2025-02-10) # Rust ebuilds are migrating to use RPATH/RUNPATH to find their libraries. # New revisions for each Slot are already in-tree and should be used instead. @@ -255,38 +295,6 @@ games-fps/quakeforge # https://bugs.gentoo.org/949414 =dev-cpp/cpp-httplib-0.18.6 -# Mike Pagano (2025-02-07) -# Last release 3 years ago, no version compiles; ours or upstreams. -# Ack from maintainer. Driver is available in the Linux Kernel -# Removal on 2025-03-07. Bug: 949318 -net-misc/AQtion - -# Arthur Zamarin (2025-01-28) -# Since we are done with EGO_SUM, this tool isn't needed any more. -# Removal on 2025-02-27. Bug #948966. -dev-go/get-ego-vendor - -# Arthur Zamarin (2025-01-24) -# EAPI=7, uses deprecated Go eclasses, fails to compile, installation -# blocked by current versions of docker (which provides the features). -# Removal on 2025-02-23. Bugs #948656, #844577, #694898, #678982. -app-containers/docker-proxy - -# Arthur Zamarin (2025-01-24) -# EAPI=7, uses depcreated Go eclasses, fails to compile. burrow itself -# has exporter built in since version 1.3.4, which can be used instead. -# Removal on 2025-02-23. Bugs #948655, #844613, #679086. -app-metrics/burrow_exporter - -# Arthur Zamarin (2025-01-24) -# EAPI=7, uses deprecated Go eclasses, upstream repo is archived. -# gom is a go dependency manager which doesn't work with modern -# Go tools, and is redundent to standard `go install` commands. -# go-colortext has only gom as reverse dependency. -# Removal on 2025-02-23. Bugs #948653, #844655, #844664, #922697. -dev-go/go-colortext -dev-go/gom - # Andreas Sturmlechner (2025-01-23) # Qt5 package without any revdeps. Use dev-qt/qttools[qdbus] instead. dev-qt/qdbusviewer @@ -313,12 +321,6 @@ dev-qt/qtwebview:5 >=dev-libs/intel-compute-runtime-24.52.32224.5 >=dev-util/intel-graphics-compiler-2.5.7 -# Nowa Ammerlaan (2025-01-03) -# Contains a serious bug that can cause deletion of the users home dir. -# See-also: https://github.com/keshavbhatt/whatsie/issues/230 -# Removal on 2025-03-03 unless upstream fixes the issue -net-im/whatsie - # MichaÅ‚ Górny (2024-12-05) # 6.12.2 does not boot for me. =sys-kernel/gentoo-kernel-6.12.2 @@ -433,82 +435,13 @@ app-emulation/virtualbox-kvm # exim_tinydb utility crashes due to invalid free() (used in startup script) =mail-mta/exim-4.98 -# Leonardo Hernández Hernández (2024-07-07) -# New major ffmpeg version. Tracker bug #928905. ->=media-video/ffmpeg-7.0 - # Sam James (2024-06-25) # The symbol versioning "fix" breaks anything built with 3.0.0. =dev-libs/libassuan-3.0.1 # Alfredo Tupone (2024-06-09) # Not ready for testing ->=dev-lang/ocaml-5 -dev-ml/sexplib0:0/0.17 dev-ml/ocaml_intrinsics:0/0.17 -dev-ml/ocaml_intrinsics_kernel:0/0.17 -dev-ml/base:0/0.17 -dev-ml/fieldslib:0/0.17 -dev-ml/stdio:0/0.17 ->=dev-ml/ocaml-compiler-libs-0.17 ->=dev-ml/ppxlib-0.32.1 -dev-ml/ppx_cold:0/0.17 -dev-ml/ppxlib_jane -dev-ml/ppx_compare:0/0.17 -dev-ml/ppx_enumerate:0/0.17 -dev-ml/ppx_globalize:0/0.17 -dev-ml/ppx_sexp_conv:0/0.17 -dev-ml/ppx_hash:0/0.17 -dev-ml/ppx_base:0/0.17 -dev-ml/ppx_fields_conv:0/0.17 -dev-ml/ppx_fixed_literal:0/0.17 -dev-ml/ppx_here:0/0.17 -dev-ml/ppx_let:0/0.17 -dev-ml/ppx_sexp_message:0/0.17 -dev-ml/ppx_sexp_value:0/0.17 -dev-ml/ppx_assert:0/0.17 -dev-ml/jane-street-headers:0/0.17 -dev-ml/ppx_optcomp:0/0.17 -dev-ml/jst-config:0/0.17 -dev-ml/time_now:0/0.17 -dev-ml/ppx_inline_test:0/0.17 -dev-ml/ppx_bench:0/0.17 -dev-ml/splittable_random:0/0.17 -dev-ml/base_quickcheck:0/0.17 -dev-ml/ppx_stable:0/0.17 -dev-ml/ppx_string:0/0.17 -dev-ml/ppx_expect:0/0.17 -dev-ml/parsexp:0/0.17 -dev-ml/sexplib:0/0.17 -dev-ml/variantslib:0/0.17 -dev-ml/ppx_variants_conv:0/0.17 -dev-ml/ppx_log:0/0.17 -dev-ml/ppx_ignore_instrumentation:0/0.17 -dev-ml/typerep:0/0.17 -dev-ml/ppx_typerep_conv:0/0.17 -dev-ml/ppx_tydi:0/0.17 -dev-ml/capitalization:0/0.17 -dev-ml/ppx_string_conv:0/0.17 -dev-ml/ppx_stable_witness:0/0.17 -dev-ml/ppx_pipebang:0/0.17 -dev-ml/ppx_optional:0/0.17 -dev-ml/ppx_module_timer:0/0.17 -dev-ml/ppx_disable_unused_warnings:0/0.17 -dev-ml/ppx_custom_printf:0/0.17 -dev-ml/bin_prot:0/0.17 -dev-ml/ppx_bin_prot:0/0.17 -dev-ml/ppx_jane:0/0.17 -dev-ml/gel:0/0.17 -dev-ml/ppx_diff:0/0.17 -dev-ml/int_repr:0/0.17 -dev-ml/base_bigstring:0/0.17 -dev-ml/core:0/0.17 -dev-ml/uopt:0/0.17 -dev-ml/core_kernel:0/0.17 -dev-ml/timezone:0/0.17 -dev-ml/sexp_pretty:0/0.17 -dev-ml/expect_test_helpers_core:0/0.17 -dev-ml/core_unix:0/0.17 dev-ml/async_kernel:0/0.17 dev-ml/async_unix:0/0.17 dev-ml/protocol_version_header:0/0.17 @@ -517,8 +450,6 @@ dev-ml/async_log:0/0.17 dev-ml/textutils:0/0.17 dev-ml/async:0/0.17 >=dev-ml/labltk-8.06.14 -dev-ml/patience_diff:0/0.17 ->=dev-ml/ppx_deriving-6.0.2 dev-ml/ppx_js_style:0/0.17 >=dev-ml/camlp4-5 dev-ml/textutils_kernel:0/0.17 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.mask index b388ebc3be..a97a9a7dd0 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Fabian Groffen (2024-07-19) @@ -29,6 +29,7 @@ sys-libs/ncurses-compat tinfo # This flag can be sensibly enabled only on macos # hence it is masked in base profile. Bug #637482 media-video/ffmpeg -appkit +media-video/ffmpeg-compat -appkit # Fabian Groffen (2009-10-30) # X and linux only diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use index da37d51de1..82b89cf299 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use @@ -1,6 +1,12 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Filip Kobierski (2025-02-27) +# Most desktop users will get doxygen because a USE=doc dep. +# With USE=gui, which is the default for this profile, it pulls in +# qtbase with many dependencies and I doubt it will be used. +app-text/doxygen -gui + # Andreas Sturmlechner (2024-03-07) # Required by kde-frameworks/kio:6 dev-qt/qtbase libproxy diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2025 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2025 index 22b8430552..be51cc7585 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2025 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2025 @@ -1,3 +1,26 @@ move dev-python/pyside6 dev-python/pyside slotmove dev-php/pecl-ssh2 0 7 slotmove dev-php/pecl-stomp 0 7 +move dev-util/rr dev-debug/rr +move sci-libs/evaluate sci-ml/evaluate +move sci-libs/transformers sci-ml/transformers +move sci-libs/tokenizers sci-ml/tokenizers +move sci-libs/datasets sci-ml/datasets +move sci-libs/huggingface_hub sci-ml/huggingface_hub +move sci-libs/safetensors sci-ml/safetensors +move sci-libs/torchvision sci-ml/torchvision +move sci-libs/pytorch sci-ml/pytorch +move sci-libs/caffe2 sci-ml/caffe2 +move sci-libs/foxi sci-ml/foxi +move sci-libs/gloo sci-ml/gloo +move sci-libs/ideep sci-ml/ideep +move sci-libs/jiwer sci-ml/jiwer +move sci-libs/kineto sci-ml/kineto +move sci-libs/NNPACK sci-ml/NNPACK +move sci-libs/onnx sci-ml/onnx +move sci-libs/seqeval sci-ml/seqeval +move sci-libs/tensorpipe sci-ml/tensorpipe +move sci-libs/XNNPACK sci-ml/XNNPACK +move dev-libs/FBGEMM sci-ml/FBGEMM +move dev-libs/FP16 sci-ml/FP16 +move dev-libs/oneDNN sci-ml/oneDNN diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2021 b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2021 index 1c656f25a5..2f03ad804c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2021 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2021 @@ -30,7 +30,6 @@ move app-crypt/openpgp-keys-teemutoivola sec-keys/openpgp-keys-teemutoivola move app-crypt/openpgp-keys-terminator sec-keys/openpgp-keys-terminator move app-crypt/openpgp-keys-tor sec-keys/openpgp-keys-tor move app-crypt/openpgp-keys-voikko sec-keys/openpgp-keys-voikko -move app-emulation/docker-proxy app-containers/docker-proxy move app-emulation/containerd app-containers/containerd move app-emulation/crun app-containers/crun move app-emulation/buildah app-containers/buildah From 2b540dc361f36594f776cf9c1b1ba40978e75063 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:54 +0000 Subject: [PATCH 090/153] sec-policy/selinux-base: Sync with Gentoo It's from Gentoo commit 1d834aa9c6f8d981b720a18aa74907f84e9e27bf. --- .../sec-policy/selinux-base/Manifest | 2 + .../sec-policy/selinux-base/files/config | 2 +- .../selinux-base-2.20250213-r1.ebuild | 158 ++++++++++++++++++ 3 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/selinux-base-2.20250213-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/Manifest b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/Manifest index 5727621b3a..8fe284b304 100644 --- a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/Manifest +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/Manifest @@ -1,4 +1,6 @@ DIST patchbundle-selinux-base-policy-2.20240226-r2.tar.bz2 442650 BLAKE2B f2f7c5e4a595afafc072fd78fc4ef3930cf739d05cbe9670f2fb2956fe84e3045518345e103bc3880603d2562f06ba0597fc005d8d394e9f8cd057363f9bf95f SHA512 2cb00d088eebdb098a6496f156eeb3dcee026fc6e53d732bac5bc8a4cfee1ce3bf2bdbbbfbbe9bba237d61c06f299d96bb9d123a57a44aaaa17cc122e15ea268 DIST patchbundle-selinux-base-policy-2.20240916-r1.tar.bz2 274891 BLAKE2B 72b8181424450998164979ab582e8edee6d73b9110b4535e7880d1f7c989bd0ac391422872858da7bad3e3d77516996af93aa2f149f7d4a7f8fd329c481964cf SHA512 fd8259c91cc779301d6e0964827133529a9141dc235301da135210ea4359b800023848a25e33c45678477fa4f54e75da51be9ec85a3bed8b07cf5487e73b84f3 +DIST patchbundle-selinux-base-policy-2.20250213-r1.tar.bz2 276621 BLAKE2B 5a4b0c5fe017fd6c59c3f5d3a1af97e31485bd4325b10a2769883091e5ea6fd205ad42f346c06e6d443aeed9e46bf962febc177f58241c4633058918db6b7fb6 SHA512 1098cfb396d56dfc4f0c2b3ff90dcb9de3bf0b081f1d0c21d793fccc78e48d35a93883bb7fd54a0acd5fa2b06edc8965cbfe72e2b8f3ea325bbee18a8c8e7163 DIST refpolicy-2.20240226.tar.bz2 610561 BLAKE2B 5dc54dcf7238776d4e4b282c1dcbc499f45c0d96676dbf931da39592854034874b5dd6197a2e2776fccec5106d5f245eea3fb9419959bd4d61e9b2c12aeaaa85 SHA512 896a57afb024bd131f25d2831a9a5ac90ee7e5d76b0565bc818c156f6c310d86758bcd4cedbd9df5b29954c9a92a42300d16685a7e07a5efd8f789320724b3f9 DIST refpolicy-2.20240916.tar.bz2 618218 BLAKE2B d86ca75d254eef10f4aa57ef3977825211200cdf1eaa9bf9d416c9a52acee476b3f8719c3b0c8c17fdff2abc0c396989961e37e313a7b3bd3b4b0266a6280e75 SHA512 a8b6c90f8e186796b4c7db1e2d8ed3c3b8690bb5b8f180dcb6d5468ba80467e2969012c4edddf74429c0f5ce900d68fbbc0c2f8e253165af28f93f191039f064 +DIST refpolicy-2.20250213.tar.bz2 627837 BLAKE2B 64d64549bf1fcfc33107e8f4c842af4e3279a856c3a140d05749bae687ffadfe25e4b7383bef3618b13bbd553046d162fcd48b713500d3fd59073b5bece91008 SHA512 cbaf65dfe6d7cc886674bb37160170dac060265d5cf241bfac0c0e5ef45744f057107d81c933f01411c5cd538c95755b7a92331197e2b97b995efc4d6f266895 diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/files/config b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/files/config index 55933ea0e5..7b66367667 100644 --- a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/files/config +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/files/config @@ -12,4 +12,4 @@ SELINUX=permissive # mls - Full SELinux protection with Multi-Level Security # mcs - Full SELinux protection with Multi-Category Security # (mls, but only one sensitivity level) -SELINUXTYPE=strict +SELINUXTYPE=mcs diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/selinux-base-2.20250213-r1.ebuild b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/selinux-base-2.20250213-r1.ebuild new file mode 100644 index 0000000000..bdb6a700ee --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base/selinux-base-2.20250213-r1.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" +inherit python-any-r1 + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}" + EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}" + EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy" + + inherit git-r3 +else + SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2 + https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2" + + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi + +IUSE="doc +unknown-perms systemd +ubac +unconfined" + +DESCRIPTION="Gentoo base policy for SELinux" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux" +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=">=sys-apps/policycoreutils-2.8" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + >=sys-apps/checkpolicy-2.8 + sys-devel/m4" + +S=${WORKDIR}/ + +src_prepare() { + if [[ ${PV} != 9999* ]]; then + einfo "Applying SELinux policy updates ... " + eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch" + fi + + eapply_user + + cd "${S}/refpolicy" || die + emake bare +} + +src_configure() { + [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs" + + # Update the SELinux refpolicy capabilities based on the users' USE flags. + if use unknown-perms; then + sed -i -e '/^UNK_PERMS/s/deny/allow/' "${S}/refpolicy/build.conf" \ + || die "Failed to allow Unknown Permissions Handling" + sed -i -e '/^UNK_PERMS/s/deny/allow/' "${S}/refpolicy/Makefile" \ + || die "Failed to allow Unknown Permissions Handling" + fi + + if ! use ubac; then + sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \ + || die "Failed to disable User Based Access Control" + fi + + if use systemd; then + sed -i -e '/^SYSTEMD/s/n/y/' "${S}/refpolicy/build.conf" \ + || die "Failed to enable SystemD" + fi + + echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" || die + + # Prepare initial configuration + cd "${S}/refpolicy" || die + emake conf + + # Setup the policies based on the types delivered by the end user. + # These types can be "targeted", "strict", "mcs" and "mls". + for i in ${POLICY_TYPES}; do + cp -a "${S}/refpolicy" "${S}/${i}" || die + cd "${S}/${i}" || die + + sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" || die + + sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \ + "${S}/${i}/build.conf" || die "build.conf setup failed." + + if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]]; + then + # MCS/MLS require additional settings + sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \ + || die "failed to set type to mls" + fi + + if [ "${i}" == "targeted" ]; then + sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \ + "${S}/${i}/config/appconfig-standard/seusers" \ + || die "targeted seusers setup failed." + fi + + if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then + sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \ + "${S}/${i}/config/appconfig-${i}/seusers" \ + || die "policy seusers setup failed." + fi + done +} + +src_compile() { + [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs" + + for i in ${POLICY_TYPES}; do + cd "${S}/${i}" || die + emake base + if use doc; then + emake html + fi + done +} + +src_install() { + [ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs" + + for i in ${POLICY_TYPES}; do + cd "${S}/${i}" || die + + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install-headers + + echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die + + echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types" || die + + # libsemanage won't make this on its own + keepdir "/etc/selinux/${i}/policy" + + if use doc; then + docinto ${i}/html + dodoc -r doc/html/*; + fi + + insinto /usr/share/selinux/devel; + doins doc/policy.xml; + + done + + docinto / + dodoc doc/Makefile.example doc/example.{te,fc,if} + + doman man/man8/*.8; + + insinto /etc/selinux + doins "${FILESDIR}/config" + + insinto /usr/share/portage/config/sets + doins "${FILESDIR}/selinux.conf" +} From 510c4f27ac686053e851935d9293629d3433a8ab Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:54 +0000 Subject: [PATCH 091/153] sec-policy/selinux-base-policy: Sync with Gentoo It's from Gentoo commit 1d834aa9c6f8d981b720a18aa74907f84e9e27bf. --- .../sec-policy/selinux-base-policy/Manifest | 2 + .../selinux-base-policy-2.20250213-r1.ebuild | 141 ++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sec-policy/selinux-base-policy/selinux-base-policy-2.20250213-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base-policy/Manifest b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base-policy/Manifest index 5727621b3a..8fe284b304 100644 --- a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base-policy/Manifest +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base-policy/Manifest @@ -1,4 +1,6 @@ DIST patchbundle-selinux-base-policy-2.20240226-r2.tar.bz2 442650 BLAKE2B f2f7c5e4a595afafc072fd78fc4ef3930cf739d05cbe9670f2fb2956fe84e3045518345e103bc3880603d2562f06ba0597fc005d8d394e9f8cd057363f9bf95f SHA512 2cb00d088eebdb098a6496f156eeb3dcee026fc6e53d732bac5bc8a4cfee1ce3bf2bdbbbfbbe9bba237d61c06f299d96bb9d123a57a44aaaa17cc122e15ea268 DIST patchbundle-selinux-base-policy-2.20240916-r1.tar.bz2 274891 BLAKE2B 72b8181424450998164979ab582e8edee6d73b9110b4535e7880d1f7c989bd0ac391422872858da7bad3e3d77516996af93aa2f149f7d4a7f8fd329c481964cf SHA512 fd8259c91cc779301d6e0964827133529a9141dc235301da135210ea4359b800023848a25e33c45678477fa4f54e75da51be9ec85a3bed8b07cf5487e73b84f3 +DIST patchbundle-selinux-base-policy-2.20250213-r1.tar.bz2 276621 BLAKE2B 5a4b0c5fe017fd6c59c3f5d3a1af97e31485bd4325b10a2769883091e5ea6fd205ad42f346c06e6d443aeed9e46bf962febc177f58241c4633058918db6b7fb6 SHA512 1098cfb396d56dfc4f0c2b3ff90dcb9de3bf0b081f1d0c21d793fccc78e48d35a93883bb7fd54a0acd5fa2b06edc8965cbfe72e2b8f3ea325bbee18a8c8e7163 DIST refpolicy-2.20240226.tar.bz2 610561 BLAKE2B 5dc54dcf7238776d4e4b282c1dcbc499f45c0d96676dbf931da39592854034874b5dd6197a2e2776fccec5106d5f245eea3fb9419959bd4d61e9b2c12aeaaa85 SHA512 896a57afb024bd131f25d2831a9a5ac90ee7e5d76b0565bc818c156f6c310d86758bcd4cedbd9df5b29954c9a92a42300d16685a7e07a5efd8f789320724b3f9 DIST refpolicy-2.20240916.tar.bz2 618218 BLAKE2B d86ca75d254eef10f4aa57ef3977825211200cdf1eaa9bf9d416c9a52acee476b3f8719c3b0c8c17fdff2abc0c396989961e37e313a7b3bd3b4b0266a6280e75 SHA512 a8b6c90f8e186796b4c7db1e2d8ed3c3b8690bb5b8f180dcb6d5468ba80467e2969012c4edddf74429c0f5ce900d68fbbc0c2f8e253165af28f93f191039f064 +DIST refpolicy-2.20250213.tar.bz2 627837 BLAKE2B 64d64549bf1fcfc33107e8f4c842af4e3279a856c3a140d05749bae687ffadfe25e4b7383bef3618b13bbd553046d162fcd48b713500d3fd59073b5bece91008 SHA512 cbaf65dfe6d7cc886674bb37160170dac060265d5cf241bfac0c0e5ef45744f057107d81c933f01411c5cd538c95755b7a92331197e2b97b995efc4d6f266895 diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base-policy/selinux-base-policy-2.20250213-r1.ebuild b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base-policy/selinux-base-policy-2.20250213-r1.ebuild new file mode 100644 index 0000000000..08b8534f7f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-base-policy/selinux-base-policy-2.20250213-r1.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="${SELINUX_GIT_REPO:-https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}" + EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}" + EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy" + + inherit git-r3 +else + SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2 + https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi + +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:SELinux" +DESCRIPTION="SELinux policy for core modules" + +IUSE="systemd +unconfined" + +PDEPEND="unconfined? ( sec-policy/selinux-unconfined )" +DEPEND="=sec-policy/selinux-base-${PVR}[systemd?]" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-apps/checkpolicy + sys-devel/m4" + +MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork systemd tmpfiles udev userdomain usermanage unprivuser xdg" +DEL_MODS="hotplug" +LICENSE="GPL-2" +SLOT="0" +S="${WORKDIR}/" + +# Code entirely copied from selinux-eclass (cannot inherit due to dependency on +# itself), when reworked reinclude it. Only postinstall (where -b base.pp is +# added) needs to remain then. + +pkg_pretend() { + for i in ${POLICY_TYPES}; do + if [[ "${i}" == "targeted" ]] && ! use unconfined; then + die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory." + fi + done +} + +src_prepare() { + local modfiles + + if [[ ${PV} != 9999* ]]; then + einfo "Applying SELinux policy updates ... " + eapply -p0 "${WORKDIR}/0001-full-patch-against-stable-release.patch" + fi + + eapply_user + + # Collect only those files needed for this particular module + for i in ${MODS}; do + modfiles="$(find "${S}"/refpolicy/policy/modules -iname $i.te) $modfiles" + modfiles="$(find "${S}"/refpolicy/policy/modules -iname $i.fc) $modfiles" + done + + for i in ${DEL_MODS}; do + [[ "${MODS}" != *${i}* ]] || die "Duplicate module in MODS and DEL_MODS: ${i}" + done + + for i in ${POLICY_TYPES}; do + mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}" + cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \ + || die "Failed to copy Makefile.example to ${S}/${i}/Makefile" + + cp ${modfiles} "${S}"/${i} \ + || die "Failed to copy the module files to ${S}/${i}" + done +} + +src_compile() { + for i in ${POLICY_TYPES}; do + emake NAME=$i SHAREDIR="${SYSROOT%/}/usr/share/selinux" -C "${S}"/${i} + done +} + +src_install() { + local BASEDIR="/usr/share/selinux" + + for i in ${POLICY_TYPES}; do + for j in ${MODS}; do + einfo "Installing ${i} ${j} policy package" + insinto ${BASEDIR}/${i} + doins "${S}"/${i}/${j}.pp + done + done +} + +pkg_postinst() { + # Set root path and don't load policy into the kernel when cross compiling + local root_opts="" + if [[ "${ROOT}" != "" ]]; then + root_opts="-p ${ROOT} -n" + fi + + # Override the command from the eclass, we need to load in base as well here + local COMMAND="-i base.pp" + if has_version " Date: Mon, 17 Mar 2025 07:10:55 +0000 Subject: [PATCH 092/153] sec-policy/selinux-container: Sync with Gentoo It's from Gentoo commit 1d834aa9c6f8d981b720a18aa74907f84e9e27bf. --- .../sec-policy/selinux-container/Manifest | 2 ++ .../selinux-container-2.20250213-r1.ebuild | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sec-policy/selinux-container/selinux-container-2.20250213-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-container/Manifest b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-container/Manifest index 5727621b3a..8fe284b304 100644 --- a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-container/Manifest +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-container/Manifest @@ -1,4 +1,6 @@ DIST patchbundle-selinux-base-policy-2.20240226-r2.tar.bz2 442650 BLAKE2B f2f7c5e4a595afafc072fd78fc4ef3930cf739d05cbe9670f2fb2956fe84e3045518345e103bc3880603d2562f06ba0597fc005d8d394e9f8cd057363f9bf95f SHA512 2cb00d088eebdb098a6496f156eeb3dcee026fc6e53d732bac5bc8a4cfee1ce3bf2bdbbbfbbe9bba237d61c06f299d96bb9d123a57a44aaaa17cc122e15ea268 DIST patchbundle-selinux-base-policy-2.20240916-r1.tar.bz2 274891 BLAKE2B 72b8181424450998164979ab582e8edee6d73b9110b4535e7880d1f7c989bd0ac391422872858da7bad3e3d77516996af93aa2f149f7d4a7f8fd329c481964cf SHA512 fd8259c91cc779301d6e0964827133529a9141dc235301da135210ea4359b800023848a25e33c45678477fa4f54e75da51be9ec85a3bed8b07cf5487e73b84f3 +DIST patchbundle-selinux-base-policy-2.20250213-r1.tar.bz2 276621 BLAKE2B 5a4b0c5fe017fd6c59c3f5d3a1af97e31485bd4325b10a2769883091e5ea6fd205ad42f346c06e6d443aeed9e46bf962febc177f58241c4633058918db6b7fb6 SHA512 1098cfb396d56dfc4f0c2b3ff90dcb9de3bf0b081f1d0c21d793fccc78e48d35a93883bb7fd54a0acd5fa2b06edc8965cbfe72e2b8f3ea325bbee18a8c8e7163 DIST refpolicy-2.20240226.tar.bz2 610561 BLAKE2B 5dc54dcf7238776d4e4b282c1dcbc499f45c0d96676dbf931da39592854034874b5dd6197a2e2776fccec5106d5f245eea3fb9419959bd4d61e9b2c12aeaaa85 SHA512 896a57afb024bd131f25d2831a9a5ac90ee7e5d76b0565bc818c156f6c310d86758bcd4cedbd9df5b29954c9a92a42300d16685a7e07a5efd8f789320724b3f9 DIST refpolicy-2.20240916.tar.bz2 618218 BLAKE2B d86ca75d254eef10f4aa57ef3977825211200cdf1eaa9bf9d416c9a52acee476b3f8719c3b0c8c17fdff2abc0c396989961e37e313a7b3bd3b4b0266a6280e75 SHA512 a8b6c90f8e186796b4c7db1e2d8ed3c3b8690bb5b8f180dcb6d5468ba80467e2969012c4edddf74429c0f5ce900d68fbbc0c2f8e253165af28f93f191039f064 +DIST refpolicy-2.20250213.tar.bz2 627837 BLAKE2B 64d64549bf1fcfc33107e8f4c842af4e3279a856c3a140d05749bae687ffadfe25e4b7383bef3618b13bbd553046d162fcd48b713500d3fd59073b5bece91008 SHA512 cbaf65dfe6d7cc886674bb37160170dac060265d5cf241bfac0c0e5ef45744f057107d81c933f01411c5cd538c95755b7a92331197e2b97b995efc4d6f266895 diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-container/selinux-container-2.20250213-r1.ebuild b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-container/selinux-container-2.20250213-r1.ebuild new file mode 100644 index 0000000000..0dab2f241d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-container/selinux-container-2.20250213-r1.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MODS="container" + +inherit selinux-policy-2 + +DESCRIPTION="SELinux policy for container" + +if [[ ${PV} != 9999* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi From 0e36662dae19318f06fcc243581db741413cf914 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:55 +0000 Subject: [PATCH 093/153] sec-policy/selinux-dbus: Sync with Gentoo It's from Gentoo commit 1d834aa9c6f8d981b720a18aa74907f84e9e27bf. --- .../sec-policy/selinux-dbus/Manifest | 2 ++ .../selinux-dbus/selinux-dbus-2.20250213-r1.ebuild | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sec-policy/selinux-dbus/selinux-dbus-2.20250213-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-dbus/Manifest b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-dbus/Manifest index 5727621b3a..8fe284b304 100644 --- a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-dbus/Manifest +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-dbus/Manifest @@ -1,4 +1,6 @@ DIST patchbundle-selinux-base-policy-2.20240226-r2.tar.bz2 442650 BLAKE2B f2f7c5e4a595afafc072fd78fc4ef3930cf739d05cbe9670f2fb2956fe84e3045518345e103bc3880603d2562f06ba0597fc005d8d394e9f8cd057363f9bf95f SHA512 2cb00d088eebdb098a6496f156eeb3dcee026fc6e53d732bac5bc8a4cfee1ce3bf2bdbbbfbbe9bba237d61c06f299d96bb9d123a57a44aaaa17cc122e15ea268 DIST patchbundle-selinux-base-policy-2.20240916-r1.tar.bz2 274891 BLAKE2B 72b8181424450998164979ab582e8edee6d73b9110b4535e7880d1f7c989bd0ac391422872858da7bad3e3d77516996af93aa2f149f7d4a7f8fd329c481964cf SHA512 fd8259c91cc779301d6e0964827133529a9141dc235301da135210ea4359b800023848a25e33c45678477fa4f54e75da51be9ec85a3bed8b07cf5487e73b84f3 +DIST patchbundle-selinux-base-policy-2.20250213-r1.tar.bz2 276621 BLAKE2B 5a4b0c5fe017fd6c59c3f5d3a1af97e31485bd4325b10a2769883091e5ea6fd205ad42f346c06e6d443aeed9e46bf962febc177f58241c4633058918db6b7fb6 SHA512 1098cfb396d56dfc4f0c2b3ff90dcb9de3bf0b081f1d0c21d793fccc78e48d35a93883bb7fd54a0acd5fa2b06edc8965cbfe72e2b8f3ea325bbee18a8c8e7163 DIST refpolicy-2.20240226.tar.bz2 610561 BLAKE2B 5dc54dcf7238776d4e4b282c1dcbc499f45c0d96676dbf931da39592854034874b5dd6197a2e2776fccec5106d5f245eea3fb9419959bd4d61e9b2c12aeaaa85 SHA512 896a57afb024bd131f25d2831a9a5ac90ee7e5d76b0565bc818c156f6c310d86758bcd4cedbd9df5b29954c9a92a42300d16685a7e07a5efd8f789320724b3f9 DIST refpolicy-2.20240916.tar.bz2 618218 BLAKE2B d86ca75d254eef10f4aa57ef3977825211200cdf1eaa9bf9d416c9a52acee476b3f8719c3b0c8c17fdff2abc0c396989961e37e313a7b3bd3b4b0266a6280e75 SHA512 a8b6c90f8e186796b4c7db1e2d8ed3c3b8690bb5b8f180dcb6d5468ba80467e2969012c4edddf74429c0f5ce900d68fbbc0c2f8e253165af28f93f191039f064 +DIST refpolicy-2.20250213.tar.bz2 627837 BLAKE2B 64d64549bf1fcfc33107e8f4c842af4e3279a856c3a140d05749bae687ffadfe25e4b7383bef3618b13bbd553046d162fcd48b713500d3fd59073b5bece91008 SHA512 cbaf65dfe6d7cc886674bb37160170dac060265d5cf241bfac0c0e5ef45744f057107d81c933f01411c5cd538c95755b7a92331197e2b97b995efc4d6f266895 diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-dbus/selinux-dbus-2.20250213-r1.ebuild b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-dbus/selinux-dbus-2.20250213-r1.ebuild new file mode 100644 index 0000000000..e0ff1dbfee --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-dbus/selinux-dbus-2.20250213-r1.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MODS="dbus" + +inherit selinux-policy-2 + +DESCRIPTION="SELinux policy for dbus" + +if [[ ${PV} != 9999* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi From 1d02373304c16908394fd6e3d129c25daaf75f98 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:55 +0000 Subject: [PATCH 094/153] sec-policy/selinux-policykit: Sync with Gentoo It's from Gentoo commit 1d834aa9c6f8d981b720a18aa74907f84e9e27bf. --- .../sec-policy/selinux-policykit/Manifest | 2 ++ .../selinux-policykit-2.20250213-r1.ebuild | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sec-policy/selinux-policykit/selinux-policykit-2.20250213-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-policykit/Manifest b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-policykit/Manifest index 5727621b3a..8fe284b304 100644 --- a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-policykit/Manifest +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-policykit/Manifest @@ -1,4 +1,6 @@ DIST patchbundle-selinux-base-policy-2.20240226-r2.tar.bz2 442650 BLAKE2B f2f7c5e4a595afafc072fd78fc4ef3930cf739d05cbe9670f2fb2956fe84e3045518345e103bc3880603d2562f06ba0597fc005d8d394e9f8cd057363f9bf95f SHA512 2cb00d088eebdb098a6496f156eeb3dcee026fc6e53d732bac5bc8a4cfee1ce3bf2bdbbbfbbe9bba237d61c06f299d96bb9d123a57a44aaaa17cc122e15ea268 DIST patchbundle-selinux-base-policy-2.20240916-r1.tar.bz2 274891 BLAKE2B 72b8181424450998164979ab582e8edee6d73b9110b4535e7880d1f7c989bd0ac391422872858da7bad3e3d77516996af93aa2f149f7d4a7f8fd329c481964cf SHA512 fd8259c91cc779301d6e0964827133529a9141dc235301da135210ea4359b800023848a25e33c45678477fa4f54e75da51be9ec85a3bed8b07cf5487e73b84f3 +DIST patchbundle-selinux-base-policy-2.20250213-r1.tar.bz2 276621 BLAKE2B 5a4b0c5fe017fd6c59c3f5d3a1af97e31485bd4325b10a2769883091e5ea6fd205ad42f346c06e6d443aeed9e46bf962febc177f58241c4633058918db6b7fb6 SHA512 1098cfb396d56dfc4f0c2b3ff90dcb9de3bf0b081f1d0c21d793fccc78e48d35a93883bb7fd54a0acd5fa2b06edc8965cbfe72e2b8f3ea325bbee18a8c8e7163 DIST refpolicy-2.20240226.tar.bz2 610561 BLAKE2B 5dc54dcf7238776d4e4b282c1dcbc499f45c0d96676dbf931da39592854034874b5dd6197a2e2776fccec5106d5f245eea3fb9419959bd4d61e9b2c12aeaaa85 SHA512 896a57afb024bd131f25d2831a9a5ac90ee7e5d76b0565bc818c156f6c310d86758bcd4cedbd9df5b29954c9a92a42300d16685a7e07a5efd8f789320724b3f9 DIST refpolicy-2.20240916.tar.bz2 618218 BLAKE2B d86ca75d254eef10f4aa57ef3977825211200cdf1eaa9bf9d416c9a52acee476b3f8719c3b0c8c17fdff2abc0c396989961e37e313a7b3bd3b4b0266a6280e75 SHA512 a8b6c90f8e186796b4c7db1e2d8ed3c3b8690bb5b8f180dcb6d5468ba80467e2969012c4edddf74429c0f5ce900d68fbbc0c2f8e253165af28f93f191039f064 +DIST refpolicy-2.20250213.tar.bz2 627837 BLAKE2B 64d64549bf1fcfc33107e8f4c842af4e3279a856c3a140d05749bae687ffadfe25e4b7383bef3618b13bbd553046d162fcd48b713500d3fd59073b5bece91008 SHA512 cbaf65dfe6d7cc886674bb37160170dac060265d5cf241bfac0c0e5ef45744f057107d81c933f01411c5cd538c95755b7a92331197e2b97b995efc4d6f266895 diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-policykit/selinux-policykit-2.20250213-r1.ebuild b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-policykit/selinux-policykit-2.20250213-r1.ebuild new file mode 100644 index 0000000000..d7848bf20f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-policykit/selinux-policykit-2.20250213-r1.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MODS="policykit" + +inherit selinux-policy-2 + +DESCRIPTION="SELinux policy for policykit" + +if [[ ${PV} != 9999* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi From fd85e006d68802ac97221f835e4f0c7e2650a577 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:55 +0000 Subject: [PATCH 095/153] sec-policy/selinux-sssd: Sync with Gentoo It's from Gentoo commit 1d834aa9c6f8d981b720a18aa74907f84e9e27bf. --- .../sec-policy/selinux-sssd/Manifest | 2 ++ .../selinux-sssd/selinux-sssd-2.20250213-r1.ebuild | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sec-policy/selinux-sssd/selinux-sssd-2.20250213-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-sssd/Manifest b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-sssd/Manifest index 5727621b3a..8fe284b304 100644 --- a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-sssd/Manifest +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-sssd/Manifest @@ -1,4 +1,6 @@ DIST patchbundle-selinux-base-policy-2.20240226-r2.tar.bz2 442650 BLAKE2B f2f7c5e4a595afafc072fd78fc4ef3930cf739d05cbe9670f2fb2956fe84e3045518345e103bc3880603d2562f06ba0597fc005d8d394e9f8cd057363f9bf95f SHA512 2cb00d088eebdb098a6496f156eeb3dcee026fc6e53d732bac5bc8a4cfee1ce3bf2bdbbbfbbe9bba237d61c06f299d96bb9d123a57a44aaaa17cc122e15ea268 DIST patchbundle-selinux-base-policy-2.20240916-r1.tar.bz2 274891 BLAKE2B 72b8181424450998164979ab582e8edee6d73b9110b4535e7880d1f7c989bd0ac391422872858da7bad3e3d77516996af93aa2f149f7d4a7f8fd329c481964cf SHA512 fd8259c91cc779301d6e0964827133529a9141dc235301da135210ea4359b800023848a25e33c45678477fa4f54e75da51be9ec85a3bed8b07cf5487e73b84f3 +DIST patchbundle-selinux-base-policy-2.20250213-r1.tar.bz2 276621 BLAKE2B 5a4b0c5fe017fd6c59c3f5d3a1af97e31485bd4325b10a2769883091e5ea6fd205ad42f346c06e6d443aeed9e46bf962febc177f58241c4633058918db6b7fb6 SHA512 1098cfb396d56dfc4f0c2b3ff90dcb9de3bf0b081f1d0c21d793fccc78e48d35a93883bb7fd54a0acd5fa2b06edc8965cbfe72e2b8f3ea325bbee18a8c8e7163 DIST refpolicy-2.20240226.tar.bz2 610561 BLAKE2B 5dc54dcf7238776d4e4b282c1dcbc499f45c0d96676dbf931da39592854034874b5dd6197a2e2776fccec5106d5f245eea3fb9419959bd4d61e9b2c12aeaaa85 SHA512 896a57afb024bd131f25d2831a9a5ac90ee7e5d76b0565bc818c156f6c310d86758bcd4cedbd9df5b29954c9a92a42300d16685a7e07a5efd8f789320724b3f9 DIST refpolicy-2.20240916.tar.bz2 618218 BLAKE2B d86ca75d254eef10f4aa57ef3977825211200cdf1eaa9bf9d416c9a52acee476b3f8719c3b0c8c17fdff2abc0c396989961e37e313a7b3bd3b4b0266a6280e75 SHA512 a8b6c90f8e186796b4c7db1e2d8ed3c3b8690bb5b8f180dcb6d5468ba80467e2969012c4edddf74429c0f5ce900d68fbbc0c2f8e253165af28f93f191039f064 +DIST refpolicy-2.20250213.tar.bz2 627837 BLAKE2B 64d64549bf1fcfc33107e8f4c842af4e3279a856c3a140d05749bae687ffadfe25e4b7383bef3618b13bbd553046d162fcd48b713500d3fd59073b5bece91008 SHA512 cbaf65dfe6d7cc886674bb37160170dac060265d5cf241bfac0c0e5ef45744f057107d81c933f01411c5cd538c95755b7a92331197e2b97b995efc4d6f266895 diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-sssd/selinux-sssd-2.20250213-r1.ebuild b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-sssd/selinux-sssd-2.20250213-r1.ebuild new file mode 100644 index 0000000000..f1497c2bc3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-sssd/selinux-sssd-2.20250213-r1.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MODS="sssd" + +inherit selinux-policy-2 + +DESCRIPTION="SELinux policy for sssd" + +if [[ ${PV} != 9999* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi From fb9b96a5d249b0a91fdcb0875dece7ea48cb4e4b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:56 +0000 Subject: [PATCH 096/153] sec-policy/selinux-unconfined: Sync with Gentoo It's from Gentoo commit 1d834aa9c6f8d981b720a18aa74907f84e9e27bf. --- .../sec-policy/selinux-unconfined/Manifest | 2 ++ .../selinux-unconfined-2.20250213-r1.ebuild | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sec-policy/selinux-unconfined/selinux-unconfined-2.20250213-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-unconfined/Manifest b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-unconfined/Manifest index 5727621b3a..8fe284b304 100644 --- a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-unconfined/Manifest +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-unconfined/Manifest @@ -1,4 +1,6 @@ DIST patchbundle-selinux-base-policy-2.20240226-r2.tar.bz2 442650 BLAKE2B f2f7c5e4a595afafc072fd78fc4ef3930cf739d05cbe9670f2fb2956fe84e3045518345e103bc3880603d2562f06ba0597fc005d8d394e9f8cd057363f9bf95f SHA512 2cb00d088eebdb098a6496f156eeb3dcee026fc6e53d732bac5bc8a4cfee1ce3bf2bdbbbfbbe9bba237d61c06f299d96bb9d123a57a44aaaa17cc122e15ea268 DIST patchbundle-selinux-base-policy-2.20240916-r1.tar.bz2 274891 BLAKE2B 72b8181424450998164979ab582e8edee6d73b9110b4535e7880d1f7c989bd0ac391422872858da7bad3e3d77516996af93aa2f149f7d4a7f8fd329c481964cf SHA512 fd8259c91cc779301d6e0964827133529a9141dc235301da135210ea4359b800023848a25e33c45678477fa4f54e75da51be9ec85a3bed8b07cf5487e73b84f3 +DIST patchbundle-selinux-base-policy-2.20250213-r1.tar.bz2 276621 BLAKE2B 5a4b0c5fe017fd6c59c3f5d3a1af97e31485bd4325b10a2769883091e5ea6fd205ad42f346c06e6d443aeed9e46bf962febc177f58241c4633058918db6b7fb6 SHA512 1098cfb396d56dfc4f0c2b3ff90dcb9de3bf0b081f1d0c21d793fccc78e48d35a93883bb7fd54a0acd5fa2b06edc8965cbfe72e2b8f3ea325bbee18a8c8e7163 DIST refpolicy-2.20240226.tar.bz2 610561 BLAKE2B 5dc54dcf7238776d4e4b282c1dcbc499f45c0d96676dbf931da39592854034874b5dd6197a2e2776fccec5106d5f245eea3fb9419959bd4d61e9b2c12aeaaa85 SHA512 896a57afb024bd131f25d2831a9a5ac90ee7e5d76b0565bc818c156f6c310d86758bcd4cedbd9df5b29954c9a92a42300d16685a7e07a5efd8f789320724b3f9 DIST refpolicy-2.20240916.tar.bz2 618218 BLAKE2B d86ca75d254eef10f4aa57ef3977825211200cdf1eaa9bf9d416c9a52acee476b3f8719c3b0c8c17fdff2abc0c396989961e37e313a7b3bd3b4b0266a6280e75 SHA512 a8b6c90f8e186796b4c7db1e2d8ed3c3b8690bb5b8f180dcb6d5468ba80467e2969012c4edddf74429c0f5ce900d68fbbc0c2f8e253165af28f93f191039f064 +DIST refpolicy-2.20250213.tar.bz2 627837 BLAKE2B 64d64549bf1fcfc33107e8f4c842af4e3279a856c3a140d05749bae687ffadfe25e4b7383bef3618b13bbd553046d162fcd48b713500d3fd59073b5bece91008 SHA512 cbaf65dfe6d7cc886674bb37160170dac060265d5cf241bfac0c0e5ef45744f057107d81c933f01411c5cd538c95755b7a92331197e2b97b995efc4d6f266895 diff --git a/sdk_container/src/third_party/portage-stable/sec-policy/selinux-unconfined/selinux-unconfined-2.20250213-r1.ebuild b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-unconfined/selinux-unconfined-2.20250213-r1.ebuild new file mode 100644 index 0000000000..4cc524e339 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sec-policy/selinux-unconfined/selinux-unconfined-2.20250213-r1.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MODS="unconfined" + +inherit selinux-policy-2 + +DESCRIPTION="SELinux policy for unconfined" + +if [[ ${PV} != 9999* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi From 1579da4a90854cf3f487a3a190701fb945bf6f9f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:58 +0000 Subject: [PATCH 097/153] sys-apps/azure-vm-utils: Sync with Gentoo It's from Gentoo commit d4a88d92495bb58ef463eb15cb2dfe423dbfe84a. --- .../sys-apps/azure-vm-utils/Manifest | 1 + .../azure-vm-utils-0.5.1.ebuild | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/azure-vm-utils/azure-vm-utils-0.5.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/azure-vm-utils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/azure-vm-utils/Manifest index c16b4dadd7..b93af2e035 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/azure-vm-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/azure-vm-utils/Manifest @@ -1 +1,2 @@ DIST azure-vm-utils-0.4.0.tar.gz 15688 BLAKE2B 4a8f5b28a01b3670d81cbc9ae43c24b6177d90ddc3bf6e78a3ccc7406361474d2aa7dce934709fdb73cc0930616475e79ef8484e05bf34354668909e5d8a1c96 SHA512 e97f6de49f0ee9281d17c2be0f4c0e0d86385d113fd514e28fc14f635669a1abdddd83961193941b6969b2b0d41a357e4211357f8c226d84f698166c2eb21b8e +DIST azure-vm-utils-0.5.1.tar.gz 42064 BLAKE2B 3d5f2377f7791cf7c4ba9fbf5d1ef2d300c93b646162cb8f56cafa128a8a9c8eb333c02e61819e44b4063497886fa4426f8bb7d6d4639a02c94408a318798a43 SHA512 875d86536a128b4b5086d6ab3f76190002f29d9489bd31c742129c2e275f587d9b64de178634313fabb60a28ceee8a02307c4ebe9a9d5353c38096830512aa83 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/azure-vm-utils/azure-vm-utils-0.5.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/azure-vm-utils/azure-vm-utils-0.5.1.ebuild new file mode 100644 index 0000000000..c8368ffb68 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/azure-vm-utils/azure-vm-utils-0.5.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake udev + +DESCRIPTION="Utilities and udev rules to support Linux on Azure" +HOMEPAGE="https://github.com/Azure/azure-vm-utils" +SRC_URI="https://github.com/Azure/${PN}/archive/refs/tags/v${PV}/${P}.tar.gz" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( dev-util/cmocka ) +" + +src_configure() { + local mycmakeargs=( + -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d" + -DENABLE_TESTS=$(usex test) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # Remove post-install test that only works on Azure. + rm -v \ + "${ED}"/usr/sbin/azure-vm-utils-selftest \ + "${ED}"/usr/share/man/man*/azure-vm-utils-selftest.* \ + || die +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} From d4156c5f89b06139be8293b3a70d4290e5db85d4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:10:59 +0000 Subject: [PATCH 098/153] sys-apps/checkpolicy: Sync with Gentoo It's from Gentoo commit 4f5ee04d24ed946e39fd989a44be6ba3ced9b10d. --- .../third_party/portage-stable/sys-apps/checkpolicy/Manifest | 2 +- .../{checkpolicy-3.8.ebuild => checkpolicy-3.8.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/{checkpolicy-3.8.ebuild => checkpolicy-3.8.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest index 5367d64bca..f431c93cde 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest @@ -1,3 +1,3 @@ DIST checkpolicy-3.6.tar.gz 70684 BLAKE2B d32a8b86897bd4a08caf61a096a691c8d049fa7b5b4561f4847e0dfbb62a82fc6c3ddb5be163c7cd6163491c50513aec14e4c67842f256f48688b26178c2887a SHA512 0d48fb385b4d1e66d562e40b6e794406f46d8803cc504705b26547130cb13b65fab5fdb4fc032b1c95d4f91862ff134a89fffde854c5ce466c2dd2657e416070 DIST checkpolicy-3.7.tar.gz 74992 BLAKE2B 78f419fa89981ad16364b3d6406e313fda5230588063c9a9dbb70535f0421c5b402b9c86d2f63d4ab7b8119c38044b6dc556fb2dd40240428c914cb25a2facbe SHA512 f428edcbe17bd5b5f22dd827cf21c89c2cf645bae6c0342c6663743cafd9f8a8d7c8b5a1b48c04569fdb0cce11ffcb6c0b6d7fa76075a1a274948ba418bcc5b4 -DIST checkpolicy-3.8.tar.gz 76237 BLAKE2B 1f7315dcc1b216abfe79799beb55cee8fa02ffbe66e386a011f47b31f858cafb21295094a1ce7d1473831fac24499bd8864f76a20502f84d4da9c1f97a8abdab SHA512 644e82a681faa398ee5fa9705ff7213f8105afcf2d6e3e3b5a593eeb300fa0b5d38a8188e28bb1e33ff41b9162f4131d5dd5359a13278acda8307f779b0cd9e9 +DIST checkpolicy-3.8.1.tar.gz 76246 BLAKE2B 19933bc46dfa9cdca6996ac49da2054aec5a4a565d0f71d69c2f05be725b73c7b355019c083bb7624b574d091cb61a123d55b0a904d561a59336059d0d2216c1 SHA512 279f4ebcaf8a62dca5c09c46989c76c34c83f3925b49e64c4a055f1b60795d7c732fbae272975eef654ec02a352b35a2eb8390d55c99789dffdf982ded7b210f diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.8.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.8.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.8.1.ebuild From 2faaf4ed4d71daa015cc354e7fda4e6cde20f21a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:02 +0000 Subject: [PATCH 099/153] sys-apps/diffutils: Sync with Gentoo It's from Gentoo commit 277ce2dbccc1a02ddf2676c0ce4c39683b49de2f. --- .../diffutils/diffutils-3.11-r2.ebuild | 67 +++++++++++++++ .../diffutils-3.11-allocation-crash.patch | 29 +++++++ .../files/diffutils-3.11-empty-files.patch | 83 +++++++++++++++++++ .../files/diffutils-3.11-tests-seq.patch | 64 ++++++++++++++ 4 files changed, 243 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.11-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-allocation-crash.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-empty-files.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-tests-seq.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.11-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.11-r2.ebuild new file mode 100644 index 0000000000..22e8514a4f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.11-r2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/diffutils.asc +inherit verify-sig + +DESCRIPTION="Tools to make diffs and compare files" +HOMEPAGE="https://www.gnu.org/software/diffutils/" + +if [[ ${PV} == *_p* ]] ; then + # Subscribe to the 'platform-testers' ML to find these. + # Useful to test on our especially more niche arches and report issues upstream. + MY_COMMIT="242-d65b" + MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT} + SRC_URI="https://meyering.net/diff/${MY_P}.tar.xz" + SRC_URI+=" verify-sig? ( https://meyering.net/diff/${MY_P}.tar.xz.sig )" + S="${WORKDIR}"/${MY_P} +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls" + +BDEPEND=" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-diffutils ) +" +RDEPEND=" + nls? ( app-i18n/gnulib-l10n ) +" + +PATCHES=( + "${FILESDIR}"/${P}-empty-files.patch + "${FILESDIR}"/${P}-tests-seq.patch + "${FILESDIR}"/${P}-allocation-crash.patch +) + +src_prepare() { + default + + # Needed because of ${P}-diff-D-option-regression.patch + #touch man/diff.1 || die +} + +src_configure() { + # Disable automagic dependency over libsigsegv; see bug #312351. + export ac_cv_libsigsegv=no + + # required for >=glibc-2.26, bug #653914 + 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/" + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-allocation-crash.patch b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-allocation-crash.patch new file mode 100644 index 0000000000..3f80cd7e7c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-allocation-crash.patch @@ -0,0 +1,29 @@ +https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=e9f8e6a439fd607adbdd846ab93267dc367b5c79 + +From e9f8e6a439fd607adbdd846ab93267dc367b5c79 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 28 Feb 2025 22:53:28 -0800 +Subject: diff: fix allocation typo leading to crashes + +But reported by Nick Smallbone, with one-line fix by +Collin Funk . +* src/io.c (find_and_hash_each_line): Fix size computation. +--- + src/io.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +--- a/src/io.c ++++ b/src/io.c +@@ -1012,7 +1012,7 @@ find_and_hash_each_line (struct file_data *current) + linbuf += linbuf_base; + linbuf = xpalloc (linbuf, &n, 1, -1, sizeof *linbuf); + linbuf -= linbuf_base; +- alloc_lines = n - linbuf_base; ++ alloc_lines = linbuf_base + n; + } + linbuf[line] = p; + +-- +cgit v1.1 + + diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-empty-files.patch b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-empty-files.patch new file mode 100644 index 0000000000..1f78bce8d9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-empty-files.patch @@ -0,0 +1,83 @@ +https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=6ce0ebd033c395265c262ae3aab6477a49d4c2f1 + +From 6ce0ebd033c395265c262ae3aab6477a49d4c2f1 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 20 Feb 2025 21:59:55 -0800 +Subject: diff: don't treat empty files as a different file type + +Reported by Kate Deplaix in +. + +* src/diff.c (compare_prepped_files): Don't rely on string +file type, as that might not agree with our idea of a file type. +--- + src/diff.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/diff.c b/src/diff.c +index fa6100e..6e1bbc5 100644 +--- a/src/diff.c ++++ b/src/diff.c +@@ -1223,14 +1223,14 @@ compare_prepped_files (struct comparison const *parent, + the type is unusual, then simply report their type. + However, at the top level do this only if one file is a symlink + and the other is not. */ +- if (toplevel +- ? (!S_ISLNK (cmp->file[0].stat.st_mode) +- != !S_ISLNK (cmp->file[1].stat.st_mode)) +- : (cmp->file[0].filetype != cmp->file[1].filetype +- || ! (S_ISREG (cmp->file[0].stat.st_mode) +- || S_ISLNK (cmp->file[0].stat.st_mode) +- || S_ISCHR (cmp->file[0].stat.st_mode) +- || S_ISBLK (cmp->file[0].stat.st_mode)))) ++ mode_t mode0 = cmp->file[0].stat.st_mode; ++ mode_t mode1 = cmp->file[1].stat.st_mode; ++ if (toplevel ? !S_ISLNK (mode0) != !S_ISLNK (mode1) ++ : S_ISREG (mode0) ? !S_ISREG (mode1) ++ : S_ISLNK (mode0) ? !S_ISLNK (mode1) ++ : S_ISCHR (mode0) ? !S_ISCHR (mode1) ++ : S_ISBLK (mode0) ? !S_ISBLK (mode1) ++ : true) + { + /* POSIX 1003.1-2017 says any message will do, so long as it + contains the file names. */ +@@ -1244,7 +1244,7 @@ compare_prepped_files (struct comparison const *parent, + } + + /* If both files are symlinks, compare symlink contents. */ +- if (S_ISLNK (cmp->file[0].stat.st_mode)) ++ if (S_ISLNK (mode0)) + { + /* We get here only if we are not dereferencing symlinks. */ + dassert (no_dereference_symlinks); +@@ -1295,7 +1295,7 @@ compare_prepped_files (struct comparison const *parent, + and report file types of all other non-regular files. + POSIX 1003.1-2017 says any message will do, + so long as it contains the file names. */ +- if (!toplevel && !S_ISREG (cmp->file[0].stat.st_mode)) ++ if (!toplevel && !S_ISREG (mode0)) + { + if (cmp->file[0].stat.st_rdev == cmp->file[1].stat.st_rdev) + return EXIT_SUCCESS; +@@ -1311,7 +1311,7 @@ compare_prepped_files (struct comparison const *parent, + for (int i = 0; i < n_num; i++) + sprintf (numbuf[i], "%"PRIdMAX, num[i]); + +- message ((S_ISCHR (cmp->file[0].stat.st_mode) ++ message ((S_ISCHR (mode0) + ? ("Character special files %s (%s, %s)" + " and %s (%s, %s) differ\n") + : ("Block special files %s (%s, %s)" +@@ -1323,8 +1323,8 @@ compare_prepped_files (struct comparison const *parent, + } + + if (files_can_be_treated_as_binary +- && S_ISREG (cmp->file[0].stat.st_mode) +- && S_ISREG (cmp->file[1].stat.st_mode) ++ && S_ISREG (mode0) ++ && S_ISREG (mode1) + && cmp->file[0].stat.st_size != cmp->file[1].stat.st_size + && 0 <= cmp->file[0].stat.st_size + && 0 <= cmp->file[1].stat.st_size) +-- +cgit v1.1 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-tests-seq.patch b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-tests-seq.patch new file mode 100644 index 0000000000..407b76ac05 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.11-tests-seq.patch @@ -0,0 +1,64 @@ +https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=58e734dedd2ed84b559c313b4fbe8e2a1b987a1d + +From 58e734dedd2ed84b559c313b4fbe8e2a1b987a1d Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 28 Feb 2025 14:32:44 -0800 +Subject: tests: make seq replacement more available +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This refactoring should let other future tests use ‘seq’. +* tests/diff3 (seq): Move from here ... +* tests/init.cfg: ... to here. +--- + tests/diff3 | 12 ------------ + tests/init.cfg | 12 ++++++++++++ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/tests/diff3 b/tests/diff3 +index e468243..c2079ec 100644 +--- a/tests/diff3 ++++ b/tests/diff3 +@@ -3,18 +3,6 @@ + + . "${srcdir=.}/init.sh"; path_prepend_ ../src + +-# Some systems lack seq. +-# A limited replacement for seq: handle 1 or 2 args; increment must be 1 +-seq() +-{ +- case $# in +- 1) start=1 final=$1;; +- 2) start=$1 final=$2;; +- *) echo you lose 1>&2; exit 1;; +- esac +- awk 'BEGIN{for(i='$start';i<='$final';i++) print i}' < /dev/null +-} +- + echo a > a || framework_failure_ + echo b > b || framework_failure_ + echo c > c || framework_failure_ +diff --git a/tests/init.cfg b/tests/init.cfg +index 8b3b107..66c26d6 100644 +--- a/tests/init.cfg ++++ b/tests/init.cfg +@@ -120,4 +120,16 @@ require_utf8_locale_() + test $found_working_tr = 1 || skip_ "failed to find a working tr program" + } + ++# Some systems lack seq. ++# A limited replacement for seq: handle 1 or 2 args; increment must be 1 ++seq() ++{ ++ case $# in ++ 1) start=1 final=$1;; ++ 2) start=$1 final=$2;; ++ *) echo you lose 1>&2; exit 1;; ++ esac ++ awk 'BEGIN{for(i='$start';i<='$final';i++) print i}' < /dev/null ++} ++ + sanitize_path_ +-- +cgit v1.1 From b3766136504b66972512056eff3ba102015c063b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:03 +0000 Subject: [PATCH 100/153] sys-apps/ethtool: Sync with Gentoo It's from Gentoo commit 30ccc92ff4097adb584be1e08209f5dcde6aaea9. --- .../portage-stable/sys-apps/ethtool/Manifest | 3 +-- ...ethtool-6.6.ebuild => ethtool-6.11.ebuild} | 4 ++-- .../sys-apps/ethtool/ethtool-6.7.ebuild | 24 ------------------- 3 files changed, 3 insertions(+), 28 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-apps/ethtool/{ethtool-6.6.ebuild => ethtool-6.11.ebuild} (80%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/Manifest index 00f03ac9bb..1e5bccd6a8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/Manifest @@ -1,4 +1,3 @@ DIST ethtool-6.10.tar.xz 360300 BLAKE2B 530ec7fc00a6f88173d403ce0288cbdc7610997feb58bc05b88a87d8606827b8b8e4ce715099f5a6d90257b8e6463ddd259f06f4b0ce9206b2d4742795b86fb1 SHA512 1b6a0f5d2b89de57d1f003779557f2be786e26660ec430e80a966ad047f2fe1fe41bb573738b93454f32cf9089000ae879fc7feba0532bb559636a301ea61b10 -DIST ethtool-6.6.tar.xz 352476 BLAKE2B dfbc5f9a6ac63210d1ae305c2458cc44d38d44fcc272c9b0397a13a93e0aa0a09e3750e330a27dcf4dce796c6bd302c4d4c1fd91faab824a81949c31f1ed3504 SHA512 1e7eae3abe59e6af4bce0ebedd0a7ea84d1b0adc7693a0f03021c4096677096a022fdae521ac02413f9db46ee232b89dd2015a116845aa6ca7686fdda50a5b21 -DIST ethtool-6.7.tar.xz 352772 BLAKE2B 94a6fd8d29ff479eb894fe56bf991f522fff9af5a94c176d06be2819fe2520125cb48dbded229df1a9f5a0308aeaec503c55caf5d248eef87640c7f90f1132ec SHA512 07d13f9a8f980dab73c07e7c68179cfee272f53103c6dfbce1814b768e3313dc671a0cbefc63d4d53a616876bc1f96db8db2444617e4d58d741fae3acf0be524 +DIST ethtool-6.11.tar.xz 364148 BLAKE2B 589a7d7be3d251f72bd0a5b56cf33fbe94c95beff565194e784672984340321bec51f2d2383b03f8a8fe9161c4add381d210bd9a4ce58f048238d1413b194429 SHA512 77f649e1082a164e3627bcb21db1215a89d9a0e984f86516bb05879685aee76b034f6a9e19a499dcdd82883fa003f628b70d27ca8272064df27fe9de67c7a9a7 DIST ethtool-6.9.tar.xz 358640 BLAKE2B e04fa530084ad14abfea8c3802f272eb61eae9ee07aa2a12d16eeb77708b5ab021f1cdee10c24f83f77d65f2740ba5aceda99c21c47ef6cbcd65834af8334b00 SHA512 bc7e56a1a27a0679119491d6fce076e68374cf47a86fa4c0533851df0aa737cb9139920a9f3f3733deca672923d01bbb579f3d79bd17a2c6738f9f93aa469570 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.11.ebuild similarity index 80% rename from sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.6.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.11.ebuild index cd0bd783b1..92aba5ab4b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="+netlink" RDEPEND="netlink? ( net-libs/libmnl )" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.7.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.7.ebuild deleted file mode 100644 index cd0bd783b1..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.7.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces" -HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/" -SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="+netlink" - -RDEPEND="netlink? ( net-libs/libmnl )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - netlink? ( virtual/pkgconfig ) -" - -src_configure() { - econf $(use_enable netlink) -} From 2455a11a7f3df570e0f13a15080a8aac5b6aeeee Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:03 +0000 Subject: [PATCH 101/153] sys-apps/findutils: Sync with Gentoo It's from Gentoo commit 0c4285cccb9d003f2b38fbf1aedea5afe35232df. --- .../sys-apps/findutils/Manifest | 2 - .../files/findutils-4.9.0-dash-tests.patch | 41 ------- .../findutils/findutils-4.9.0-r2.ebuild | 101 ------------------ 3 files changed, 144 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.9.0-dash-tests.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.9.0-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/Manifest index 7156f51562..de22610004 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/Manifest @@ -1,4 +1,2 @@ DIST findutils-4.10.0.tar.xz 2240712 BLAKE2B 2eebdcb425c04170d17afb80e7270ba095bd691660d961dcfa731141633d3bb597d0b47d69ed17e891ef884a36d4c232885097e45b41d3d3ac79dbeae6ee2282 SHA512 b8b683d21cd26c6da4f41c56e83cadbda4780f8610a2bbd4b4e34bb1f339c3209721974b03e076d5eef0331fd876d947b398197aad37c29bbcc2e0405c641b34 DIST findutils-4.10.0.tar.xz.sig 488 BLAKE2B fadd7dbf80a52965d6da641bda21ce00790623cf2c959ed03c1193a22c19f30417733511a739edcb1a0a97892a1257e0e88e32d872f94e71e3ade04776337d3c SHA512 a835153a0671309021be187bf78afee58d9682acb40545aaa9dd187f0ebdea0cfa5583bd03f363243633ea056ddb0a7a6603987ab5e34a608426cb4265ac6d8f -DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9 -DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.9.0-dash-tests.patch b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.9.0-dash-tests.patch deleted file mode 100644 index 5bbc632e77..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/files/findutils-4.9.0-dash-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://git.savannah.gnu.org/cgit/findutils.git/commit/?id=a5b2e20d8 - -From a5b2e20d8f93e96817e00af6dd0a4c914580e8a2 Mon Sep 17 00:00:00 2001 -From: Bernhard Voelker -Date: Tue, 23 May 2023 01:57:47 +0200 -Subject: tests: fix FP in xargs test when /bin/sh is dash - -Dash as /bin/sh apparently does not know $'\n' syntax. - -* tests/xargs/verbose-quote.sh: Define NL variable for newline character; -change from $'\n' syntax to the above variable when generating input -for xargs. - -Fixes https://sv.gnu.org/bugs/?63934 ---- - tests/xargs/verbose-quote.sh | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tests/xargs/verbose-quote.sh b/tests/xargs/verbose-quote.sh -index d25f7db..e3607ce 100755 ---- a/tests/xargs/verbose-quote.sh -+++ b/tests/xargs/verbose-quote.sh -@@ -28,12 +28,15 @@ printf "%s\n" \ - || framework_failure_ - - # Run xargs with -t for verious commands which require quoting. -+# (Use NL because dash as /bin/sh does not know $'\n' syntax.) -+nl=' -+' - printf '%s\0' \ - 000 \ - '10 0' \ - '20"0' \ - "30'0" \ -- 40$'\n'0 \ -+ "40${nl}0" \ - | xargs -0t '-I{}' './my command' 'hel lo' '{}' world > out 2> err \ - || fail=1 - --- -cgit v1.1 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.9.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.9.0-r2.ebuild deleted file mode 100644 index a60d70345f..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.9.0-r2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/findutils.asc -inherit flag-o-matic python-any-r1 verify-sig - -DESCRIPTION="GNU utilities for finding files" -HOMEPAGE="https://www.gnu.org/software/findutils/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" -SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="nls selinux static test" -RESTRICT="!test? ( test )" - -RDEPEND=" - selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) - test? ( - ${PYTHON_DEPS} - dev-util/dejagnu - ) - verify-sig? ( sec-keys/openpgp-keys-findutils ) -" - -PATCHES=( - "${FILESDIR}"/${P}-dash-tests.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # Don't build or install locate because it conflicts with mlocate, - # which is a secure version of locate. See bug 18729 - sed \ - -e '/^SUBDIRS/s@locate@@' \ - -e '/^built_programs/s@ frcode locate updatedb@@' \ - -i Makefile.in || die - - default -} - -src_configure() { - if use static; then - append-flags -pthread - append-ldflags -static - fi - - append-lfs-flags - - if [[ ${CHOST} == *-darwin* ]] ; then - # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html - # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html - append-cppflags '-D__nonnull\(X\)=' - fi - - local myeconfargs=( - --with-packager="Gentoo" - --with-packager-version="${PVR}" - --with-packager-bug-reports="https://bugs.gentoo.org/" - $(use_enable nls) - $(use_with selinux) - --libexecdir='$(libdir)'/find - # rename to gfind, gxargs for better BSD compatibility - --program-prefix=g - ) - econf "${myeconfargs[@]}" -} - -src_test() { - local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} - addpredict / - default -} - -src_compile() { - # We don't build locate, but the docs want a file in there. - emake -C locate dblocation.texi - default -} - -src_install() { - default - - # symlink to the standard names - dosym gfind /usr/bin/find - dosym gxargs /usr/bin/xargs - dosym gfind.1 /usr/share/man/man1/find.1 - dosym gxargs.1 /usr/share/man/man1/xargs.1 -} From 8712bc1071266bb6c704a3a149d9e3b496a7a1a6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:06 +0000 Subject: [PATCH 102/153] sys-apps/grep: Sync with Gentoo It's from Gentoo commit 0b60a8b0c3a029d3a894a3073c7f2f0e4886625b. --- .../sys-apps/grep/grep-3.11.ebuild | 115 ------------------ 1 file changed, 115 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/grep/grep-3.11.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/grep/grep-3.11.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/grep/grep-3.11.ebuild deleted file mode 100644 index d5a615b662..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/grep/grep-3.11.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/grep.asc -inherit flag-o-matic verify-sig - -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="https://www.gnu.org/software/grep/" - -if [[ ${PV} == *_p* ]] ; then - # Subscribe to the 'platform-testers' ML to find these. - # Useful to test on our especially more niche arches and report issues upstream. - MY_COMMIT="19-2ea9" - MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT} - SRC_URI="https://meyering.net/${PN}/${MY_P}.tar.xz" - SRC_URI+=" verify-sig? ( https://meyering.net/${PN}/${MY_P}.tar.xz.sig )" - S="${WORKDIR}"/${MY_P} -else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="+egrep-fgrep nls pcre static" - -# We lack dev-libs/libsigsegv[static-libs] for now -REQUIRED_USE="static? ( !sparc )" - -LIB_DEPEND=" - pcre? ( >=dev-libs/libpcre2-10.42-r1[static-libs(+)] ) - sparc? ( dev-libs/libsigsegv ) -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - nls? ( virtual/libintl ) - virtual/libiconv -" -DEPEND=" - ${RDEPEND} - static? ( ${LIB_DEPEND} ) -" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-grep ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -QA_CONFIG_IMPL_DECL_SKIP=( - # Either gnulib FPs or fixed in newer autoconf, not worth autoreconf here for now? - MIN - alignof - static_assert -) - -src_prepare() { - default - - # bug #523898 - sed -i \ - -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ - -e "s:@grep@:${EPREFIX}/bin/grep:" \ - src/egrep.sh || die -} - -src_configure() { - use static && append-ldflags -static - - # We used to turn this off unconditionally (bug #673524) but we now - # allow it for cases where libsigsegv is better for userspace handling - # of stack overflows. - # In particular, it's necessary for sparc: bug #768135 - export ac_cv_libsigsegv=$(usex sparc) - - local myeconfargs=( - --bindir="${EPREFIX}"/bin - $(use_enable nls) - $(use_enable pcre perl-regexp) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use egrep-fgrep ; then - # Delete the upstream wrapper variants which warn on egrep+fgrep use - rm "${ED}"/bin/{egrep,fgrep} || die - - into / - # Install egrep, fgrep which don't warn. - # - # We do this by default to avoid breakage in old scripts - # and such which don't expect unexpected output on stderr, - # we've had examples of builds failing because foo-config - # starts returning a warning. - # - # https://lists.gnu.org/archive/html/bug-grep/2022-10/msg00000.html - newbin - egrep <<-EOF - #!/usr/bin/env sh - exec "${EPREFIX}/bin/grep" -E "\$@" - EOF - - newbin - fgrep <<-EOF - #!/usr/bin/env sh - exec "${EPREFIX}/bin/grep" -F "\$@" - EOF - fi -} From 498cada03d9e659c386d294b0a83ac534fc9d23e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:10 +0000 Subject: [PATCH 103/153] sys-apps/i2c-tools: Sync with Gentoo It's from Gentoo commit aec83a289d6eec66c75f4025aa639f389951c6dc. --- .../portage-stable/sys-apps/i2c-tools/i2c-tools-4.3-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.3-r2.ebuild index 2778bf9c78..f9d447189b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.3-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/i2c-tools/i2c-tools-4.3-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_OPTIONAL=1 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools From b5e8f2e569d196711bd4a7f2056efef0021905e1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:10 +0000 Subject: [PATCH 104/153] sys-apps/iproute2: Sync with Gentoo It's from Gentoo commit d046371cedce6121f2ece89f5b00317b6a06fb28. --- .../portage-stable/sys-apps/iproute2/iproute2-6.13.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.13.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.13.0.ebuild index dcaf60620f..286b0dd423 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.13.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.13.0.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="kernel routing and traffic control utilities" From 9b944d3d775121da074759ac18dccddd44067f01 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:16 +0000 Subject: [PATCH 105/153] sys-apps/kbd: Sync with Gentoo It's from Gentoo commit 6c524caa9cbd17539609fafad0dea64b3068d6ce. --- .../third_party/portage-stable/sys-apps/kbd/kbd-2.7.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.7.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.7.1.ebuild index 4219f7a4a0..10d782e933 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.7.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.7.1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" From 89c2e0691aa3a266ad2f404e0bac895ad8b71754 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:16 +0000 Subject: [PATCH 106/153] sys-apps/kmod: Sync with Gentoo It's from Gentoo commit 60f73e347fd6815fea01d4f6fe841dc60ab86e55. --- .../portage-stable/sys-apps/kmod/Manifest | 1 - .../kmod/files/kmod-31-musl-basename.patch | 113 ------------- .../sys-apps/kmod/kmod-32-r2.ebuild | 149 ------------------ 3 files changed, 263 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-31-musl-basename.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-32-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest index 3f2f5cc1ff..e6c3dab071 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/Manifest @@ -1,2 +1 @@ -DIST kmod-32.tar.xz 511988 BLAKE2B 5b5dac4639406549b23bb1da44bedd86a42885304ef4c7c67344dc8fd70b9e0ca3f83d033c6b80f6e00371d7188e205f4b68fadc56a9ddbf9d6a9d28e9b1e9a4 SHA512 29162135aabd025dff178a4147a754b5da5964855dbeee65ca867dec3b84437f35c1c97f0f027e974a021d3ee9a4940309a716859cc3cfe93c7ed0aada338f24 DIST kmod-33.tar.xz 514428 BLAKE2B 5fb4ea9d96217f8c94cba752b07a1b53228c6ae79dbaa605030cd84e3c6ca8d9c1a703a0253cea1d6c78a78f1507e2a1d9c6215d28dcb01b9e7f8b98a9fde425 SHA512 32d79d0bb7e89012f18458d4e88325f8e19a7dba6e1d5cff01aec3e618d1757b0f7c119735bf38d02e0d056a14273fd7522fca7c61a4d12a3ea5854bb662fff8 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-31-musl-basename.patch b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-31-musl-basename.patch deleted file mode 100644 index f4839dad24..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/files/kmod-31-musl-basename.patch +++ /dev/null @@ -1,113 +0,0 @@ -https://github.com/kmod-project/kmod/pull/32 - -From 721ed6040c7aa47070faf6378c433089e178bd43 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 9 Dec 2023 17:35:59 -0800 -Subject: [PATCH] Use portable implementation for basename API - -musl has removed the non-prototype declaration of basename from -string.h [1] which now results in build errors with clang-17+ compiler - -Implement GNU basename behavior using strchr which is portable across libcs - -Fixes -../git/tools/kmod.c:71:19: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] -71 | "Commands:\n", basename(argv[0])); -| ^ - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Suggested-by: Rich Felker - -Signed-off-by: Khem Raj ---- a/libkmod/libkmod-config.c -+++ b/libkmod/libkmod-config.c -@@ -794,7 +794,7 @@ static int conf_files_insert_sorted(struct kmod_ctx *ctx, - bool is_single = false; - - if (name == NULL) { -- name = basename(path); -+ name = gnu_basename(path); - is_single = true; - } - ---- a/shared/util.c -+++ b/shared/util.c -@@ -172,9 +172,9 @@ char *modname_normalize(const char *modname, char buf[static PATH_MAX], size_t * - - char *path_to_modname(const char *path, char buf[static PATH_MAX], size_t *len) - { -- char *modname; -+ const char *modname; - -- modname = basename(path); -+ modname = gnu_basename(path); - if (modname == NULL || modname[0] == '\0') - return NULL; - ---- a/shared/util.h -+++ b/shared/util.h -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -76,6 +77,12 @@ do { \ - __p->__v = (val); \ - } while(0) - -+static _always_inline_ const char *gnu_basename(const char *s) -+{ -+ const char *p = strrchr(s, '/'); -+ return p ? p+1 : s; -+} -+ - static _always_inline_ unsigned int ALIGN_POWER2(unsigned int u) - { - return 1 << ((sizeof(u) * 8) - __builtin_clz(u - 1)); ---- a/testsuite/testsuite.c -+++ b/testsuite/testsuite.c -@@ -70,7 +70,7 @@ static void help(void) - - printf("Usage:\n" - "\t%s [options] \n" -- "Options:\n", basename(progname)); -+ "Options:\n", gnu_basename(progname)); - - for (itr = options, itr_short = options_short; - itr->name != NULL; itr++, itr_short++) ---- a/tools/depmod.c -+++ b/tools/depmod.c -@@ -762,7 +762,7 @@ static int cfg_files_insert_sorted(struct cfg_file ***p_files, size_t *p_n_files - if (name != NULL) - namelen = strlen(name); - else { -- name = basename(dir); -+ name = gnu_basename(dir); - namelen = strlen(name); - dirlen -= namelen + 1; - } ---- a/tools/kmod.c -+++ b/tools/kmod.c -@@ -68,7 +68,7 @@ static int kmod_help(int argc, char *argv[]) - "Options:\n" - "\t-V, --version show version\n" - "\t-h, --help show this help\n\n" -- "Commands:\n", basename(argv[0])); -+ "Commands:\n", gnu_basename(argv[0])); - - for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) { - if (kmod_cmds[i]->help != NULL) { -@@ -156,7 +156,7 @@ static int handle_kmod_compat_commands(int argc, char *argv[]) - const char *cmd; - size_t i; - -- cmd = basename(argv[0]); -+ cmd = gnu_basename(argv[0]); - - for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) { - if (streq(kmod_compat_cmds[i]->name, cmd)) - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-32-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-32-r2.ebuild deleted file mode 100644 index ba1675a4d3..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-32-r2.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools libtool bash-completion-r1 - -DESCRIPTION="Library and tools for managing linux kernel modules" -HOMEPAGE="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git" - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc +lzma pkcs7 static-libs +tools +zlib +zstd" - -# Upstream does not support running the test suite with custom configure flags. -# I was also told that the test suite is intended for kmod developers. -# So we have to restrict it. -# See bug #408915. -#RESTRICT="test" - -# - >=zlib-1.2.6 required because of bug #427130 -# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch -# - >=zstd-1.5.2-r1 required for bug #771078 -RDEPEND=" - !sys-apps/module-init-tools - !sys-apps/modutils - !=app-arch/xz-utils-5.0.4-r1 ) - pkcs7? ( >=dev-libs/openssl-1.1.0:= ) - zlib? ( >=sys-libs/zlib-1.2.6 ) - zstd? ( >=app-arch/zstd-1.5.2-r1:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-util/gtk-doc - dev-build/gtk-doc-am - ) - lzma? ( virtual/pkgconfig ) - zlib? ( virtual/pkgconfig ) -" -if [[ ${PV} == 9999* ]]; then - BDEPEND+=" dev-libs/libxslt" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-31-musl-basename.patch -) - -src_prepare() { - default - - if [[ ! -e configure ]] || use doc ; then - if use doc; then - cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die - gtkdocize --copy --docdir libkmod/docs || die - else - touch libkmod/docs/gtk-doc.make - fi - eautoreconf - else - elibtoolize - fi - - # Restore possibility of running --enable-static, bug #472608 - sed -i \ - -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ - configure || die -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --enable-shared - --with-bashcompletiondir="$(get_bashcompdir)" - $(use_enable debug) - $(usev doc '--enable-gtk-doc') - $(use_enable static-libs static) - $(use_enable tools) - $(use_with lzma xz) - $(use_with pkcs7 openssl) - $(use_with zlib) - $(use_with zstd) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${ED}" -type f -name "*.la" -delete || die - - if use tools; then - local cmd - for cmd in depmod insmod modprobe rmmod; do - rm "${ED}"/bin/${cmd} || die - dosym ../bin/kmod /sbin/${cmd} - done - fi - - cat <<-EOF > "${T}"/usb-load-ehci-first.conf - softdep uhci_hcd pre: ehci_hcd - softdep ohci_hcd pre: ehci_hcd - EOF - - insinto /lib/modprobe.d - # bug #260139 - doins "${T}"/usb-load-ehci-first.conf - - newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes -} - -pkg_postinst() { - if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then - ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT}"/etc/runlevels/boot/static-nodes - fi - - # Add kmod to the runlevel automatically if this is the first install of this package. - if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT}"/etc/runlevels/sysinit - fi - if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes - fi - fi - - if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then - if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then - ewarn - ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" - ewarn "kernel modules to have required static nodes!" - ewarn "Run this command:" - ewarn "\trc-update add kmod-static-nodes sysinit" - fi - fi -} From 077fd326c6b7ab6cfe6fd366f620c516bc87fa46 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:22 +0000 Subject: [PATCH 107/153] sys-apps/man-db: Sync with Gentoo It's from Gentoo commit ad1694b519e8a735929503c3061baa63442a6a37. --- .../portage-stable/sys-apps/man-db/Manifest | 1 - .../sys-apps/man-db/man-db-2.12.1.ebuild | 211 ------------------ 2 files changed, 212 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.12.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/Manifest index ca248693ee..e931cd39b1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/Manifest @@ -1,2 +1 @@ -DIST man-db-2.12.1.tar.xz 2041380 BLAKE2B b06c48431608cf798659d19df754d992dca8ba31842613a3326e376e80fe74d913146f45a7f3c5e70c421a2401aeabdb091de78ebb3102b9d70c194286c245a7 SHA512 0f79f4205ce116c3148dc6caf561c1b7d793aac234188ef8edd1b1f5aaaebcca32c65ef403dff65896920535077fb63ddc2e9cb293efdb6ef3037c33916aa329 DIST man-db-2.13.0.tar.xz 2071032 BLAKE2B 7ce91a7abc6d3bbd92d4707f13caacd8ab5caee0502a2b115f8aa53f4d38df05b0e03346f70584618cce6f5457113e826828a02b847bff57abd6ba6ec1b2d407 SHA512 612ce39bb1e11aa7797e8e3a26f06a7154c48a13b2d74217c2c6701e0d33fa8f77ae2b8c9ee84353e364d16918f884115f2dfbf3cd743edd4ed32b763b87f723 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.12.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.12.1.ebuild deleted file mode 100644 index 031cd6f98a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-db/man-db-2.12.1.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd prefix tmpfiles - -DESCRIPTION="A man replacement that utilizes dbm instead of flat files" -HOMEPAGE="https://gitlab.com/man-db/man-db https://www.nongnu.org/man-db/" -if [[ ${PV} == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitlab.com/man-db/man-db" -else - inherit libtool - # TODO: Change tarballs to gitlab too...? - SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="+manpager nls +seccomp selinux static-libs zlib" - -CDEPEND=" - >=dev-libs/libpipeline-1.5.0 - sys-apps/groff - sys-libs/gdbm:= - seccomp? ( sys-libs/libseccomp ) - zlib? ( sys-libs/zlib )" -DEPEND="${CDEPEND}" -BDEPEND="app-arch/xz-utils - virtual/pkgconfig - nls? ( - >=app-text/po4a-0.45 - sys-devel/gettext - virtual/libiconv - virtual/libintl - )" -RDEPEND="${CDEPEND} - acct-group/man - acct-user/man - selinux? ( sec-policy/selinux-mandb )" -PDEPEND="manpager? ( app-text/manpager )" - -PATCHES=( - "${FILESDIR}"/man-db-2.9.3-sandbox-env-tests.patch -) - -QA_CONFIG_IMPL_DECL_SKIP=( - # gnulib FPs - unreachable MIN alignof static_assert -) - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - git-r3_src_unpack - - # We need to mess with gnulib - EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \ - EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \ - git-r3_src_unpack - else - default - fi -} - -src_prepare() { - default - - if [[ ${PV} == *9999 ]] ; then - local bootstrap_opts=( - --gnulib-srcdir=../gnulib - --no-bootstrap-sync - --copy - --no-git - ) - AUTORECONF="/bin/true" \ - LIBTOOLIZE="/bin/true" \ - sh ./bootstrap "${bootstrap_opts[@]}" || die - - eautoreconf - else - elibtoolize - fi - - hprefixify src/man_db.conf.in - if use prefix ; then - { - echo "#" - echo "# Added settings for Gentoo Prefix" - [[ ${CHOST} == *-darwin* ]] && \ - echo "MANDATORY_MANPATH ${EPREFIX}/MacOSX.sdk/usr/share/man" - echo "MANDATORY_MANPATH /usr/share/man" - } >> src/man_db.conf.in - fi -} - -src_configure() { - # Set sections we want to search by default - local sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o" - sections+=" 1x 2x 3x 4x 5x 6x 7x 8x" - case ${CHOST} in - *-solaris*) - # Solaris tends to use sections named after the pkgs that - # owns them, in particular for libc functions we want those - # sections - local s - for s in $(cd /usr/share/man/ && echo man*) ; do - s=${s#man} - [[ " ${sections} " != *" ${s} "* ]] && sections+=" ${s}" - done - ;; - esac - - export ac_cv_lib_z_gzopen=$(usex zlib) - local myeconfargs=( - --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --disable-setuid # bug #662438 - $(use_enable !prefix cache-owner man) # bug #917024 - --with-sections="${sections}" - - $(use_enable nls) - $(use_enable static-libs static) - $(use_with seccomp libseccomp) - - --with-db=gdbm - ) - - case ${CHOST} in - *-solaris*|*-darwin*) - myeconfargs+=( - $(use_with nls libiconv-prefix "${EPREFIX}"/usr) - $(use_with nls libintl-prefix "${EPREFIX}"/usr) - ) - ;; - esac - - econf "${myeconfargs[@]}" - - # Disable color output from groff so that the manpager can add it. bug #184604 - if use manpager; then - sed -i \ - -e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \ - src/man_db.conf || die - fi - - cat > 15man-db <<-EOF || die - SANDBOX_PREDICT="/var/cache/man" - EOF -} - -src_install() { - default - dodoc docs/{HACKING.md,TODO} - find "${ED}" -type f -name "*.la" -delete || die - - exeinto /etc/cron.daily - newexe "${FILESDIR}"/man-db.cron-r1 man-db # bug #289884 - - insinto /etc/sandbox.d - doins 15man-db -} - -pkg_preinst() { - local cachedir="${EROOT}/var/cache/man" - # If the system was already exploited, and the attacker is hiding in the - # cachedir of the old man-db, let's wipe them out. - # see bug #602588 comment 18 - local _replacing_version= - local _setgid_vuln=0 - for _replacing_version in ${REPLACING_VERSIONS} ; do - if ver_test '2.7.6.1-r2' -le "${_replacing_version}" ; then - debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!" - else - _setgid_vuln=1 - debug-print "Applying cleanup for security bug #602588" - fi - done - [[ ${_setgid_vuln} -eq 1 ]] && rm -rf "${cachedir}" - - # Fall back to recreating the cachedir - if [[ ! -d ${cachedir} ]] ; then - mkdir -p "${cachedir}" || die - chown man:man "${cachedir}" || die - fi - - # Update the whatis cache - if [[ -f ${cachedir}/whatis ]] ; then - einfo "Cleaning ${cachedir} from sys-apps/man" - find "${cachedir}" -type f '!' '(' -name index.bt -o -name index.db ')' -delete - fi -} - -pkg_postinst() { - tmpfiles_process man-db.conf - - if [[ -n "${REPLACING_VERSIONS}" ]] ; then - local _replacing_version= - - for _replacing_version in ${REPLACING_VERSIONS} ; do - if [[ $(ver_cut 2 ${_replacing_version}) -lt 7 ]] ; then - einfo "Rebuilding man-db from scratch with new database format!" - su man -s /bin/sh -c 'mandb --quiet --create' 2>/dev/null - - # No need to run it again if we hit one - break - fi - done - fi -} From 8fcb298e3ce4da75ea5ddf07e3738228101c8323 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:22 +0000 Subject: [PATCH 108/153] sys-apps/man-pages: Sync with Gentoo It's from Gentoo commit ee81764ae57376796edc1bfed92170687d8237ee. --- .../portage-stable/sys-apps/man-pages/man-pages-6.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.10.ebuild index 9a787b0cbe..ab6418681d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.10.ebuild @@ -52,7 +52,7 @@ else BDEPEND="verify-sig? ( sec-keys/openpgp-keys-alejandro-colomar )" fi - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos" fi SRC_URI+=" From e29810a14d13e7706d5520e4b034252009d3e580 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:26 +0000 Subject: [PATCH 109/153] sys-apps/nvme-cli: Sync with Gentoo It's from Gentoo commit 4e25903c6dc87f7174da5d7abad9e0aae083374d. --- .../portage-stable/sys-apps/nvme-cli/Manifest | 2 - .../files/nvme-cli-2.9.1-musl-stdint.patch | 107 ------------------ .../nvme-cli/files/nvme-cli-2.9.1-musl.patch | 28 ----- .../sys-apps/nvme-cli/nvme-cli-2.10.2.ebuild | 49 -------- .../sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild | 53 --------- 5 files changed, 239 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl-stdint.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.10.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/Manifest index 2c6a09785c..05de59a9c1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/Manifest @@ -1,3 +1 @@ -DIST nvme-cli-2.10.2.gh.tar.gz 990461 BLAKE2B d674f2c752eee9178cf3f1f871d1bc345632f4cbf7f354b1e345830a3bf88b505eddb835d774d6ebadbee50a79614f49dd1eef58d1374a075fd59eb551c251c8 SHA512 98ecb2488cdf21c83004204f4cb7e7d9327fef5a33e5a37d977c659d76be3cef861473676fa7fbd1d40f38742b365b98431e17d9b0318ddb4cc407953acdde87 DIST nvme-cli-2.11.gh.tar.gz 1023249 BLAKE2B c60765aaf8343adb29b2b042223accdd1ac4b132eaab77eec777c7aaf8f135d03b227ca915ef49ef9c67bec1dc89d43b782c38683c0d5e8fde8c997d17bd7347 SHA512 33de20ad990a3b87fef46fa486832edde41907223aa6b8a47606e605b360745fd7e2054226bf93a59b2a09c6bc04d0b684e4b3bb27c3fc0e6110c64a558cadc0 -DIST nvme-cli-2.9.1.gh.tar.gz 932210 BLAKE2B 865808c17f2098f8d0be8ba928869801023f77f0ffd44b5d2424b9f75e01180f8d1990684e3e4a79363e650a44e58abe213b5ab55328f0bde9ed699eba9a215c SHA512 c9c86e7567c2d4c59aff1eb9d18f4775923db3c81a89c628b819121c32150d4bc2d65d0dacac764c64594369890b380d0fd06bc7c1f83f4a7f3e71a51a6fee24 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl-stdint.patch b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl-stdint.patch deleted file mode 100644 index 6ecdac41e3..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl-stdint.patch +++ /dev/null @@ -1,107 +0,0 @@ -https://github.com/linux-nvme/nvme-cli/pull/2332 - -From 61bbd959bc069e4552e50a276b8a0e1487545ec2 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 4 May 2024 09:13:06 +0100 -Subject: [PATCH 1/2] Use C99 types for uint32_t - - provides `uint32_t`, while `u_int_32` is an unofficial/internal -typedef that glibc happens to provide. This fixes the build on musl. - -Bug: https://bugs.gentoo.org/931194 -Signed-off-by: Sam James ---- a/nvme.c -+++ b/nvme.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -9075,8 +9076,8 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru - - unsigned char decoded_key[128]; - unsigned int decoded_len; -- u_int32_t crc = crc32(0L, NULL, 0); -- u_int32_t key_crc; -+ uint32_t crc = crc32(0L, NULL, 0); -+ uint32_t key_crc; - int err = 0, hmac; - struct config { - char *key; -@@ -9144,10 +9145,10 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru - return -EINVAL; - } - crc = crc32(crc, decoded_key, decoded_len); -- key_crc = ((u_int32_t)decoded_key[decoded_len]) | -- ((u_int32_t)decoded_key[decoded_len + 1] << 8) | -- ((u_int32_t)decoded_key[decoded_len + 2] << 16) | -- ((u_int32_t)decoded_key[decoded_len + 3] << 24); -+ key_crc = ((uint32_t)decoded_key[decoded_len]) | -+ ((uint32_t)decoded_key[decoded_len + 1] << 8) | -+ ((uint32_t)decoded_key[decoded_len + 2] << 16) | -+ ((uint32_t)decoded_key[decoded_len + 3] << 24); - if (key_crc != crc) { - nvme_show_error("CRC mismatch (key %08x, crc %08x)", key_crc, crc); - return -EINVAL; ---- a/util/base64.c -+++ b/util/base64.c -@@ -20,6 +20,7 @@ - * MA 02110-1301, USA. - */ - -+#include - #include - #include - #include -@@ -42,7 +43,7 @@ static const char base64_table[65] = - int base64_encode(const unsigned char *src, int srclen, char *dst) - { - int i, bits = 0; -- u_int32_t ac = 0; -+ uint32_t ac = 0; - char *cp = dst; - - for (i = 0; i < srclen; i++) { -@@ -77,7 +78,7 @@ int base64_encode(const unsigned char *src, int srclen, char *dst) - */ - int base64_decode(const char *src, int srclen, unsigned char *dst) - { -- u_int32_t ac = 0; -+ uint32_t ac = 0; - int i, bits = 0; - unsigned char *bp = dst; - - -From 51208e30da0bfb12340d3a4f3afa0472312a8541 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 4 May 2024 09:15:03 +0100 -Subject: [PATCH 2/2] `u_char` -> `unsigned char` - -`u_char` is not a standard name for `unsigned char` and may not work; -some implementations may provide it for convenience. - -Signed-off-by: Sam James ---- a/plugins/innogrit/typedef.h -+++ b/plugins/innogrit/typedef.h -@@ -53,14 +53,14 @@ struct vsc_smart_log { - unsigned int low_pwr_cnt; - unsigned int wa; - unsigned int ps3_entry_cnt; -- u_char highest_temp[4]; -+ unsigned char highest_temp[4]; - unsigned int weight_ec; - unsigned int slc_cap_mb; - unsigned long long nand_page_write_cnt; - unsigned int program_error_cnt; - unsigned int erase_error_cnt; -- u_char flash_type; -- u_char reserved2[3]; -+ unsigned char flash_type; -+ unsigned char reserved2[3]; - unsigned int hs_crc_err_cnt; - unsigned int ddr_ecc_err_cnt; - unsigned int reserved3[44]; - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch deleted file mode 100644 index de7b488cc2..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/934081 -https://github.com/linux-nvme/nvme-cli/commit/650070ad5d4a97fc87f9018743e3b566deba36c8 - -From 650070ad5d4a97fc87f9018743e3b566deba36c8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 21 May 2024 14:09:32 -0700 -Subject: [PATCH] plugins/ssstc: Replace __uint16_t with uint16_t - -uint16_t is ISO defined and comes from stdint.h, makes it -portable across glibc and musl on linux. - -Signed-off-by: Khem Raj ---- a/plugins/ssstc/ssstc-nvme.c -+++ b/plugins/ssstc/ssstc-nvme.c -@@ -64,9 +64,9 @@ void show_ssstc_add_smart_log_jsn(struct nvme_additional_smart_log *smart, - unsigned int nsid, const char *devname) - { - struct json_object *root, *entry_stats, *dev_stats, *multi; -- __uint16_t wear_level_min = 0; -- __uint16_t wear_level_max = 0; -- __uint16_t wear_level_avg = 0; -+ uint16_t wear_level_min = 0; -+ uint16_t wear_level_max = 0; -+ uint16_t wear_level_avg = 0; - uint64_t raw_val = 0; - - root = json_create_object(); - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.10.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.10.2.ebuild deleted file mode 100644 index 3bcbb78bf7..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.10.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson systemd udev - -DESCRIPTION="NVM-Express user space tooling for Linux" -HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="GPL-2 GPL-2+" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc x86" -IUSE="+json pdc" - -RDEPEND=" - >=sys-libs/libnvme-1.10:=[json?] - json? ( dev-libs/json-c:= ) - sys-libs/zlib:= -" -DEPEND=" - ${RDEPEND} - virtual/os-headers -" -BDEPEND=" - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Dversion-tag="${PV}" - -Ddocs=all - -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" - -Dsystemddir="$(systemd_get_systemunitdir)" - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - $(meson_feature json json-c) - $(meson_use pdc pdc-enabled) - ) - meson_src_configure -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild deleted file mode 100644 index 0732d81aff..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson systemd udev - -DESCRIPTION="NVM-Express user space tooling for Linux" -HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="GPL-2 GPL-2+" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc x86" -IUSE="+json" - -RDEPEND=" - >=sys-libs/libnvme-1.9:=[json?] - json? ( dev-libs/json-c:= ) - sys-libs/zlib:= -" -DEPEND=" - ${RDEPEND} - virtual/os-headers -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9.1-musl-stdint.patch - "${FILESDIR}"/${PN}-2.9.1-musl.patch -) - -src_configure() { - local emesonargs=( - -Dversion-tag="${PV}" - -Ddocs=all - -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" - -Dsystemddir="$(systemd_get_systemunitdir)" - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - $(meson_feature json json-c) - ) - meson_src_configure -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} From d7216165910625f685ec40c292992d0cc94822dd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:27 +0000 Subject: [PATCH 110/153] sys-apps/pcsc-lite: Sync with Gentoo It's from Gentoo commit 80b5cf127cea6ae7975129b976e9ce406822aac8. --- .../sys-apps/pcsc-lite/Manifest | 2 - .../pcsc-lite/pcsc-lite-2.0.1-r1.ebuild | 109 ----------------- .../sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild | 110 ------------------ .../sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild | 2 +- 4 files changed, 1 insertion(+), 222 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/Manifest index 124de22ab7..dc9c1d191f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/Manifest @@ -1,3 +1 @@ -DIST pcsc-lite-2.0.1.tar.bz2 815103 BLAKE2B a9eea4a4da1a78fc22797b17c128889b2f7caf8c4aa02dd77f4ac79e4ec458fb0162578b5422552545cd39303750d5396f3687f8cfee7603fad8d60cb54ee1e8 SHA512 af007f00f43e8d897710580f6f27814c9e7d3ca489ff01edf2e3b979e46267915aa04d9c15f225a420fa681de936e42a1d4779d962717cf9a9f4a3d1ca31502b -DIST pcsc-lite-2.3.0.tar.xz 209064 BLAKE2B 48fc1a513a217ff499e8da63e026ce6adcd37987c878a0dda50756cfac5cc64245c95715df40df14e29883410c3d55670432ba0c658eff84add25b76c1828b11 SHA512 194c175ba7cf4610f09c08d463edf12f63e8e6a694938049988efb10c91e15b05d91747d58013f2f35452427996e8fe2ffb3706806d17ee278dc4896eab901c0 DIST pcsc-lite-2.3.1.tar.xz 209724 BLAKE2B aafcecf34a284145eecd5e3e1c9cb6bf1d4a3f9e7dad82983cee72ecbb8682480c06bb1fe025e176ca8d34f8a50ed325d41f14217ee7cd8a96b5848398c89624 SHA512 ec70ab3cf338299b3a493344c176b73450631da208714f3ac0fb4d6aa942fdc7487467b971246407fc4f1815fe5e48a0f29dcc109fb5fef838fbce7a2207d87b diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild deleted file mode 100644 index 28ac282995..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.1-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit python-single-r1 systemd tmpfiles udev multilib-minimal - -DESCRIPTION="PC/SC Architecture smartcard middleware library" -HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC" -SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2" - -# GPL-2 is there for the init script; everything else comes from -# upstream. -LICENSE="BSD ISC MIT GPL-3+ GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -# This is called libusb so that it doesn't fool people in thinking that -# it is _required_ for USB support. Otherwise they'll disable udev and -# that's going to be worse. -IUSE="doc embedded libusb policykit selinux systemd +udev" -REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}" - -# No dependencies need the MULTILIB_DEPS because the libraries are actually -# standalone, the deps are only needed for the daemon itself. -DEPEND=" - libusb? ( virtual/libusb:1 ) - udev? ( virtual/libudev:= ) - policykit? ( >=sys-auth/polkit-0.111 ) - acct-group/openct - acct-group/pcscd - acct-user/pcscd - ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-pcscd )" -BDEPEND=" - app-alternatives/lex - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch - "${FILESDIR}"/${PN}-1.9.8-systemd-user.patch -) - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --disable-maintainer-mode \ - --disable-strict \ - --enable-usbdropdir="${EPREFIX}"/usr/$(get_libdir)/readers/usb \ - --enable-ipcdir=/run/pcscd \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $(multilib_native_use_enable doc documentation) \ - $(multilib_native_use_enable embedded) \ - $(multilib_native_use_enable systemd libsystemd) \ - $(multilib_native_use_enable udev libudev) \ - $(multilib_native_use_enable libusb) \ - $(multilib_native_use_enable policykit polkit) -} - -multilib_src_install_all() { - einstalldocs - dodoc HELP SECURITY - - newinitd "${FILESDIR}"/pcscd-init.7 pcscd - dotmpfiles "${FILESDIR}"/pcscd.conf - - if use udev; then - exeinto "$(get_udevdir)" - newexe "${FILESDIR}"/pcscd-udev pcscd.sh - - insinto "$(get_udevdir)"/rules.d - newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules - fi - - python_fix_shebang "${ED}"/usr/bin/pcsc-spy - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in" - elog "the pcscd group, to avoid running as root." - elog - elog "This also means you need the newest drivers available so that the" - elog "devices get the proper owner." - elog - elog "Furthermore, a conf.d file is no longer installed by default, as" - elog "the default configuration does not require one. If you need to" - elog "pass further options to pcscd, create a file and set the" - elog "EXTRA_OPTS variable." - elog - - if use udev; then - elog "Hotplug support is provided by udev rules." - elog "When using OpenRC you additionally need to tell it to hotplug" - elog "pcscd by setting this variable in /etc/rc.conf:" - elog - elog " rc_hotplug=\"pcscd\"" - fi - - tmpfiles_process pcscd.conf - - use udev && udev_reload -} - -pkg_postrm() { - use udev && udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild deleted file mode 100644 index 0eba5b37d4..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.0.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit meson-multilib python-single-r1 tmpfiles udev - -DESCRIPTION="PC/SC Architecture smartcard middleware library" -HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC" -SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.xz" - -# GPL-2 is there for the init script; everything else comes from -# upstream. -LICENSE="BSD GPL-3+ BSD-2 ISC GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -# This is called libusb so that it doesn't fool people in thinking that -# it is _required_ for USB support. Otherwise they'll disable udev and -# that's going to be worse. -IUSE="embedded libusb policykit selinux systemd +udev" -REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}" - -# No dependencies need the MULTILIB_DEPS because the libraries are actually -# standalone, the deps are only needed for the daemon itself. -DEPEND=" - libusb? ( virtual/libusb:1 ) - udev? ( virtual/libudev:= ) - policykit? ( >=sys-auth/polkit-0.111 ) - acct-group/openct - acct-group/pcscd - acct-user/pcscd - ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-pcscd )" -BDEPEND=" - app-alternatives/lex - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch - "${FILESDIR}"/${PN}-1.9.8-systemd-user.patch - "${FILESDIR}"/${PN}-2.2.3-change-setup-spy-script-location.patch -) - -multilib_src_configure() { - local emesonargs=( - -Dusbdropdir="${EPREFIX}"/usr/$(get_libdir)/readers/usb - -Dipcdir=/run/pcscd - -Dsystemdunit=system - $(meson_native_use_bool embedded) - $(meson_native_use_bool systemd libsystemd) - $(meson_native_use_bool udev libudev) - $(meson_native_use_bool libusb) - $(meson_native_use_bool policykit polkit) - ) - - meson_src_configure -} - -multilib_src_install_all() { - einstalldocs - dodoc HELP SECURITY - - newinitd "${FILESDIR}"/pcscd-init.7 pcscd - dotmpfiles "${FILESDIR}"/pcscd.conf - - if use udev; then - exeinto "$(get_udevdir)" - newexe "${FILESDIR}"/pcscd-udev pcscd.sh - - insinto "$(get_udevdir)"/rules.d - newins "${FILESDIR}"/99-pcscd-hotplug-r2.rules 99-pcscd-hotplug.rules - fi - - python_fix_shebang "${ED}"/usr/bin/pcsc-spy - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in" - elog "the pcscd group, to avoid running as root." - elog - elog "This also means you need the newest drivers available so that the" - elog "devices get the proper owner." - elog - elog "Furthermore, a conf.d file is no longer installed by default, as" - elog "the default configuration does not require one. If you need to" - elog "pass further options to pcscd, create a file and set the" - elog "EXTRA_OPTS variable." - elog - - if use udev; then - elog "Hotplug support is provided by udev rules." - elog "When using OpenRC you additionally need to tell it to hotplug" - elog "pcscd by setting this variable in /etc/rc.conf:" - elog - elog " rc_hotplug=\"pcscd\"" - fi - - tmpfiles_process pcscd.conf - - use udev && udev_reload -} - -pkg_postrm() { - use udev && udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild index 8385c17fe4..61069dad0f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.3.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.xz" # upstream. LICENSE="BSD GPL-3+ BSD-2 ISC GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" # This is called libusb so that it doesn't fool people in thinking that # it is _required_ for USB support. Otherwise they'll disable udev and # that's going to be worse. From 29d6730e4ca87a5f96be70ea63f3d75806967521 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:27 +0000 Subject: [PATCH 111/153] sys-apps/pkgcore: Sync with Gentoo It's from Gentoo commit 87cbf6adaa4e2b3ddcd290ce3c6e2b95e1406e82. --- .../portage-stable/sys-apps/pkgcore/Manifest | 1 - .../sys-apps/pkgcore/pkgcore-0.12.28.ebuild | 50 ------------------- 2 files changed, 51 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/pkgcore/pkgcore-0.12.28.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pkgcore/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/pkgcore/Manifest index 65e173ab2c..ad478ab458 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pkgcore/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pkgcore/Manifest @@ -1,2 +1 @@ -DIST pkgcore-0.12.28.tar.gz 636701 BLAKE2B 5bb80f42b7de8ca39ee7379fae6ea3a1e2a3fec5f799f72a8a0425a4185c85968756778daf244d048ef7028bb8a71e45d6bd913843c5eb3a218a5daa78d198a6 SHA512 0e3c8c174826acc41edc4625fd4c2ae0759d5de015768110d06fac87be9ac2f1f4feefc48880735834474ec89b96e3c245d0619ea6986ec0c7323a9dc106f40e DIST pkgcore-0.12.29.tar.gz 642382 BLAKE2B c080cb63db3163c9581eb9ae047dcf00212664234767e6e581664167d3e98c74ccee8abb78b2e4d268634443a3c6e6e583568080a1631b6d8ca3a567d047aa83 SHA512 a72ce837add96f2e6fc2f6612dff5e9a7b6bd9c18c382b46584754a0d87b6e582760028cb9538515e4b7177d0130a879b3e88f36c4d55dd19fd873438865b60b diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pkgcore/pkgcore-0.12.28.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pkgcore/pkgcore-0.12.28.ebuild deleted file mode 100644 index 61fa4936aa..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pkgcore/pkgcore-0.12.28.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..13} ) -inherit distutils-r1 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcore.git - https://github.com/pkgcore/pkgcore.git" - inherit git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - inherit pypi -fi - -DESCRIPTION="a framework for package management" -HOMEPAGE="https://github.com/pkgcore/pkgcore" - -LICENSE="BSD MIT" -SLOT="0" - -if [[ ${PV} == *9999 ]]; then - COMMON_DEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" -else - COMMON_DEPEND=">=dev-python/snakeoil-0.10.7[${PYTHON_USEDEP}]" -fi - -RDEPEND=" - ${COMMON_DEPEND} - >=app-shells/bash-5.1[readline] - dev-python/lxml[${PYTHON_USEDEP}] -" -BDEPEND=" - ${COMMON_DEPEND} - >=dev-python/flit-core-3.8[${PYTHON_USEDEP}] - test? ( - dev-vcs/git - ) -" - -distutils_enable_tests pytest - -python_install_all() { - local DOCS=( NEWS.rst ) - [[ ${PV} == *9999 ]] || doman build/sphinx/man/* - distutils-r1_python_install_all -} From 562d2ba8299ad5c1f086647fd92907c6731d32d4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:27 +0000 Subject: [PATCH 112/153] sys-apps/portage: Sync with Gentoo It's from Gentoo commit db49c5f88508c2a53aafde5dd45ecf488e81c01d. --- .../portage-stable/sys-apps/portage/portage-3.0.67.ebuild | 6 +++--- .../portage-stable/sys-apps/portage/portage-9999.ebuild | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.67.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.67.ebuild index e1afb04b08..1df3a64626 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.67.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.67.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{10..13} ) +PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="GPL-2" @@ -124,7 +124,7 @@ my_src_configure() { $(meson_use xattr) ) - if use native-extensions && [[ "${EPYTHON}" != "pypy3" ]] ; then + if use native-extensions && [[ "${EPYTHON}" != pypy3* ]] ; then emesonargs+=( -Dnative-extensions=true ) else emesonargs+=( -Dnative-extensions=false ) 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 e1afb04b08..947cf2d6c1 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 @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{10..13} ) +PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 From 2486e8b5484dae6aaea032601b31433d9874c8ce Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:27 +0000 Subject: [PATCH 113/153] sys-apps/pv: Sync with Gentoo It's from Gentoo commit 8d298ff52f3a146385806ec7f041285e5e82bb2d. --- .../portage-stable/sys-apps/pv/Manifest | 4 -- .../sys-apps/pv/pv-1.9.15.ebuild | 2 +- .../sys-apps/pv/pv-1.9.25.ebuild | 59 ------------------- .../sys-apps/pv/pv-1.9.27.ebuild | 59 ------------------- .../sys-apps/pv/pv-1.9.31.ebuild | 2 +- 5 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.25.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.27.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pv/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/pv/Manifest index af950a11bc..63e6d2016f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pv/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pv/Manifest @@ -2,9 +2,5 @@ DIST pv-1.9.0.tar.gz 369918 BLAKE2B 802dafdd2e354887d8ca73f42787e86941081aaf62ca DIST pv-1.9.0.tar.gz.asc 691 BLAKE2B 86b99c718935afdbbf2419b1363a385d1ca8afe81bc7fabea8b4b48dbe1c439a7cd4bb93a106608cb6916f9503fc0f32253867771f9b78feb24f5218d2f49f8f SHA512 d8fe557b690aa828a3a2af9b74397d00ab1b00b444890220b79991aa5161ec8cc5ca3701b37950ec07bc3382f6cbc1578bf6b2be1966c34313827c1eeaa79fc7 DIST pv-1.9.15.tar.gz 401271 BLAKE2B 062bc326eae9b3f8a17eb3a453f5b5e5081eece1b7d7601aabe7ea6ffb6d4fff62ad1896b66990a54b7c6cd6baf080d0efefa4039947d88386c779e6e9ec7a90 SHA512 9a5174b3523e20f186689553e5004df35e38da9462a8f7376b6efce186e854ed8ef139c9e2d10944c20e478e5cfe80a7b67786d5e909ed1a9e40c9ca9fde474c DIST pv-1.9.15.tar.gz.asc 691 BLAKE2B e29a55fc7a78b39135d1c53decdeb6ec553443dcceedb5886522e6c4914aa354d05754cc7ddbefc4a5b930a9d75d82b33827fd7ef070fcb45dcd512d882b4d98 SHA512 571302a27539e5cfd5179827f1a1881499febba99207461d750c3934f3dad21e5c396fd8db7179e170ce5ab2239f5332517c63e2c43160428a86f875ae29a34a -DIST pv-1.9.25.tar.gz 415059 BLAKE2B 6c364a63de5ea70651da21d9c6703703cfaa6c528d83f981e8b135884cfec84b4c8d8a8340f4f3722c000ed5a98ef203a7443d400c7937f7488ac90209d8b45f SHA512 78e68185e9555410dca4816f9e293e49738345a84b4eaaa6aca8d076270ce74ba5fd7f2895bfcb0ddaf1ca6e61708c66a5387cecce84ab80818486510f567d40 -DIST pv-1.9.25.tar.gz.asc 691 BLAKE2B 9b7b134badf9b7d92cbc1eb18808b723dc370c801200ae223eea33837af05e8c358aa5a19af72b75d5c975dbb5418772a528e8cc29fa2ca5e4a7756b76e69787 SHA512 72370c191c87268384e11cf4b206435048fa8010723cc7b19b8d4e7115b43d84eaf5368cd254da73fbadf73faba5852c6283897553b80a4bd47b3be56baa7623 -DIST pv-1.9.27.tar.gz 415403 BLAKE2B 12be077145725912cbd21a160adf7302859d443bc57c7c03b517c251814ace66852b5bd5d701a5570bf18f10db1cd606b549b26a0595d8599b46cae5eaa53725 SHA512 04b66d4ce96f6570d8cb3441bb2e421f9a7767e75d716fac033d51947834a56dd226fc02820ea3b7ac4c8276fa69fed0335d9c103af29e64b38e59bf49f1fab7 -DIST pv-1.9.27.tar.gz.asc 691 BLAKE2B 7ac1d445892aca207e1ef5163f806cad484d95a649b4ee21fcaa7f97c220e290383a7a30aadc5d5b5d86e86a951f47d99993baf4bc7b39b11de2e11887f74a03 SHA512 76df89e07d28947b84097274457eece164f384a6047c481c4e41fcef91417e4496967186ec1674d433601cfdf209e43e3ecd86a16ac7f9a45610d05642d09b65 DIST pv-1.9.31.tar.gz 417551 BLAKE2B 6018abe674834f45312faa5ce07b49e11258e29fffc11d88ce73f50ae58c47e94defa3d5d819099a6909610e7423d9e42a8ce939fa39fe476cdbf35e89aa0112 SHA512 63cdc6223cde4f3f0daf47b5808a3f72a9cfaf2c05751e971a99d9dd3df2f36430958213c023931f428c87341a5f6c1f3772f30ca992123ea4c2a2e48000ff1d DIST pv-1.9.31.tar.gz.asc 691 BLAKE2B 7b5b998341db887b14c56fc080d87cb4abb186b4df2c8def638822889a734436fe0c4c132396415bbc0dcb0754f76d0456bb667533ef7ed92ed0c09a62522e8b SHA512 549a3bb3f4f404b3a6e407663ba335e3d4e14303185654771c974335ed5e7ac46dbba71bbf4f26e640217829e58a0da8d6fa139b02f426b60ab074ec97084374 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.15.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.15.ebuild index 0785504fbd..03801fb28c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.15.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.15.ebuild @@ -18,7 +18,7 @@ else verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc ) " - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="GPL-3+" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.25.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.25.ebuild deleted file mode 100644 index f1565df2a2..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.25.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/pv.asc -inherit linux-info toolchain-funcs verify-sig - -DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe" -HOMEPAGE="https://www.ivarch.com/programs/pv.shtml https://codeberg.org/a-j-wood/pv" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://codeberg.org/a-j-wood/pv" - inherit autotools git-r3 -else - SRC_URI=" - https://www.ivarch.com/programs/sources/${P}.tar.gz - verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc ) - " - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="debug ncurses nls" - -RDEPEND="ncurses? ( sys-libs/ncurses:= )" -DEPEND="${RDEPEND}" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-pv )" - -pkg_setup() { - if use kernel_linux; then - CONFIG_CHECK="~SYSVIPC" - ERROR_SYSVIPC="You will need to enable CONFIG_SYSVIPC in your kernel to use the --remote option." - linux-info_pkg_setup - fi -} - -src_prepare() { - default - - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - tc-export AR - - econf \ - $(use_enable debug debugging) \ - $(use_with ncurses) \ - $(use_enable nls) -} - -src_test() { - # Valgrind is unreliable within sandbox - local -x SKIP_VALGRIND_TESTS=1 - emake -Onone check -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.27.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.27.ebuild deleted file mode 100644 index e8f8898b05..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.27.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/pv.asc -inherit linux-info toolchain-funcs verify-sig - -DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe" -HOMEPAGE="https://www.ivarch.com/programs/pv.shtml https://codeberg.org/a-j-wood/pv" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://codeberg.org/a-j-wood/pv" - inherit autotools git-r3 -else - SRC_URI=" - https://www.ivarch.com/programs/sources/${P}.tar.gz - verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc ) - " - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="debug ncurses nls" - -RDEPEND="ncurses? ( sys-libs/ncurses:= )" -DEPEND="${RDEPEND}" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-pv )" - -pkg_setup() { - if use kernel_linux; then - CONFIG_CHECK="~SYSVIPC" - ERROR_SYSVIPC="You will need to enable CONFIG_SYSVIPC in your kernel to use the --remote option." - linux-info_pkg_setup - fi -} - -src_prepare() { - default - - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - tc-export AR - - econf \ - $(use_enable debug debugging) \ - $(use_with ncurses) \ - $(use_enable nls) -} - -src_test() { - # Valgrind is unreliable within sandbox - local -x SKIP_VALGRIND_TESTS=1 - emake -Onone check -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.31.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.31.ebuild index e8f8898b05..5e337f3762 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.31.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.9.31.ebuild @@ -18,7 +18,7 @@ else verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="GPL-3+" From a3e1a181cf888e1fa122ff0e2a06f5715fe313d2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:29 +0000 Subject: [PATCH 114/153] sys-apps/semodule-utils: Sync with Gentoo It's from Gentoo commit e1022d7aa71755a3dc768cc43a385bc116e47a3e. --- .../third_party/portage-stable/sys-apps/semodule-utils/Manifest | 2 +- .../{semodule-utils-3.8.ebuild => semodule-utils-3.8.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/{semodule-utils-3.8.ebuild => semodule-utils-3.8.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest index 80c5054e0e..d46e534a74 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest @@ -1,3 +1,3 @@ DIST semodule-utils-3.6.tar.gz 12844 BLAKE2B e5e7501c412649f471e89cc89569d6c51421e0b46f172f243ce778bbe3a2c658ef9a92e3f3e1e07fb3358e25f63e004b6bd4b56619472fbcae8cb5b916d54170 SHA512 16b58bbafcaef9a2e8e34a20d0e1e4024a9044024de8fa3137c5ba1b9af600afac51c15ccb648dd6bff77747c047f4c9feafeea07c19b1eb14955acc92697a48 DIST semodule-utils-3.7.tar.gz 12896 BLAKE2B 7487c74585e281f6c44e9977efb85e89bf01d93285c6cc6593dd876e948cc385ec9f11b52f3fc182b2bac3621bcc89c53fc217c41b1a01d586274139b0a40fa6 SHA512 133f76ddff0cc4121e59560f4167e15288cc7f6172a39b49ea631803f6e3365fef95166a55498fa2e036de85466e37bb6ec164ef60855eef8c888c9b384b0120 -DIST semodule-utils-3.8.tar.gz 12905 BLAKE2B 13c863ab3240e24f6d6069ed29bfa51133d593fa779040852b45640403482f0087b15de351a63a04c75940cdacb901c9c865257785aaf19cb13fbef8ebac2e8d SHA512 2983607b171201a66fcf8299ffa77e0a9c4d3042a360eb961ec470af27b528db995c959cee9934ce6b3f6de4e2f28db587c5b25ebe7e74386136874f704bc2d0 +DIST semodule-utils-3.8.1.tar.gz 12892 BLAKE2B b134dcd6bec0c543c22aba091c25568bca4fee1567538bac719103c7a2d825cbba8540d58cf1891d82f77b0b981e6e6448e9fc270f39c2afa9d9df83c1660b13 SHA512 e2d379192daf660aabe97d6565b8c6575d7ec6daf59505e1546c0a78a289c0bc533ed81494652503e003cdd61cec6dc72155b3077ed092a6b428a9fc2cd564fa diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.8.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.8.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.8.1.ebuild From 0242ba01c78cb3d2b442e60aad97a0e59a17f962 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:33 +0000 Subject: [PATCH 115/153] sys-apps/util-linux: Sync with Gentoo It's from Gentoo commit 843d5a09bbfa5cfa0293663086d8bc7756615f44. --- .../sys-apps/util-linux/util-linux-2.40.4.ebuild | 6 +++++- .../sys-apps/util-linux/util-linux-9999.ebuild | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.40.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.40.4.ebuild index 43dfa1f318..56dfc99385 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.40.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.40.4.ebuild @@ -23,7 +23,7 @@ else inherit verify-sig if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos" + KEYWORDS="~alpha amd64 arm ~arm64 hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos" fi SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" @@ -145,6 +145,10 @@ src_prepare() { lsfd/option-inet utmp/last-ipv6 + # Fails with permission errors in nspawn + fadvise/drop + fincore/count + # Flaky rename/subdir diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild index 2d18de7bfe..83b99ab025 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild @@ -153,6 +153,10 @@ src_prepare() { lsfd/option-inet utmp/last-ipv6 + # Fails with permission errors in nspawn + fadvise/drop + fincore/count + # Flaky rename/subdir From 4c4cae34baec697bd8569788419a04816f8051ff Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:33 +0000 Subject: [PATCH 116/153] sys-apps/which: Sync with Gentoo It's from Gentoo commit 3e9856cb64cee10290cff2e5e7fe95842fa79dac. --- .../third_party/portage-stable/sys-apps/which/which-2.23.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.23.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.23.ebuild index 62bcd5206b..c06de7f3e1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.23.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/which/which-2.23.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" src_configure() { tc-export AR From c4d0b924e6ea421dc10a69c80ef2565ec5e08e30 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:34 +0000 Subject: [PATCH 117/153] sys-block/open-iscsi: Sync with Gentoo It's from Gentoo commit e9cf1b010522d204490a6249e3b665041c4a45f6. --- .../sys-block/open-iscsi/Manifest | 1 + ...2.1.10.ebuild => open-iscsi-2.1.11.ebuild} | 23 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/{open-iscsi-2.1.10.ebuild => open-iscsi-2.1.11.ebuild} (84%) diff --git a/sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/Manifest b/sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/Manifest index 4d023e6077..73afb0c845 100644 --- a/sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/Manifest @@ -1 +1,2 @@ DIST open-iscsi-2.1.10.tar.gz 645825 BLAKE2B 6a2e279e2dcf77e8d340c025eb59168121ee0c50bd013d0b5d9dac2fbc7116cc54904b4206eea192bd3888e3bcf3da42caeae1e428268edc6c2f7184958b6b04 SHA512 18b92d3e9a85d8de66734d95e9ca74a8acc5167a98830134c18ad5e226b29a00d358f952edfab67b643c454ec63c0a382c7ab7e7e76970f7574b46cea0d5c82d +DIST open-iscsi-2.1.11.tar.gz 644204 BLAKE2B 3db4d425b52cb88bfcaf798f779203f4a2caef253cb404de17bf71521d12c028ceb877f0ba20cbe031ad0528221278ee13678b3de18672bd0799d8577a420caa SHA512 5e7a160e675ce016123f703522758cbbf2ba3be6b97dc73a69b8ff0fe247c6d994c43ca67ebe6f21982bfa22eee27f2d08cbfc502767c0afc127852389411e4d diff --git a/sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/open-iscsi-2.1.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/open-iscsi-2.1.11.ebuild similarity index 84% rename from sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/open-iscsi-2.1.10.ebuild rename to sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/open-iscsi-2.1.11.ebuild index b2bf072d92..c940b3f2b8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/open-iscsi-2.1.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-block/open-iscsi/open-iscsi-2.1.11.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit flag-o-matic linux-info meson systemd udev +inherit flag-o-matic linux-info meson systemd toolchain-funcs udev DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720" HOMEPAGE="https://www.open-iscsi.com/" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-3+ GPL-2+" SLOT="0/0.2" -KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="debug infiniband +tcp rdma systemd" REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )" # Tries to write to /run/lock/iscsi etc @@ -39,10 +39,6 @@ PATCHES=( pkg_setup() { linux-info_pkg_setup - if kernel_is -lt 2 6 16; then - die "Sorry, your kernel must be 2.6.16-rc5 or newer!" - fi - # Needs to be done, as iscsid currently only starts, when having the iSCSI # support loaded as module. Kernel builtin options don't work. See this for # more information: @@ -88,8 +84,9 @@ src_configure() { src_install() { meson_src_install - # Upstream make is not deterministic, per bug #601514 - rm -f "${ED}"/etc/initiatorname.iscsi + # We'll regenerate this later to avoid baking the value into binary + # packages. It doesn't get generated when cross-compiling. + tc-is-cross-compiler || rm "${ED}"/etc/iscsi/initiatorname.iscsi || die docinto test/ dodoc $(find test -maxdepth 1 -type f ! -name ".*") @@ -107,13 +104,17 @@ src_install() { pkg_postinst() { in='/etc/iscsi/initiatorname.iscsi' - if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then + if ! tc-is-cross-compiler && [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then { cat "${EROOT}${in}.example" echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)" - echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)" + echo "InitiatorName=$("${EROOT}"/usr/sbin/iscsi-iname)" } >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}" fi udev_reload } + +pkg_postrm() { + udev_reload +} From 1d6180e151f6068b1c6fcf164d27aaaaa155c26e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:34 +0000 Subject: [PATCH 118/153] sys-block/open-isns: Sync with Gentoo It's from Gentoo commit 1e08f65f2123eec7a46da26d71c68dfdf060d32e. --- .../sys-block/open-isns/Manifest | 1 + .../open-isns/open-isns-0.103.ebuild | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-block/open-isns/open-isns-0.103.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-block/open-isns/Manifest b/sdk_container/src/third_party/portage-stable/sys-block/open-isns/Manifest index 63d6b52bcf..9c16ce1f1f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-block/open-isns/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-block/open-isns/Manifest @@ -1,2 +1,3 @@ DIST open-isns-0.101.tar.gz 301912 BLAKE2B 98c9c36640ee4d3796538a00e7ab2e4cfb057abc66a56d27ce2eb133d591ea87bcb0e4ffb31b6d72d8e8c806edffb65600c0ae7cd63c61058f36037e3db79214 SHA512 e5a392127b0d85f36e9e4aa963c0c502af8c5aea0aba6d12abb4425649969dcc20ba6e87a99083626d981438439b17b71a86320f816042d82ed5dbe7e7a63e77 DIST open-isns-0.102.tar.gz 303210 BLAKE2B d6095f8a550faabd60475df4bce644dffa85187168d01616cc016003a5536663c68adc588e21fb6ab82937ac8d5a0ff46dde8c4c2664560f4b792b0324fb5856 SHA512 f5ae8af89b85565181c2f6def9834d9dab0a15d5d9b28721cce116c5580173ed9adba219e1ede48988cb57f047578db4ece458c4a7db598412c7583e56393d2b +DIST open-isns-0.103.tar.gz 254988 BLAKE2B cd6db63992328c815af218bd4ae1ff2a19e49c5a1d3c686167b96130f5b7bde8d861e8be6399c5668077c68ff54e61226b743704147d0da97e0b227c821660b1 SHA512 219dd4f7e0a8459f5acaf2036fc737b90604cdcfe78b5492d50e4826744923afe35c9c331b3e39aa7c9bb5ebb2c378c464dced204d51da46e2b7474c6ca94057 diff --git a/sdk_container/src/third_party/portage-stable/sys-block/open-isns/open-isns-0.103.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/open-isns/open-isns-0.103.ebuild new file mode 100644 index 0000000000..ccb4381f77 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-block/open-isns/open-isns-0.103.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# The tests assume they can look at ../server.conf +BUILD_DIR="${S}"/builddir +inherit meson systemd + +DESCRIPTION="iSNS server and client for Linux" +HOMEPAGE="https://github.com/open-iscsi/open-isns" +SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="ssl static" +# Tests can't connect +RESTRICT="test" + +DEPEND=" + ssl? ( + dev-libs/openssl:= + ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local emesonargs=( + -Ddefault_library=$(usex static both shared) + -Dslp=disabled + -Dsystemddir=$(systemd_get_utildir) + $(meson_feature ssl security) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + keepdir /var/lib/${PN/open-} +} From 743816b7c0b6a204f6e848d72ab9ada6d54ef6d6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:40 +0000 Subject: [PATCH 119/153] sys-devel/binutils: Sync with Gentoo It's from Gentoo commit 973a17bc644c1043f029727cb3f4df7892678eb0. --- .../sys-devel/binutils/binutils-2.44.9999.ebuild | 10 ++++++++++ .../sys-devel/binutils/binutils-2.44.ebuild | 12 +++++++++++- .../sys-devel/binutils/binutils-9999.ebuild | 10 ++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.44.9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.44.9999.ebuild index f689432648..3c840be5f3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.44.9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.44.9999.ebuild @@ -398,6 +398,16 @@ src_test() { # Tests don't expect LTO filter-lto + # If we have e.g. -mfpmath=sse -march=pentium4 in CFLAGS, + # we'll get lto1 warnings for some tests which cause + # spurious failures because -mfpmath isn't passed at + # link-time. Filter accordingly. + # + # Alternatively, we could pass C{C,XX}_FOR_TARGET with + # some (ideally not all, surely would break some tests) + # stuffed in. + filter-flags '-mfpmath=*' + # lto-wrapper warnings which confuse tests filter-flags '-Wa,*' diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.44.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.44.ebuild index 6628fbed5b..d8629b626d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.44.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.44.ebuild @@ -35,7 +35,7 @@ else [[ -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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" fi # @@ -398,6 +398,16 @@ src_test() { # Tests don't expect LTO filter-lto + # If we have e.g. -mfpmath=sse -march=pentium4 in CFLAGS, + # we'll get lto1 warnings for some tests which cause + # spurious failures because -mfpmath isn't passed at + # link-time. Filter accordingly. + # + # Alternatively, we could pass C{C,XX}_FOR_TARGET with + # some (ideally not all, surely would break some tests) + # stuffed in. + filter-flags '-mfpmath=*' + # lto-wrapper warnings which confuse tests filter-flags '-Wa,*' 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 bf8d3eccb2..65d9f15ce0 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 @@ -398,6 +398,16 @@ src_test() { # Tests don't expect LTO filter-lto + # If we have e.g. -mfpmath=sse -march=pentium4 in CFLAGS, + # we'll get lto1 warnings for some tests which cause + # spurious failures because -mfpmath isn't passed at + # link-time. Filter accordingly. + # + # Alternatively, we could pass C{C,XX}_FOR_TARGET with + # some (ideally not all, surely would break some tests) + # stuffed in. + filter-flags '-mfpmath=*' + # lto-wrapper warnings which confuse tests filter-flags '-Wa,*' From 5f352094884e56bb6edeef4c4fba882fce1ee476 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:41 +0000 Subject: [PATCH 120/153] sys-devel/bison: Sync with Gentoo It's from Gentoo commit a6a58951599c6697da9157ac324449ce48b52e1b. --- .../portage-stable/sys-devel/bison/bison-3.8.2-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r3.ebuild index 82a6f6ebe1..9c73268b9e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="examples nls static test" RESTRICT="!test? ( test )" From fc77e0966337a2a63b71b104032b452968414050 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:43 +0000 Subject: [PATCH 121/153] sys-devel/gcc: Sync with Gentoo It's from Gentoo commit 04bdadefc60796a3179e475c6a5293db1954d2d5. --- .../portage-stable/sys-devel/gcc/Manifest | 15 +-- .../gcc-15.0.1_pre20250302-firefox-ice.patch | 99 +++++++++++++++++++ ...c-15.0.1_pre20250302-firefox-pgo-ice.patch | 58 +++++++++++ ...220.ebuild => gcc-12.4.1_p20250306.ebuild} | 0 .../sys-devel/gcc/gcc-12.4.1_p20250313.ebuild | 65 ++++++++++++ ...221.ebuild => gcc-13.3.1_p20250307.ebuild} | 0 ...-r1.ebuild => gcc-13.3.1_p20250314.ebuild} | 25 +++-- ...222.ebuild => gcc-14.2.1_p20250308.ebuild} | 0 ...223.ebuild => gcc-14.2.1_p20250315.ebuild} | 15 +-- ...2.ebuild => gcc-15.0.1_pre20250309.ebuild} | 0 ...6.ebuild => gcc-15.0.1_pre20250316.ebuild} | 3 +- .../portage-stable/sys-devel/gcc/metadata.xml | 1 + 12 files changed, 260 insertions(+), 21 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-15.0.1_pre20250302-firefox-ice.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-15.0.1_pre20250302-firefox-pgo-ice.patch rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-12.4.1_p20250220.ebuild => gcc-12.4.1_p20250306.ebuild} (100%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.1_p20250313.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.3.1_p20250221.ebuild => gcc-13.3.1_p20250307.ebuild} (100%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-15.0.1_pre20250223-r1.ebuild => gcc-13.3.1_p20250314.ebuild} (73%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-14.2.1_p20250222.ebuild => gcc-14.2.1_p20250308.ebuild} (100%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-15.0.1_pre20250223.ebuild => gcc-14.2.1_p20250315.ebuild} (78%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-15.0.1_pre20250302.ebuild => gcc-15.0.1_pre20250309.ebuild} (100%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-15.0.1_pre20250216.ebuild => gcc-15.0.1_pre20250316.ebuild} (98%) 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 29a725d2ed..d5a642cf7d 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 @@ -5,30 +5,33 @@ DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0e DIST gcc-11.5.0-patches-1.tar.xz 13664 BLAKE2B 64fd9c2d074aca58ecd8c0035ccf2d2b84d83b93b46367f3e068a95651a094a07b9aad7635bb9c7d2e5ea20dc5957bc19217ca32cbd6cf6f0344f4a3d943a60a SHA512 55828751008575fe89760a224477ee9e5132c0780fbe232e0b80b16ecd9854f85ae54bdcd216ae04de67f3a8b417ee2aad4f8bf9d9df5318613d3efb55bd92df DIST gcc-11.5.0.tar.xz 82399864 BLAKE2B f4a61faad32aac9e9cb553c1a1a011df0a057f6e2cac92a13cc7e285d08191dd4a117f41a8faac2359c0e2a16f954c7fef354dda9df8c63bff1c5cefda82602c SHA512 88f17d5a5e69eeb53aaf0a9bc9daab1c4e501d145b388c5485ebeb2cc36178fbb2d3e49ebef4a8c007a05e88471a06b97cf9b08870478249f77fbfa3d4abd9a8 DIST gcc-12-20241219.tar.xz 79920016 BLAKE2B 71044352515f33eaf0bcc64cc6eacdecb8b7b1dbca6d8836b629f76e60320f5090178ff37b6804fbda0913c0f55afca37588647974fd72e9961edd338ccf6ffb SHA512 e0c08366f392083feb1ae242242e9bd335681234808ed44d4e75afe157be2814bef321d2327186d217f38bbb6176706e1258228904d31fdb3bb37c8e245dacb0 -DIST gcc-12-20250220.tar.xz 79919964 BLAKE2B 01ac8e2865b46d8dde41b73b5b5dd8c6bd533dc1ecff9a05455ad10fc125ad1ba4bb15de637ca639a82057fbd354a6225c0dcd0144c313b91833aa712f2e133a SHA512 0ba3b3b1eca1a62da5f0f0238c5980bcb6f2efbc1e0dffefd04b107bc48d4dfaf72cc9037689d7725a4aa9e4478d0b43339eccfea718bb45a113aef14604d215 DIST gcc-12-20250227.tar.xz 79915940 BLAKE2B 0adb19847cb3f317316549f657434654b9923806366a4b95e496effea9c07995b7d3de65c40cc2f62ba1e87cfb0f8cd8a1a833284042fdc5e6fce2bd7e7e9543 SHA512 d01cad1771762f5b56c783d6a3b39415be1c7619229b5ff056fe40ef0bf821c67a2d1a2272c2227a44f92825582579625352d19e2342d11f76a079556dae0ae8 +DIST gcc-12-20250306.tar.xz 79914120 BLAKE2B 52744beac63301b3e0f2564efc82384f6452cd05bb2543f3c421d14fdfc4eed107d25d24183e9d7045d33f1e9f14741b8cb8580bb0c7e8cda8b3e5b4dd5e0d4e SHA512 585aeab071fda880a6ad5c9e0e766164683faf4e84ad63764ad7dc0420fe5e355452338234f76f6f2cb2b25f4b39b059658323f53594c2c7da3db6631c69a14c +DIST gcc-12-20250313.tar.xz 79917528 BLAKE2B 2ce76d12f0d90d5728df2e14ece3c13e781005eac43dd10357602efc1dd3a9c939fee7640c1baae643df88354905bdbcd314d6bb7c7f384df9148074d8448afc SHA512 465a9923c8ebef98cf4590096afd44468993116cf38ba1e5bbbc70dfb57ec1716ad55a544dc12444011663dc8cd3c9a7c19326d69dfcea181d07783a0aceb73f DIST gcc-12.4.0-musl-patches-1.tar.xz 3068 BLAKE2B e5e39c24934072ea89e4467d0dc5196f3dadfb5ffba0c856d051648a2fbf57d434a57e95227cdf2b8cea45f0f5555aec2bc372d2f6cb0b69efd87831d248d364 SHA512 b9db204845a25be043d76cae826d42eebeeb4f9be7c3049af6fe7601a552bedfd24731156a6a36b4b5e2e2af656a589a5c556d2b0b3ded33ba290a773ee87c62 DIST gcc-12.4.0-patches-1.tar.xz 15576 BLAKE2B 98c29888de7701b365be7ac9062f0cee3340d58c85485e26f0d02f1483ec64cc9c10651488a4fd937551afe30f4e19777e6766871a724ae3ba6c290c16f4fdf1 SHA512 3f7c5d36e56e07ea9dd143a5d13342a6c1ccbf0643abd1c0bcbfb46bb7c7b1308aef6e3e882031c9c191610f01af906b19be5aa2b139cf617614f46e97463aec DIST gcc-12.4.0-patches-2.tar.xz 14876 BLAKE2B 6bf5abbb2abba4b9fe9fa153ac4112fe5f563e97cd4e1b885ccd0d88abf1124fa91f20d6be972e2242410447be73bca60014785f8551b8087ed0d4cc3e868225 SHA512 dfd5f02d4c1076fad4ee998b2f620171dd3eb65a1160312def9dae89b18327a06db853f569e0e3c049e5ab06c61488bb6faecec52bafe737fddeb43628c54a1f DIST gcc-12.4.0.tar.xz 83377372 BLAKE2B 0d5aa9995bf53fa2dc976a846240cfb8fafd125ad6c54f45dc9d770215eae3e9ea0db82a9a4f79c51b4d5f8461a1d730c17db6841bc31bd96dba11d9ed7544ae SHA512 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853 DIST gcc-13-20241220.tar.xz 84504500 BLAKE2B 60d6dcdcafa36399a0c0de7fef3a4eb4ca8e0b6780cd31c9eace2965c53115205bf64e8247b833a4375c1e3ad2d94820b5bdc97a4689be95d8ab55a676afa689 SHA512 10fe009dc3b8872b24350e4fb999f71b848bd5a03e48e8292f76e6eca3dbdef8383a3b13b813aada983ebdbe3ecab1642961b3210cd1e0063a86655a44493017 -DIST gcc-13-20250221.tar.xz 84535136 BLAKE2B 8f56681b291231c7922680e77fa29f84510c37911713635cd3806a366fcc74f708c3c3dd6020cfcaf6a6adb84099a83e8de455ba201281264e9eff916c4b0c36 SHA512 4527db4becbe2a49c42e82fd817089cc4b861693560829350d0787685ccad0cd6c6ced2ec9a7ce538589f7b431c0e118dd2bc157435328065941e98e3facce96 DIST gcc-13-20250301.tar.xz 84525780 BLAKE2B c366f4de63b7956abb1bf2d1039acdf90c7a801adbb2793e4c199b0f743d143327aac9c2b078991f802da758ed4326dd913d9f60aec4fc471eff9af72f781a8e SHA512 075bfb3c5aeaf1c9bf7ab69ef117fcc1fd3ce1042edc9442d95df717e622c2ea9cfabbabf8be5eda32b3cf115d7d3e73907fd577a69f0beb6895f7ec2c5fc813 +DIST gcc-13-20250307.tar.xz 84518416 BLAKE2B 2afe5b57ab2d6af1800c3c74ab629e9033ec4368471d103377958d5225912ffa259f1fbb9d04804f817df9527b7659913ff762b40147a40f65eaa1caaef2c4f5 SHA512 c2a63fcab70db6a5123347897a47a60d7423723e3e202e4c56c77f50caeb460b629d7fa3af9102467c73271273e7018fc431f2254993b039d5270ba093c7a865 +DIST gcc-13-20250314.tar.xz 84540844 BLAKE2B 7e032e0fafeb9eb47f8acb387d49d024fb44ba54d782c0afce26b0751b099208212a5a977d3c027a9c5c0efc3d3a5ed99ad98e56b16f2cabf234cc8bca89e6de SHA512 51320889e0e959b763bdcb1334d38aff48ba6099e6bcc75055633d81a17e1f59c71e81597ec391eab95f86614b7b62cff37aa00827c61d949d6596f9ba36fb9c DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69 DIST gcc-13.2.0-patches-3.tar.xz 30956 BLAKE2B 29ce043b46645640ca1e983397af3e158588ad87575f0bc59451ea4a7dd5e3bb5b190ed031de6a22cd790d423ba111e95d222187dd09985dceb12db9f0a2d907 SHA512 4ffecae7be320124ad0c4e71e39e142b7aa8db0e70b5f486f491d7a33ea31efc6464c6abeea77df02a8bd5cf81f08225d625c8af5c27f9afa32c0d7d989f7a3c DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2 SHA512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 DIST gcc-13.3.0-patches-2.tar.xz 44440 BLAKE2B ebde73f6c3cd1a5fdc5bbce36414a59dda0925cba9d422d3689fc9c14fece44ee2391982a674411aa99bf47ffd49200f3ce51cc908beb8298adfff78e709a84c SHA512 eb56e0d7e69b5c3cca21f4cbff21c1204cf64ede7e66d689f45cf5ff37de8a59f24eb1f4b30d9c4222fd4126654fe4ffc146851f504761014995553c1202e8fd DIST gcc-14-20241221.tar.xz 88198252 BLAKE2B 7491c2e1c8885e201859143bdf5cae95af4c0db77709ec7d761ad535df30042f5deb8488ba7c508de3673e4b0f2af1de8d17476f39cd47b745ddccec6a9e4470 SHA512 91fe1e1d1f8e8fad64930a2eadf942a542bd42f841fceb49f475bccac00f04692b8cd38821ea9ee05f78b5c51001d8bd39df5f71f3a3d89aab8980019cea9be8 -DIST gcc-14-20250222.tar.xz 88217556 BLAKE2B 38023332b91bf6ff50d06b0967f7c4ed2f511ffd6cf29cc09a429572a2a69db39f3e6e0e0067752012d105abbbd64c17d21f1c6086e7754c9e90fa94343384f9 SHA512 517abef61c8a45a19fc3bc5aec276a82bed3e4d3e1cd2f468c9a5e92b8b727bf90c5914507b1c5b58721ee29dc6e4756184bc6a1ebef7b4800ff2e08762e5fe4 DIST gcc-14-20250301.tar.xz 88230928 BLAKE2B 2b65e7cccbf431a74df73adac53995873e78240d7abd97e9c9c576806c389b3c1abb6d47710a25a26f2ee399de750a07c3fb7916a580875d08a3a83354d89c1c SHA512 6b2afe19ce95a595307ae10b89054927116d33b499f1ef8233936d719271c04cb8f66890068ef2252c59ab0276dd0e6210990cb88abdfb4965818c25949f431e +DIST gcc-14-20250308.tar.xz 88224372 BLAKE2B d5b76b553cc48aa16a4d00fb1ba232856a52deef32049a10b9d2ffe7a010a5afbc782ad1ebec0a2546ec74703e0afabea936d81180b19ce8c4786d07b0495bf2 SHA512 900a43be42471e6d9484dbfdc972065fcd342908d0115f28edb35ff371e3f4ae0e219e99a4ecd52bcd23a156b3df2da80d508e2236cbb7495ae3df655154dc9c +DIST gcc-14-20250315.tar.xz 88211476 BLAKE2B e99ef61416fc5fdec4e2c65257bf36e8d2e8f8a61e558dd989682e53c9d33253aca897834f0fd7060b1055f0cb7accd88a41db96e03d7f924d76cbd51dd8c1a8 SHA512 2c288ff52d730e2a8bb4600519cc2ddb1de140377c7dccefa7f268032b86c4f51b87f563abc0d6393bb7a2d7de5d0d2d6f7105869e9c998ae33479dcec7b0f39 DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25 DIST gcc-14.2.0-patches-7.tar.xz 14244 BLAKE2B 11236e91e1fe83fec8ffaa40ec0cdd4b52a00a951e9aa9a7a0a932b234b8f1a9603333a7ccf55859f4ef53dd4d8ad1fd5c1d2514b6e45fce5b86bb58622a0ecc SHA512 5a4d86d943e31fa068b5a784c0132bd83c23243dcb3cf972557a42e004469a415e1b3185f31b1bb36f916594d475f266a2fda031a414e4a15e0bbfe471269eee DIST gcc-14.2.0-patches-8.tar.xz 14540 BLAKE2B 09f66035343d4cab694b8ab382170f8e2d546ddffedf3477f26edbd6a798ddf94294f569c2661729d40088d590bc17a4eb651710d8d9f66f33703734a1a82b67 SHA512 7a9a2724ef8db3c57b033d90751192969c16e5eaa8f4777b7f16470222ff3a18771b461bd89feaad701e7f0d573b883b487981588129933c732fb76117728b86 -DIST gcc-15-20250216.tar.xz 91404792 BLAKE2B 1a007a432c7f7ac6ba0169caf2561e26267ae5c75403ecd52227dbee255eff4c1bca5db9d6ce2e772ee357dc06e648d7ebfb3629117b13d48343a474a17901c6 SHA512 8dcb3968e157a2cb6a06e4ba76a0fd95936025d99f48333aacc554f347d19df8e6b9a0c9c454acd730a5608122ff4c12a712ccdf09919f8e310cf6688c00df84 -DIST gcc-15-20250223.tar.xz 91424896 BLAKE2B 0527c35ef3e24a9defe99bdccc39ba4c839cd867428f5424e3f8089381b3c3f68407bc2e8ddb9db72ea4860deed558b1ae584a41fa0623d127a055e9227d2216 SHA512 7e3296bcf7ed7868a5d4540525143995d6fd7d7144e223ae3666e3e4e716eef6ef1ea0389527df6d410442fc998ad5db6e07f52582819dfeadb0cba2d87d3208 -DIST gcc-15-20250302.tar.xz 91196748 BLAKE2B d6eef1753179f813ef1908c4ddc56144161abde36e602930bf4e53cccc7c352ee882bfa376528f20c34aa3544b1cb703c0fa062bb67245b0a3499125d4dd2bfc SHA512 407857cfe454cfa690eab0b01183811c7ef618921b64152f322e67bd27b708e57ee3de57274827340e387c5f906643bf2dc362b541d4d08f6a7283bc3da8bcb3 +DIST gcc-15-20250309.tar.xz 90853908 BLAKE2B 403b9b3a2eb1ed5d23558eff000784b8b6345c419b9050d68e38343a30ceb58c7ddaebb44c345668c98e19f66c1dd1edcc22a3a911754cb85f8fbfc6559ba3f1 SHA512 b20760997cf8111429524ca1400e1a23c328e303a8b4652cd859dcc3dc3e2dd11c72cf9e1b744c88374ebdb9fbb90f217ffe892eca24e581b781e2741b177d04 +DIST gcc-15-20250316.tar.xz 91424124 BLAKE2B 4a33b98d04961a8dd2bdc2890d0e1547902fc6bba63cea1b995bc82c6ef1b384a0843792961cd77162cae948808d41c2d5758f526371bbc501143c575e683a10 SHA512 5bd5a524b76a523a1979054bebc10ddbe3dce4c1f905b123dc8da983506c4cefb34cc035234845c021d4f7b3110dd5a8383da9c134af0bc54a154a0cdac8eea5 DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de DIST gcc-15.0.0-patches-46.tar.xz 22212 BLAKE2B 159b2693ded0b1dbddd271ca56d7f6db3569a8f79155521737b968ad131eee2730d3441dacef821b9dcd31b17ca0bf16a7b24001e7cb4ae1b36c55750184a3f6 SHA512 26d293ee368c75570e606949480feed18a69baad4687beaf2f50629bfc72d542bbce4b1cb6580fe7e578409a108891dc9762bb15c53b611434c83db5dd83d695 +DIST gcc-15.0.0-patches-47.tar.xz 16456 BLAKE2B c1b60eb5b0717f74ca528462e7cddfc6c2386cc122e8d0394152e974e092ae7c29bcfd96e7dbfde85aaa9194950dd867aef59fea17f1be1bb0f9f30eb192cd3f SHA512 c2f74c561eaa5b158de44b251116a923f3e81e5c5b6126d7cb387211c83697813fc22695ae36d245844e3e0dd2a6076fd710fbbed39965a151209a34812ba752 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-15.0.1_pre20250302-firefox-ice.patch b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-15.0.1_pre20250302-firefox-ice.patch new file mode 100644 index 0000000000..6fbc91e926 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-15.0.1_pre20250302-firefox-ice.patch @@ -0,0 +1,99 @@ +https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=f22e89167b3abfbf6d67f42fc4d689d8ffdc1810 +https://gcc.gnu.org/PR119067 + +From f22e89167b3abfbf6d67f42fc4d689d8ffdc1810 Mon Sep 17 00:00:00 2001 +From: Richard Biener +Date: Mon, 3 Mar 2025 09:54:15 +0100 +Subject: [PATCH] ipa/119067 - bogus TYPE_PRECISION check on VECTOR_TYPE + +odr_types_equivalent_p can end up using TYPE_PRECISION on vector +types which is a no-go. The following instead uses TYPE_VECTOR_SUBPARTS +for vector types so we also end up comparing the number of vector elements. + + PR ipa/119067 + * ipa-devirt.cc (odr_types_equivalent_p): Check + TYPE_VECTOR_SUBPARTS for vectors. + + * g++.dg/lto/pr119067_0.C: New testcase. + * g++.dg/lto/pr119067_1.C: Likewise. +--- + gcc/ipa-devirt.cc | 10 +++++++++- + gcc/testsuite/g++.dg/lto/pr119067_0.C | 22 ++++++++++++++++++++++ + gcc/testsuite/g++.dg/lto/pr119067_1.C | 10 ++++++++++ + 3 files changed, 41 insertions(+), 1 deletion(-) + create mode 100644 gcc/testsuite/g++.dg/lto/pr119067_0.C + create mode 100644 gcc/testsuite/g++.dg/lto/pr119067_1.C + +diff --git a/gcc/ipa-devirt.cc b/gcc/ipa-devirt.cc +index c31658f57ef2..532e25e87c60 100644 +--- a/gcc/ipa-devirt.cc ++++ b/gcc/ipa-devirt.cc +@@ -1259,13 +1259,21 @@ odr_types_equivalent_p (tree t1, tree t2, bool warn, bool *warned, + || TREE_CODE (t1) == OFFSET_TYPE + || POINTER_TYPE_P (t1)) + { +- if (TYPE_PRECISION (t1) != TYPE_PRECISION (t2)) ++ if (!VECTOR_TYPE_P (t1) && TYPE_PRECISION (t1) != TYPE_PRECISION (t2)) + { + warn_odr (t1, t2, NULL, NULL, warn, warned, + G_("a type with different precision is defined " + "in another translation unit")); + return false; + } ++ if (VECTOR_TYPE_P (t1) ++ && maybe_ne (TYPE_VECTOR_SUBPARTS (t1), TYPE_VECTOR_SUBPARTS (t2))) ++ { ++ warn_odr (t1, t2, NULL, NULL, warn, warned, ++ G_("a vector type with different number of elements " ++ "is defined in another translation unit")); ++ return false; ++ } + if (TYPE_UNSIGNED (t1) != TYPE_UNSIGNED (t2)) + { + warn_odr (t1, t2, NULL, NULL, warn, warned, +diff --git a/gcc/testsuite/g++.dg/lto/pr119067_0.C b/gcc/testsuite/g++.dg/lto/pr119067_0.C +new file mode 100644 +index 000000000000..e0f813ceffed +--- /dev/null ++++ b/gcc/testsuite/g++.dg/lto/pr119067_0.C +@@ -0,0 +1,22 @@ ++/* { dg-lto-do link } */ ++/* { dg-skip-if "" { ! { x86_64-*-* i?86-*-* } } } */ ++/* { dg-require-effective-target avx2 } */ ++/* { dg-require-effective-target shared } */ ++/* { dg-lto-options { { -O2 -fPIC -flto } } } */ ++/* { dg-extra-ld-options { -shared } } */ ++ ++#pragma GCC push_options ++#pragma GCC target("avx2") ++typedef char __v32qi __attribute__ ((__vector_size__ (32))); ++struct ff ++{ ++ __v32qi t; ++}; ++__v32qi g(struct ff a); ++ ++__v32qi h(__v32qi a) ++{ ++ struct ff t = {a}; ++ return g(t); ++} ++#pragma GCC pop_options +diff --git a/gcc/testsuite/g++.dg/lto/pr119067_1.C b/gcc/testsuite/g++.dg/lto/pr119067_1.C +new file mode 100644 +index 000000000000..d8e2935fa24d +--- /dev/null ++++ b/gcc/testsuite/g++.dg/lto/pr119067_1.C +@@ -0,0 +1,10 @@ ++/* { dg-options "-mavx2" } */ ++ ++typedef char __v32qi __attribute__ ((__vector_size__ (32))); ++struct ff ++{ ++ __v32qi t; ++}; ++__v32qi g(struct ff a) { ++ return a.t; ++} +-- +2.43.5 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-15.0.1_pre20250302-firefox-pgo-ice.patch b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-15.0.1_pre20250302-firefox-pgo-ice.patch new file mode 100644 index 0000000000..9486b69147 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-15.0.1_pre20250302-firefox-pgo-ice.patch @@ -0,0 +1,58 @@ +https://inbox.sourceware.org/gcc-patches/ri6bjui45il.fsf@virgil.suse.cz/ + +From 833d679c3c071b78dfb22015fe03d2cecfd650ec Mon Sep 17 00:00:00 2001 +Message-ID: <833d679c3c071b78dfb22015fe03d2cecfd650ec.1741019831.git.sam@gentoo.org> +From: Martin Jambor +Date: Mon, 3 Mar 2025 14:18:10 +0100 +Subject: [PATCH] ipa-cp: Avoid ICE when redistributing nodes among edges to + recursive clones (PR 118318) + +Hi, + +PR 118318 reported an ICE during PGO build of Firefox when IPA-CP, in +the final stages of update_counts_for_self_gen_clones where it +attempts to guess how to distribute profile count among clones created +for recursive edges and the various edges that are created in the +process. If one such edge has profile count of kind GUESSED_GLOBAL0, +the compatibility check in the operator+ will lead to an ICE. After +discussing the situation with Honza, we concluded that there is little +more we can do other than check for this situation before touching the +edge count, so this is what this patch does. + +Bootstrapped and LTO-profile-bootstrapped and tested on x86_64. OK for +master? (Should I then backport this to active release branches? I +guess it would make sense.) + +Thanks, + +Martin + +gcc/ChangeLog: + +2025-02-28 Martin Jambor + +PR ipa/118318 + * ipa-cp.cc (adjust_clone_incoming_counts): Add a compatible_p check. +--- + gcc/ipa-cp.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc +index 3c994f24f540..264568989a96 100644 +--- a/gcc/ipa-cp.cc ++++ b/gcc/ipa-cp.cc +@@ -4638,7 +4638,8 @@ adjust_clone_incoming_counts (cgraph_node *node, + cs->count = cs->count.combine_with_ipa_count (sum); + } + else if (!desc->processed_edges->contains (cs) +- && cs->caller->clone_of == desc->orig) ++ && cs->caller->clone_of == desc->orig ++ && cs->count.compatible_p (desc->count)) + { + cs->count += desc->count; + if (dump_file) + +base-commit: f1c30c6213fb228f1e8b5973d10c868b834a4acd +-- +2.48.1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.1_p20250220.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.1_p20250306.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.1_p20250220.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.1_p20250306.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.1_p20250313.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.1_p20250313.ebuild new file mode 100644 index 0000000000..83011b194d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.1_p20250313.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +TOOLCHAIN_HAS_TESTS=1 +PATCH_GCC_VER="12.4.0" +PATCH_VER="2" +MUSL_VER="1" +MUSL_GCC_VER="12.4.0" +PYTHON_COMPAT=( python3_{10..12} ) + +if [[ ${PV} == *.9999 ]] ; then + MY_PV_2=$(ver_cut 2) + MY_PV_3=1 + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + MY_PV_3=0 + else + MY_PV_2=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} +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="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain + +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=releases/gcc-$(ver_cut 1) +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + :; +fi + +if [[ ${CATEGORY} != cross-* ]] ; then + # 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}" +fi + +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.3.1_p20250221.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.3.1_p20250307.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.3.1_p20250221.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.3.1_p20250307.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250223-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.3.1_p20250314.ebuild similarity index 73% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250223-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.3.1_p20250314.ebuild index a4f89c7910..ac245b9b41 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250223-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.3.1_p20250314.ebuild @@ -5,13 +5,25 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" TOOLCHAIN_HAS_TESTS=1 -PATCH_GCC_VER="15.0.0" -PATCH_VER="46" +PATCH_GCC_VER="13.3.0" +MUSL_GCC_VER="13.2.0" +PATCH_VER="2" MUSL_VER="2" -MUSL_GCC_VER="15.0.0" PYTHON_COMPAT=( python3_{10..12} ) -if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then +if [[ ${PV} == *.9999 ]] ; then + MY_PV_2=$(ver_cut 2) + MY_PV_3=1 + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + MY_PV_3=0 + else + MY_PV_2=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} +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} @@ -24,7 +36,7 @@ inherit toolchain if tc_is_live ; then # Needs to be after inherit (for now?), bug #830908 - EGIT_BRANCH=master + EGIT_BRANCH=releases/gcc-$(ver_cut 1) elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then # Don't keyword live ebuilds #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" @@ -48,6 +60,7 @@ src_prepare() { done toolchain_src_prepare - eapply "${FILESDIR}"/${P}-c-Fix-range-for-with-PMFs-PR118923.patch + + eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch eapply_user } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.2.1_p20250222.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.2.1_p20250308.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.2.1_p20250222.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.2.1_p20250308.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250223.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.2.1_p20250315.ebuild similarity index 78% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250223.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.2.1_p20250315.ebuild index 876aa1eb35..8797a7ea31 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250223.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.2.1_p20250315.ebuild @@ -5,10 +5,10 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" TOOLCHAIN_HAS_TESTS=1 -PATCH_GCC_VER="15.0.0" -PATCH_VER="46" -MUSL_VER="2" -MUSL_GCC_VER="15.0.0" +PATCH_GCC_VER="14.2.0" +PATCH_VER="8" +MUSL_VER="1" +MUSL_GCC_VER="14.1.0" PYTHON_COMPAT=( python3_{10..12} ) if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then @@ -24,10 +24,10 @@ inherit toolchain if tc_is_live ; then # Needs to be after inherit (for now?), bug #830908 - EGIT_BRANCH=master + EGIT_BRANCH=releases/gcc-$(ver_cut 1) elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - # Don't keyword live ebuilds - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + # m68k doesnt build (ICE, bug 932733) + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" :; fi @@ -49,5 +49,6 @@ src_prepare() { toolchain_src_prepare + eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch eapply_user } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250302.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250309.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250302.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250309.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250216.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250316.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250216.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250316.ebuild index 876aa1eb35..2b8242c47e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250216.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-15.0.1_pre20250316.ebuild @@ -6,7 +6,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" TOOLCHAIN_HAS_TESTS=1 PATCH_GCC_VER="15.0.0" -PATCH_VER="46" +PATCH_VER="47" MUSL_VER="2" MUSL_GCC_VER="15.0.0" PYTHON_COMPAT=( python3_{10..12} ) @@ -48,6 +48,5 @@ src_prepare() { done toolchain_src_prepare - eapply_user } 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 9b51b891ae..142253a37e 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 @@ -34,6 +34,7 @@ On arm64, GCC will set -mbranch-protection=standard by default when building software. + Enable support for the COBOL programming language Enable support for the D programming language Enables GCC's 'checking' facility via --enable-checking=yes,extra,rtl. From 92c8ba507bb54e7921acd806c0406ad10f90f58b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:44 +0000 Subject: [PATCH 122/153] sys-devel/gettext: Sync with Gentoo It's from Gentoo commit 6bce046350f86bf30c13658f312b9b70eddbc8f5. --- .../portage-stable/sys-devel/gettext/Manifest | 2 - .../gettext/gettext-0.22.4-r1.ebuild | 189 ------------------ .../sys-devel/gettext/gettext-0.22.4.ebuild | 189 ------------------ 3 files changed, 380 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.22.4-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.22.4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/Manifest index f4a76d0f32..fc00ba8a2f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/Manifest @@ -1,7 +1,5 @@ DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0 -DIST gettext-0.22.4.tar.xz 10255384 BLAKE2B 3f93aa5aef8e40d2e01acaa5aeed11efefd0de43ea26d084a0b9e743019685f7584d8e1bf05c1fd5772a5576d21ee1f052b81366f52c7827b6d14bd4d9890edc SHA512 0f3620b1621b85b3df9e372885c2f040c8a91ec0b2d4e16978459a8a2a152318a0e6f5fefb8d971bad80c437e7ee8ac8c24edc4de0ab86e729528b8a2ac62c51 -DIST gettext-0.22.4.tar.xz.sig 833 BLAKE2B fbb00b53c807934a11263c120861971fffebbd39689eda1fae0fb956476e69c3fb6799440cbf3acfcf43ecea2c134ea4dadb95becbac98badb43e546f3c8e9fb SHA512 a774c98de643b1ea3df645e451878652c2baa5cd786642aa457e6d5f5c44787cb1231eb15ad4390acdf314822633acaffffaa853eb69cbbc72c3b79b547a8854 DIST gettext-0.22.5.tar.xz 10270724 BLAKE2B 18c383518f5a78b5c04cf76de976524da2a87a892a30d6386778bb4c7dd526ffc3f14f484906c5d3a513b7caf76ea560e53962b325e552182d6940055d798f24 SHA512 a60999bb9d09441f138214d87acb7e59aab81e765bb9253a77c54902681c5de164a5a04de2a9778dfb479dbdefaab2d5de1fbaf6095c555c43e7e9fd7a1c09bd DIST gettext-0.22.5.tar.xz.sig 833 BLAKE2B bb3e5ced34ab109f498347a3567103fe3491f69addb4a5ce25bf854fae1a11340eef1a9826b369d2416b53e5f7065aeebdb1609615f064cf7fb4151e82a5b4e5 SHA512 87f1df69206702be928b09a59a19ae4c23072cbc78ea16e76bfc4c929de76a3c0bb8e4eb2c3100c6e7b3b51d23e3b0e484c7e1d576ba7e25fd887934dc9ed8f7 DIST gettext-0.23.1.tar.xz 11038556 BLAKE2B 08d10340f3d855a87a96594c6f2dcf72925394f02e86235090f8d272e0a27ce32e57a0fbaed61aaf61d7328ff30be076dccaecaa13832d8db3ec0a51786780b9 SHA512 d75908f73eabe36c01d72d342ca694dbefad5f43da54f0ccb43bfd0518baff5becc8f50e787f21fadb7c29b3123638e4559334ea4f8e48a97107e8c5e22453b6 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.22.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.22.4-r1.ebuild deleted file mode 100644 index 47456395d9..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.22.4-r1.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Note: Keep version bumps in sync with dev-libs/libintl. - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gettext.asc -inherit java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs - -DESCRIPTION="GNU locale utilities" -HOMEPAGE="https://www.gnu.org/software/gettext/" - -if [[ ${PV} == *_rc* ]] ; then - SRC_URI=" - https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz - verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz.sig ) - " - S="${WORKDIR}/${P/_/-}" -else - SRC_URI=" - mirror://gnu/${PN}/${P}.tar.xz - verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) - " - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -# Only libasprintf is under the LGPL (and libintl is in a sep package), -# so put that license behind USE=cxx. -LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" -SLOT="0" -IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs xattr" - -# only runtime goes multilib -# Note: The version of libxml2 corresponds to the version bundled via gnulib. -# If the build detects too old of a system version, it will end up falling back -# to the bundled copy. #596918 -# Note: expat lacks a subslot because it is dynamically loaded at runtime. We -# would depend on older subslots if they were available (based on the ABIs that -# are explicitly handled), but expat doesn't currently use subslots. -DEPEND=" - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.3:= - dev-libs/expat - acl? ( virtual/acl ) - ncurses? ( sys-libs/ncurses:= ) - java? ( >=virtual/jdk-1.8:* ) - xattr? ( sys-apps/attr ) -" -RDEPEND=" - ${DEPEND} - git? ( dev-vcs/git ) - java? ( >=virtual/jre-1.8:* ) -" -BDEPEND=" - git? ( dev-vcs/git ) - verify-sig? ( sec-keys/openpgp-keys-gettext ) -" -PDEPEND="emacs? ( app-emacs/po-mode )" - -MULTILIB_WRAPPED_HEADERS=( - # only installed for native ABI - /usr/include/gettext-po.h - - /usr/include/autosprintf.h - /usr/include/textstyle.h - /usr/include/textstyle/stdbool.h - /usr/include/textstyle/version.h - /usr/include/textstyle/woe32dll.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch -) - -QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - java-pkg-opt-2_src_prepare - - default - - # gettext-0.21.1-java-autoconf.patch changes - # gettext-{runtime,tools}/configure.ac and the corresponding - # configure scripts. Avoid regenerating other autotools output. - #touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die - # Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac - #touch -c configure || die - - elibtoolize - - if use elibc_musl || use elibc_Darwin; then - eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch - fi -} - -multilib_src_configure() { - local myconf=( - # switches common to runtime and top-level - --cache-file="${BUILD_DIR}"/config.cache - #--docdir="\$(datarootdir)/doc/${PF}" - - # Emacs support is now in a separate package - --without-emacs - --without-lispdir - # glib depends on us so avoid circular deps - --with-included-glib - # libcroco depends on glib which ... ^^^ - --with-included-libcroco - # this will _disable_ libunistring (since it is not bundled), - # see bug #326477 - --with-included-libunistring - # Never build libintl since it's in dev-libs/libintl now. - --without-included-gettext - # Never build bundled copy of libxml2. - --without-included-libxml - - --disable-csharp - --without-cvs - - $(use_enable acl) - $(use_enable cxx c++) - $(use_enable cxx libasprintf) - $(use_with git) - $(multilib_native_use_enable java) - $(use_enable ncurses curses) - $(use_enable nls) - $(use_enable openmp) - $(use_enable static-libs static) - $(use_enable xattr attr) - ) - - local ECONF_SOURCE="${S}" - if ! multilib_is_native_abi ; then - # for non-native ABIs, we build runtime only - ECONF_SOURCE+=/gettext-runtime - fi - - econf "${myconf[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi ; then - dosym msgfmt /usr/bin/gmsgfmt # bug #43435 - dobin gettext-tools/misc/gettextize - fi - - # 909041 never install libintl which upstream insists on building - rm -f "${ED}"/usr/$(get_libdir)/libintl.* "${ED}"/usr/include/libintl.h -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die - - if use java ; then - java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar - rm "${ED}"/usr/share/${PN}/*.jar || die - rm "${ED}"/usr/share/${PN}/*.class || die - if use doc ; then - java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2 - fi - fi - - dodoc AUTHORS ChangeLog NEWS README THANKS - - if use doc ; then - docinto html - dodoc "${ED}"/usr/share/doc/${PF}/*.html - else - rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} - fi - rm "${ED}"/usr/share/doc/${PF}/*.html || die -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.22.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.22.4.ebuild deleted file mode 100644 index 633e006ac3..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.22.4.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Note: Keep version bumps in sync with dev-libs/libintl. - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gettext.asc -inherit java-pkg-opt-2 libtool multilib-minimal verify-sig toolchain-funcs - -DESCRIPTION="GNU locale utilities" -HOMEPAGE="https://www.gnu.org/software/gettext/" - -if [[ ${PV} == *_rc* ]] ; then - SRC_URI=" - https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz - verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz.sig ) - " - S="${WORKDIR}/${P/_/-}" -else - SRC_URI=" - mirror://gnu/${PN}/${P}.tar.xz - verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) - " - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -# Only libasprintf is under the LGPL (and libintl is in a sep package), -# so put that license behind USE=cxx. -LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" -SLOT="0" -IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs xattr" - -# only runtime goes multilib -# Note: The version of libxml2 corresponds to the version bundled via gnulib. -# If the build detects too old of a system version, it will end up falling back -# to the bundled copy. #596918 -# Note: expat lacks a subslot because it is dynamically loaded at runtime. We -# would depend on older subslots if they were available (based on the ABIs that -# are explicitly handled), but expat doesn't currently use subslots. -DEPEND=" - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.3:= - dev-libs/expat - acl? ( virtual/acl ) - ncurses? ( sys-libs/ncurses:= ) - java? ( virtual/jdk:1.8 ) - xattr? ( sys-apps/attr ) -" -RDEPEND=" - ${DEPEND} - git? ( dev-vcs/git ) - java? ( virtual/jre:1.8 ) -" -BDEPEND=" - git? ( dev-vcs/git ) - verify-sig? ( sec-keys/openpgp-keys-gettext ) -" -PDEPEND="emacs? ( app-emacs/po-mode )" - -MULTILIB_WRAPPED_HEADERS=( - # only installed for native ABI - /usr/include/gettext-po.h - - /usr/include/autosprintf.h - /usr/include/textstyle.h - /usr/include/textstyle/stdbool.h - /usr/include/textstyle/version.h - /usr/include/textstyle/woe32dll.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch -) - -QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - java-pkg-opt-2_src_prepare - - default - - # gettext-0.21.1-java-autoconf.patch changes - # gettext-{runtime,tools}/configure.ac and the corresponding - # configure scripts. Avoid regenerating other autotools output. - #touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die - # Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac - #touch -c configure || die - - elibtoolize - - if use elibc_musl || use elibc_Darwin; then - eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch - fi -} - -multilib_src_configure() { - local myconf=( - # switches common to runtime and top-level - --cache-file="${BUILD_DIR}"/config.cache - #--docdir="\$(datarootdir)/doc/${PF}" - - # Emacs support is now in a separate package - --without-emacs - --without-lispdir - # glib depends on us so avoid circular deps - --with-included-glib - # libcroco depends on glib which ... ^^^ - --with-included-libcroco - # this will _disable_ libunistring (since it is not bundled), - # see bug #326477 - --with-included-libunistring - # Never build libintl since it's in dev-libs/libintl now. - --without-included-gettext - # Never build bundled copy of libxml2. - --without-included-libxml - - --disable-csharp - --without-cvs - - $(use_enable acl) - $(use_enable cxx c++) - $(use_enable cxx libasprintf) - $(use_with git) - $(multilib_native_use_enable java) - $(use_enable ncurses curses) - $(use_enable nls) - $(use_enable openmp) - $(use_enable static-libs static) - $(use_enable xattr attr) - ) - - local ECONF_SOURCE="${S}" - if ! multilib_is_native_abi ; then - # for non-native ABIs, we build runtime only - ECONF_SOURCE+=/gettext-runtime - fi - - econf "${myconf[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi ; then - dosym msgfmt /usr/bin/gmsgfmt # bug #43435 - dobin gettext-tools/misc/gettextize - fi - - # 909041 never install libintl which upstream insists on building - rm -f "${ED}"/usr/$(get_libdir)/libintl.* "${ED}"/usr/include/libintl.h -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die - - if use java ; then - java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar - rm "${ED}"/usr/share/${PN}/*.jar || die - rm "${ED}"/usr/share/${PN}/*.class || die - if use doc ; then - java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2 - fi - fi - - dodoc AUTHORS ChangeLog NEWS README THANKS - - if use doc ; then - docinto html - dodoc "${ED}"/usr/share/doc/${PF}/*.html - else - rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} - fi - rm "${ED}"/usr/share/doc/${PF}/*.html || die -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -} From c677308d3196c233cc2f144f6d3e0f87e6a8d084 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:44 +0000 Subject: [PATCH 123/153] sys-devel/gnuconfig: Sync with Gentoo It's from Gentoo commit 622ed84219f52301934a99bf063a9ba9e13f0403. --- .../sys-devel/gnuconfig/Manifest | 2 - .../gnuconfig/gnuconfig-20230731.ebuild | 49 ------------------- .../gnuconfig/gnuconfig-20240101.ebuild | 49 ------------------- 3 files changed, 100 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20230731.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20240101.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/Manifest index 97821fc2f7..1f95d4cec9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/Manifest @@ -1,3 +1 @@ -DIST gnuconfig-20230731.tar.xz 73112 BLAKE2B c6502d6b339e56440dbfc9abb0ba49e3eec5a573c5e44779dd326e6f11b55b7fc3a6d99fec73abbcc271e8f6f125699ce87f512cb3a825144307cf820df0067a SHA512 d8e24a30f86f1983c69a37a901e2357a0aefbe15fcd3f8a331d1c6f8eabc81b7436930055756a764ae874e406090d8029403f1c0faa3737acb94bd937cd577ef -DIST gnuconfig-20240101.tar.xz 76992 BLAKE2B a42e35c9858ac1eca409b29ecd71c787adad94bd977a35a8f74c870b3632b1031cd7c00e022c7837a8705a50316d3f618bfaedf569b63b4f75a33fc638330706 SHA512 2e6f1f83454335e2c111866bed2660d86919061c2e047c79d5e191ecb9411a28c0f269e8fddd8a212d38a2d0c4114e2a432e69bcbf8c7aee671db1ce15b34ae8 DIST gnuconfig-20240728.tar.xz 82360 BLAKE2B 476cabe032305adc916dffa39f30f07ac8249449e79da06763f08af9b642399c5c08bd5cf6b7229d63ba36b55e0ca75692b5db058ae0aa75b6b6370f12209aba SHA512 a43067a6f2a7f8d055122aefef2b0d28314c16871455e9223b8429a428ec6b4383eefe8fb50ff00d7c4c39710c6fb9fa81c3c84f3e6f5f58cbd1cf475896135e diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20230731.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20230731.ebuild deleted file mode 100644 index 24078b09f5..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20230731.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == 99999999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/r/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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - S="${WORKDIR}" -fi - -DESCRIPTION="Updated config.sub and config.guess file from GNU" -HOMEPAGE="https://savannah.gnu.org/projects/config" - -LICENSE="GPL-3+-with-autoconf-exception" -SLOT="0" - -maint_pkg_create() { - cd "${S}" || die - - emake ChangeLog - local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog) - [[ ${#ver} != 8 ]] && die "invalid version '${ver}'" - - local tar="${T}/gnuconfig-${ver}.tar.xz" - tar -Jcf "${tar}" ./* || die "creating tar failed" - einfo "Packaged tar now available:" - einfo "$(du -b "${tar}")" -} - -src_unpack() { - if [[ ${PV} == 99999999 ]] ; then - git-r3_src_unpack - maint_pkg_create - else - unpack ${A} - fi -} - -src_install() { - insinto /usr/share/${PN} - doins config.{sub,guess} - fperms +x /usr/share/${PN}/config.{sub,guess} - dodoc ChangeLog -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20240101.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20240101.ebuild deleted file mode 100644 index f6a1f2f14c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20240101.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == 99999999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/r/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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - S="${WORKDIR}" -fi - -DESCRIPTION="Updated config.sub and config.guess file from GNU" -HOMEPAGE="https://savannah.gnu.org/projects/config" - -LICENSE="GPL-3+-with-autoconf-exception" -SLOT="0" - -maint_pkg_create() { - cd "${S}" || die - - emake ChangeLog - local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog) - [[ ${#ver} != 8 ]] && die "invalid version '${ver}'" - - local tar="${T}/gnuconfig-${ver}.tar.xz" - tar -Jcf "${tar}" ./* || die "creating tar failed" - einfo "Packaged tar now available:" - einfo "$(du -b "${tar}")" -} - -src_unpack() { - if [[ ${PV} == 99999999 ]] ; then - git-r3_src_unpack - maint_pkg_create - else - unpack ${A} - fi -} - -src_install() { - insinto /usr/share/${PN} - doins config.{sub,guess} - fperms +x /usr/share/${PN}/config.{sub,guess} - dodoc ChangeLog -} From 58471e889ae14e06a77f3c4ffbb9217729a19cf9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:45 +0000 Subject: [PATCH 124/153] sys-devel/patch: Sync with Gentoo It's from Gentoo commit 1282bd7f5144adb0d7aded2e7bc3df7f590c7028. --- .../portage-stable/sys-devel/patch/patch-2.7.6-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r7.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r7.ebuild index 61ce4a002a..42dec07a68 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r7.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r7.ebuild @@ -15,7 +15,7 @@ else SRC_URI="mirror://gnu/patch/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-3+" From c68d320dc0a706077c6fb379f10ae77603971733 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:45 +0000 Subject: [PATCH 125/153] sys-firmware/edk2-bin: Sync with Gentoo It's from Gentoo commit fbf106b6a2e262d470a298736a5730ad2c70548f. --- .../sys-firmware/edk2-bin/edk2-bin-202411.ebuild | 2 +- .../portage-stable/sys-firmware/edk2-bin/metadata.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-bin/edk2-bin-202411.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-bin/edk2-bin-202411.ebuild index c3cc77f723..de2d5e2553 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-bin/edk2-bin-202411.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-bin/edk2-bin-202411.ebuild @@ -14,7 +14,7 @@ SRC_URI=$(printf "https://dev.gentoo.org/~chewi/distfiles/${BINPKG}-%s.xpak\n" $ S="${WORKDIR}" LICENSE="BSD-2 MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~loong ~ppc ppc64 ~riscv x86" RDEPEND="!sys-firmware/edk2" diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-bin/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-bin/metadata.xml index 674a9e5d13..aca18aaa2c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-bin/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-bin/metadata.xml @@ -5,6 +5,10 @@ virtualization@gentoo.org Gentoo Virtualization Project + + chewi@gentoo.org + James Le Cuirot + cpe:/a:tianocore:edk2 From 6b2227b0d3b167d7f3814819fa60ad9f698d9628 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:45 +0000 Subject: [PATCH 126/153] sys-firmware/intel-microcode: Sync with Gentoo It's from Gentoo commit d33f7aac0d401739b76dbb2b90ad5de150dd18ec. --- .../intel-microcode/intel-microcode-20240910_p20240915.ebuild | 2 +- .../intel-microcode/intel-microcode-20241112_p20241103.ebuild | 2 +- .../intel-microcode/intel-microcode-20250211_p20250211.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.ebuild index b2000fab7d..f99a41e15b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20240910_p20240915.ebuild @@ -311,7 +311,7 @@ pkg_postrm() { pkg_postinst() { if use initramfs; then if use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" --all else # Don't forget to umount /boot if it was previously mounted by us. mount-boot_pkg_postinst diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.ebuild index b2000fab7d..f99a41e15b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20241112_p20241103.ebuild @@ -311,7 +311,7 @@ pkg_postrm() { pkg_postinst() { if use initramfs; then if use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" --all else # Don't forget to umount /boot if it was previously mounted by us. mount-boot_pkg_postinst diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20250211_p20250211.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20250211_p20250211.ebuild index b2000fab7d..f99a41e15b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20250211_p20250211.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/intel-microcode/intel-microcode-20250211_p20250211.ebuild @@ -311,7 +311,7 @@ pkg_postrm() { pkg_postinst() { if use initramfs; then if use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" --all else # Don't forget to umount /boot if it was previously mounted by us. mount-boot_pkg_postinst From 42cd35108fa448d13431d2d1984b33013ea31976 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:11:51 +0000 Subject: [PATCH 127/153] sys-fs/e2fsprogs: Sync with Gentoo It's from Gentoo commit 42fb5995ca0803d523ff88171585ec436310cdd0. --- .../e2fsprogs/e2fsprogs-1.47.2-r1.ebuild | 173 ++++++++++++++++++ .../sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild | 2 +- 2 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r1.ebuild new file mode 100644 index 0000000000..0c21b2eeb0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r1.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal systemd toolchain-funcs udev + +DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="archive cron fuse nls static-libs test +tools" +RESTRICT="!test? ( test )" + +RDEPEND=" + !sys-libs/${PN}-libs + archive? ( app-arch/libarchive:= ) + cron? ( sys-fs/lvm2[lvm] ) + fuse? ( sys-fs/fuse:3 ) + nls? ( virtual/libintl ) + tools? ( sys-apps/util-linux ) +" +# For testing lib/ext2fs, lib/support/libsupport.a is required, which +# unconditionally includes '' from sys-apps/util-linux. +DEPEND=" + ${RDEPEND} + test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) +" +BDEPEND=" + sys-apps/texinfo + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ext2fs/ext2_types.h +) + +PATCHES=( + "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854 + + # Upstream patches (can usually removed with next version bump) +) + +src_prepare() { + default + + cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" + + # Get rid of doc -- we don't use them. This also prevents a sandbox + # violation due to mktexfmt invocation + rm -r doc || die "Failed to remove doc dir" + + cat <<-'EOF' > tests/m_rootdir_acl/script || die + echo "$test_name: $test_description: skipped (bgo#905221, fails on btrfs)" + return 0 + EOF + + # Prevent included intl cruft from building, bug #81096 + sed -i -r \ + -e 's:@LIBINTL@:@LTLIBINTL@:' \ + MCONFIG.in || die 'intl cruft' +} + +multilib_src_configure() { + # Keep the package from doing silly things, bug #261411 + export VARTEXFONTS="${T}/fonts" + + local myeconfargs=( + --with-root-prefix="${EPREFIX}" + $(use_with cron crond-dir "${EPREFIX}/etc/cron.d") + --with-systemd-unit-dir="$(systemd_get_systemunitdir)" + --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d" + --enable-symlink-install + --enable-elf-shlibs + $(tc-has-tls || echo --disable-tls) + $(multilib_native_use_with archive libarchive direct) + $(multilib_native_use_enable fuse fuse2fs) + $(use_enable nls) + $(multilib_native_use_enable tools e2initrd-helper) + --disable-fsck + --disable-uuidd + --disable-lto + --with-pthread + --enable-largefile + ) + + # We use blkid/uuid from util-linux now + if use kernel_linux ; then + export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes + myeconfargs+=( --disable-lib{blkid,uuid} ) + fi + + ac_cv_path_LDCONFIG=: \ + ECONF_SOURCE="${S}" \ + CC="$(tc-getCC)" \ + BUILD_CC="$(tc-getBUILD_CC)" \ + BUILD_LD="$(tc-getBUILD_LD)" \ + econf "${myeconfargs[@]}" + + if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then + eerror "INTL sanity check failed, aborting build." + eerror "Please post your ${S}/config.log file as an" + eerror "attachment to https://bugs.gentoo.org/81096" + die "Preventing included intl cruft from building" + fi +} + +multilib_src_compile() { + # Parallel make issue #936493 + emake -C lib/et V=1 compile_et + emake -C lib/ext2fs V=1 ext2_err.h + + if multilib_is_native_abi && use tools ; then + emake V=1 + else + emake -C lib/et V=1 + emake -C lib/ss V=1 + emake -C lib/ext2fs V=1 + emake -C lib/e2p V=1 + fi +} + +multilib_src_test() { + if multilib_is_native_abi && use tools ; then + emake V=1 check + else + # Required by lib/ext2fs's check target + emake -C lib/support V=1 + + # For non-native, there's no binaries to test. Just libraries. + emake -C lib/et V=1 check + emake -C lib/ss V=1 check + emake -C lib/ext2fs V=1 check + emake -C lib/e2p V=1 check + fi +} + +multilib_src_install() { + if multilib_is_native_abi && use tools ; then + emake STRIP=':' V=1 DESTDIR="${D}" install + else + emake -C lib/et V=1 DESTDIR="${D}" install + emake -C lib/ss V=1 DESTDIR="${D}" install + emake -C lib/ext2fs V=1 DESTDIR="${D}" install + emake -C lib/e2p V=1 DESTDIR="${D}" install + fi + + # configure doesn't have an option to disable static libs + if ! use static-libs ; then + find "${ED}" -name '*.a' -delete || die + fi +} + +multilib_src_install_all() { + einstalldocs + + if use tools ; then + insinto /etc + doins "${FILESDIR}"/e2fsck.conf + fi +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild index eb92f18944..4a7c1a0427 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$ LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="archive cron fuse nls static-libs test +tools" RESTRICT="!test? ( test )" From 1ef3ffb20aa83b3d80eddcdd433aafbef6fe12d8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:01 +0000 Subject: [PATCH 128/153] sys-fs/xfsprogs: Sync with Gentoo It's from Gentoo commit f13e7f7a3607cfaf8e2e71efd3da4759e7e2facb. --- .../sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild | 5 +---- .../sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild | 10 ++++------ .../sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild | 8 +++----- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild index 118c09e2c9..eebeded6b0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -58,9 +58,6 @@ src_configure() { # bug 903611 use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - # Build fails with -O3 (bug #712698) - replace-flags -O3 -O2 - # Upstream does NOT support --disable-static anymore, # https://www.spinics.net/lists/linux-xfs/msg30185.html # https://www.spinics.net/lists/linux-xfs/msg30272.html diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild index d7ac475a1d..1f70ea3e72 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="icu libedit nls selinux static-libs" RDEPEND=" @@ -58,11 +58,9 @@ src_configure() { # Avoid automagic on libdevmapper (bug #709694) export ac_cv_search_dm_task_create=no - # bug 903611 - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - # Build fails with -O3 (bug #712698) - replace-flags -O3 -O2 + # bug 903611, 948468 + use elibc_musl && \ + append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX # Upstream does NOT support --disable-static anymore, # https://www.spinics.net/lists/linux-xfs/msg30185.html diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild index f2dfa068fb..b495f342e0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild @@ -62,11 +62,9 @@ src_configure() { # Avoid automagic on libdevmapper (bug #709694) export ac_cv_search_dm_task_create=no - # bug 903611 - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - # Build fails with -O3 (bug #712698) - replace-flags -O3 -O2 + # bug 903611, 948468 + use elibc_musl && \ + append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX # Upstream does NOT support --disable-static anymore, # https://www.spinics.net/lists/linux-xfs/msg30185.html From 82b2f523ac670ba5745fa556cc00309feb63017f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:02 +0000 Subject: [PATCH 129/153] sys-fs/zfs: Sync with Gentoo It's from Gentoo commit a2a143c389dd65d1eee71f6d7ade96a021de7354. --- .../portage-stable/sys-fs/zfs/Manifest | 6 +- .../sys-fs/zfs/zfs-2.2.5.ebuild | 310 ------------------ .../{zfs-2.2.6.ebuild => zfs-2.3.1.ebuild} | 8 +- 3 files changed, 5 insertions(+), 319 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/zfs/zfs-2.2.5.ebuild rename sdk_container/src/third_party/portage-stable/sys-fs/zfs/{zfs-2.2.6.ebuild => zfs-2.3.1.ebuild} (98%) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/zfs/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/zfs/Manifest index e2d6085d8a..a5d94a00f5 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/zfs/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-fs/zfs/Manifest @@ -1,10 +1,8 @@ DIST zfs-2.1.16.tar.gz 35187215 BLAKE2B 8bb90903f3747589fff94a810584de54d7f598b0aa9d0b364cc679779d401a9a76f6914cbfbdd007e2066f02230ed4cac4f3735830ea70eb3bcc449af8229c5d SHA512 68e62015e44eeb997166418bf769afa3e96c037a9282dcfd08a8f01d935fa48076483158f628d70b0aed258427510996d4c4ee7d2644ff561163c76f776635d2 DIST zfs-2.1.16.tar.gz.asc 836 BLAKE2B b46614399ca63d9c88216c55bb2177cc0c28f4da2cb6be3ee361efca994309abff46fdf6ad6b0bad448c44e9e84ee40e2183d1b482e04844317f14744bab5c1f SHA512 d2d94a4e3ffe182e86fa3319cb9661688125f378ffa1e5768ee89033f796a1f52f877c382588fb1f434686e30bc4e65e3f08ceac0dd3dd7f8f751ba6182c3317 -DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6 -DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060 -DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745 -DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4 DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271 DIST zfs-2.2.7.tar.gz.asc 836 BLAKE2B e8fc5e04f5b37a22c741bda46b4573e0cebe85da051c73cf3c5fc267de3c313399b235fc346ca06f4c22d37d2500044a26adb3ea241a65fbcf8760d0ef880039 SHA512 8d22a64c920c2a983429688a340f4ae281decdd30e465591e6b40af9f3016b8f168f4e8ea460600c832a2f46b383ff307986649a645585fb25c34fdfda75ad6e DIST zfs-2.3.0.tar.gz 34029599 BLAKE2B b9fb7913f95dd0c8aec703961ecc0413aa51df889f15b1541ff8fcd7146ba485947fab83deb062bdffcdeab17a2465b7551c7eba3ec55c62c21aba58846c0da5 SHA512 f0bb1c6e28b325765be809dbc5d38ba294daa38b54eafd7d129cf6081fb209b200580437019faeed3614bbb0687d6583698a9282f3275905a1f5a8314a66cf0b DIST zfs-2.3.0.tar.gz.asc 836 BLAKE2B 9d1bd03dc6e5699236bca4c2b20a0a8b46e88d90ea58f7171d087c555da85d6af88acc5990f828ba455f9fbe24c90800c1edf74cd3f865b528730ffef8a931b8 SHA512 ba9a8e8b248de7383c8d33b84b0d70de026b8f3e6a1c82557b74ac274b28e559435541fbdfe816f6b80ce5098b3cac34af69cd53877f1f50fa6a846fa92a5dd0 +DIST zfs-2.3.1.tar.gz 34048716 BLAKE2B 7f22826c3359a015a87aafd119d882d8196dca59dadd85674a48c42ed502937f2880e98a387e9986be2c14fc48f46a288aed5fd8635f13db2585e3fc95e57726 SHA512 235023dbe97b3f7c5273e2a6fa34957cc37967256845d4ed9faa2e2a6da29ea6fdcba4167658cf03129afbb0aa11311a760d3d0b5ea5aecc64a4c7ee22ad2d31 +DIST zfs-2.3.1.tar.gz.asc 836 BLAKE2B 5d1f84f5803f1b0553ad75b12020a57537f6a6e3c3781ab8a21f0d7de9ad6be0be7618bb42e51bbddd5fc48cabb05f6d79ea2f5eebc63d67383b29c44d69f7f6 SHA512 619aac22d80b8100f28ca3e4a984b2e0387b272131d2a8c104a278955a811e2280ecf3bfa3b7d54ed73572ed7cd45121cd724b52afd3503c30c1e41400d27674 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/zfs/zfs-2.2.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/zfs/zfs-2.2.5.ebuild deleted file mode 100644 index 962beb1632..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/zfs/zfs-2.2.5.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://github.com/openzfs/zfs" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc - inherit verify-sig - - MY_P="${P/_rc/-rc}" - SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" - SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" - S="${WORKDIR}/${MY_P}" - - if [[ ${PV} != *_rc* ]]; then - KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc" - fi -fi - -LICENSE="BSD-2 CDDL MIT" -# just libzfs soname major for now. -# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. -# see libsoversion_check() below as well -SLOT="0/5" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind" - -DEPEND=" - dev-libs/openssl:= - net-libs/libtirpc:= - sys-apps/util-linux - sys-libs/zlib - virtual/libudev:= - !minimal? ( ${PYTHON_DEPS} ) - pam? ( sys-libs/pam ) - python? ( - $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*') - ) - unwind? ( sys-libs/libunwind:= ) -" - -BDEPEND=" - app-alternatives/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) - python? ( - ${DISTUTILS_DEPS} - || ( - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/distlib[${PYTHON_USEDEP}] - ) - ) -" - -if [[ ${PV} != "9999" ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" -fi - -# awk is used for some scripts, completions, and the Dracut module -RDEPEND=" - ${DEPEND} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) - !prefix? ( virtual/udev ) - app-alternatives/awk - sys-fs/udev-init-scripts - dist-kernel? ( virtual/dist-kernel:= ) - rootfs? ( - app-alternatives/cpio - app-misc/pax-utils - ) - selinux? ( sec-policy/selinux-zfs ) - test-suite? ( - app-shells/ksh - sys-apps/kmod[tools] - sys-apps/util-linux - app-alternatives/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - ) -" - -# PDEPEND in this form is needed to trick portage suggest -# enabling dist-kernel if only 1 package have it set, without suggesting to disable -PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )" - -REQUIRED_USE=" - !minimal? ( ${PYTHON_REQUIRED_USE} ) - python? ( !minimal ) - test-suite? ( !minimal ) -" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch - "${FILESDIR}"/2.2.2-no-USER_NS.patch - "${FILESDIR}"/2.2.3-musl.patch -) - -pkg_pretend() { - use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi -} - -pkg_setup() { - if use kernel_linux; then - linux-info_pkg_setup - - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [X] Loopback device support" - fi - fi - fi - fi -} - -libsoversion_check() { - local bugurl libzfs_sover - bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" - - libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ - | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" - libzfs_sover="${libzfs_sover%%:*}" - - if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then - echo - eerror "BUG BUG BUG BUG BUG BUG BUG BUG" - eerror "ebuild subslot does not match libzfs soversion!" - eerror "libzfs soversion: ${libzfs_sover}" - eerror "ebuild value: $(ver_cut 2 ${SLOT})" - eerror "This is a bug in the ebuild, please use the following URL to report it" - eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" - echo - # we want to abort for releases, but just print a warning for live ebuild - # to keep package installable - [[ ${PV} == "9999" ]] || die - fi -} - -src_prepare() { - default - libsoversion_check - - # Run unconditionally (bug #792627) - eautoreconf - - if [[ ${PV} != "9999" ]]; then - # Set revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_prepare - popd >/dev/null || die - fi - - # Tries to use /etc/conf.d which we reserve for OpenRC - sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die - - # prevent errors showing up on zfs-mount stop, #647688 - # openrc will unmount all filesystems anyway. - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die -} - -src_configure() { - use custom-cflags || strip-flags - use minimal || python_setup - - local myconf=( - --bindir="${EPREFIX}/bin" - --enable-shared - --enable-sysvinit - --localstatedir="${EPREFIX}/var" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="${EPREFIX}/usr/lib/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-pamconfigsdir="${EPREFIX}/unwanted_files" - --with-pammoduledir="$(getpam_mod_dir)" - --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="$(systemd_get_systempresetdir)" - --with-vendor=gentoo - # Building zfs-mount-generator.c on musl breaks as strndupa - # isn't available. But systemd doesn't support musl anyway, so - # just disable building it. - # UPDATE: it has been fixed since, - # https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a - # but we still leave it as this for now. - $(use_enable !elibc_musl systemd) - $(use_enable debug) - $(use_enable nls) - $(use_enable pam) - $(use_enable python pyzfs) - $(use_with unwind libunwind) - --disable-static - $(usex minimal --without-python --with-python="${EPYTHON}") - ) - - econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - default - - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool - - use pam && { rm -rv "${ED}/unwanted_files" || die ; } - - use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; } - - find "${ED}" -name '*.la' -delete || die - - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - - # strip executable bit from conf.d file - fperms 0644 /etc/conf.d/zfs - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - # enforce best available python implementation - use minimal || python_fix_shebang "${ED}/bin" -} - -pkg_postinst() { - udev_reload - - # we always need userspace utils in sync with zfs-kmod - # so force initrd update for userspace as well, to avoid - # situation when zfs-kmod trigger initrd rebuild before - # userspace component is rebuilt - # KV_* variables are provided by linux-info.eclass - if [[ -z ${ROOT} ]] && use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - - if use rootfs; then - if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then - elog "Root on zfs requires an initramfs to boot" - elog "The following packages provide one and are tested on a regular basis:" - elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" - elog " sys-kernel/genkernel" - fi - fi - - if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" - einfo "for default zfs systemd service configuration" - else - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ - einfo "You should add zfs-import to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \ - einfo "You should add zfs-load-key to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ - einfo "You should add zfs-mount to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ - einfo "You should add zfs-share to the default runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ - einfo "You should add zfs-zed to the default runlevel." - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/zfs/zfs-2.2.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/zfs/zfs-2.3.1.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/sys-fs/zfs/zfs-2.2.6.ebuild rename to sdk_container/src/third_party/portage-stable/sys-fs/zfs/zfs-2.3.1.ebuild index 70455ee1af..1f1fcfb8f8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/zfs/zfs-2.2.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/zfs/zfs-2.3.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript @@ -25,7 +25,7 @@ else S="${WORKDIR}/${MY_P}" if [[ ${PV} != *_rc* ]]; then - KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc" + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc" fi fi @@ -33,7 +33,7 @@ LICENSE="BSD-2 CDDL MIT" # just libzfs soname major for now. # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. # see libsoversion_check() below as well -SLOT="0/5" +SLOT="0/6" IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind" DEPEND=" @@ -106,8 +106,6 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch - "${FILESDIR}"/2.2.2-no-USER_NS.patch - "${FILESDIR}"/2.2.3-musl.patch ) pkg_pretend() { From e2953ae5517e47c432a2a198b4b9eaf4cc0a8336 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:02 +0000 Subject: [PATCH 130/153] sys-fs/zfs-kmod: Sync with Gentoo It's from Gentoo commit 786d12cf1fd95d5fe4eff1996ee6ff1c6517a513. --- .../portage-stable/sys-fs/zfs-kmod/Manifest | 6 +- .../sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild | 207 ------------------ ...mod-2.2.6.ebuild => zfs-kmod-2.3.1.ebuild} | 6 +- .../sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 4 +- 4 files changed, 7 insertions(+), 216 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild rename sdk_container/src/third_party/portage-stable/sys-fs/zfs-kmod/{zfs-kmod-2.2.6.ebuild => zfs-kmod-2.3.1.ebuild} (98%) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/zfs-kmod/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/zfs-kmod/Manifest index e2d6085d8a..a5d94a00f5 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/zfs-kmod/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-fs/zfs-kmod/Manifest @@ -1,10 +1,8 @@ DIST zfs-2.1.16.tar.gz 35187215 BLAKE2B 8bb90903f3747589fff94a810584de54d7f598b0aa9d0b364cc679779d401a9a76f6914cbfbdd007e2066f02230ed4cac4f3735830ea70eb3bcc449af8229c5d SHA512 68e62015e44eeb997166418bf769afa3e96c037a9282dcfd08a8f01d935fa48076483158f628d70b0aed258427510996d4c4ee7d2644ff561163c76f776635d2 DIST zfs-2.1.16.tar.gz.asc 836 BLAKE2B b46614399ca63d9c88216c55bb2177cc0c28f4da2cb6be3ee361efca994309abff46fdf6ad6b0bad448c44e9e84ee40e2183d1b482e04844317f14744bab5c1f SHA512 d2d94a4e3ffe182e86fa3319cb9661688125f378ffa1e5768ee89033f796a1f52f877c382588fb1f434686e30bc4e65e3f08ceac0dd3dd7f8f751ba6182c3317 -DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f SHA512 8e288620ce78fb235fa0c9929fc97150987a64091a8a5209209f1e0975d4d6213b8b307e32b3c89d934e83dc8468a1998b797fcdff5bbbbd023f07674877b0c6 -DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060 -DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745 -DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4 DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271 DIST zfs-2.2.7.tar.gz.asc 836 BLAKE2B e8fc5e04f5b37a22c741bda46b4573e0cebe85da051c73cf3c5fc267de3c313399b235fc346ca06f4c22d37d2500044a26adb3ea241a65fbcf8760d0ef880039 SHA512 8d22a64c920c2a983429688a340f4ae281decdd30e465591e6b40af9f3016b8f168f4e8ea460600c832a2f46b383ff307986649a645585fb25c34fdfda75ad6e DIST zfs-2.3.0.tar.gz 34029599 BLAKE2B b9fb7913f95dd0c8aec703961ecc0413aa51df889f15b1541ff8fcd7146ba485947fab83deb062bdffcdeab17a2465b7551c7eba3ec55c62c21aba58846c0da5 SHA512 f0bb1c6e28b325765be809dbc5d38ba294daa38b54eafd7d129cf6081fb209b200580437019faeed3614bbb0687d6583698a9282f3275905a1f5a8314a66cf0b DIST zfs-2.3.0.tar.gz.asc 836 BLAKE2B 9d1bd03dc6e5699236bca4c2b20a0a8b46e88d90ea58f7171d087c555da85d6af88acc5990f828ba455f9fbe24c90800c1edf74cd3f865b528730ffef8a931b8 SHA512 ba9a8e8b248de7383c8d33b84b0d70de026b8f3e6a1c82557b74ac274b28e559435541fbdfe816f6b80ce5098b3cac34af69cd53877f1f50fa6a846fa92a5dd0 +DIST zfs-2.3.1.tar.gz 34048716 BLAKE2B 7f22826c3359a015a87aafd119d882d8196dca59dadd85674a48c42ed502937f2880e98a387e9986be2c14fc48f46a288aed5fd8635f13db2585e3fc95e57726 SHA512 235023dbe97b3f7c5273e2a6fa34957cc37967256845d4ed9faa2e2a6da29ea6fdcba4167658cf03129afbb0aa11311a760d3d0b5ea5aecc64a4c7ee22ad2d31 +DIST zfs-2.3.1.tar.gz.asc 836 BLAKE2B 5d1f84f5803f1b0553ad75b12020a57537f6a6e3c3781ab8a21f0d7de9ad6be0be7618bb42e51bbddd5fc48cabb05f6d79ea2f5eebc63d67383b29c44d69f7f6 SHA512 619aac22d80b8100f28ca3e4a984b2e0387b272131d2a8c104a278955a811e2280ecf3bfa3b7d54ed73572ed7cd45121cd724b52afd3503c30c1e41400d27674 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild deleted file mode 100644 index 1eb122934d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/zfs-kmod/zfs-kmod-2.2.5.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MODULES_INITRAMFS_IUSE=+initramfs -inherit autotools flag-o-matic linux-mod-r1 multiprocessing - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="https://github.com/openzfs/zfs" - -MODULES_KERNEL_MAX=6.9 -MODULES_KERNEL_MIN=3.10 - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" - inherit git-r3 - unset MODULES_KERNEL_MAX -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc - inherit verify-sig - - MY_PV=${PV/_rc/-rc} - SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" - SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" - S="${WORKDIR}/zfs-${MY_PV}" - - ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}" - # Increments minor eg 5.14 -> 5.15, and still supports override. - ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" - ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc" - fi -fi - -LICENSE="CDDL MIT debug? ( GPL-2+ )" -SLOT="0/${PVR}" -IUSE="custom-cflags debug +rootfs" -RESTRICT="test" - -BDEPEND=" - app-alternatives/awk - dev-lang/perl -" - -if [[ ${PV} != 9999 ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" - - IUSE+=" +dist-kernel-cap" - RDEPEND=" - dist-kernel-cap? ( dist-kernel? ( - Date: Mon, 17 Mar 2025 07:12:02 +0000 Subject: [PATCH 131/153] sys-libs/binutils-libs: Sync with Gentoo It's from Gentoo commit d87f8d3d8c2ea3231e8fb26e671dcdcf2d618a55. --- .../sys-libs/binutils-libs/binutils-libs-2.44.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.44.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.44.ebuild index b744d212fc..6d3733e67d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.44.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.44.ebuild @@ -38,7 +38,7 @@ else 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" SLOT="0/${PV}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" fi BDEPEND=" From 9dd26e40da27b35fb67cf60b25522c78874be720 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:03 +0000 Subject: [PATCH 132/153] sys-libs/gdbm: Sync with Gentoo It's from Gentoo commit e44b48267bb1b2db1864b95feeb2b8751583b5d3. --- .../portage-stable/sys-libs/gdbm/Manifest | 2 - .../sys-libs/gdbm/gdbm-1.23.ebuild | 58 ------------------- 2 files changed, 60 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/gdbm/gdbm-1.23.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/gdbm/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/gdbm/Manifest index 565e603df0..bae3ee22cc 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/gdbm/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/gdbm/Manifest @@ -1,4 +1,2 @@ -DIST gdbm-1.23.tar.gz 1115854 BLAKE2B a47746577cf2f3c9b62faea496c4d6a50a8f1b0a5af448cb2215e90057c99b5b630ba3f5357c85dfb7fd98ba4e90969e30a779120c29106ed1e8736721f9bec1 SHA512 918080cb0225b221c11eb7339634a95e00c526072395f7a3d46ccf42ef020dea7c4c5bec34aff2c4f16033e1fff6583252b7e978f68b8d7f8736b0e025838e10 -DIST gdbm-1.23.tar.gz.sig 181 BLAKE2B 34785e6fe8e02100084d61e989749ee388794b8af82fc59a417140807bf169c45c15935f8cf91d0ba116dfdee295e05b2b014f1539f1f128a57acfe59010d34d SHA512 6653751c04584f10aa3325bd1cb5b9f7970a786dd2a99602ea620c11a86a9ba5c342aa52627bd06c03da822e9e1600dc034d9a8f42856a287fd67f6b9f161c71 DIST gdbm-1.24.tar.gz 1195931 BLAKE2B 79f49adbb455c2e1b91f3450037b71165fa8de82650d6402e0e22ee1f4d278fdb0bd78100659bf416e2409b432e1f8d32ecbae523980413f7148b80ee06c9f4b SHA512 401ff8c707079f21da1ac1d6f4714a87f224b6f41943078487dc891be49f51fd1ac7a32fd599aae0fad185f2c6ba7432616d328fd6aaab068eb54db9562ff7fa DIST gdbm-1.24.tar.gz.sig 95 BLAKE2B 3a66c2a256d9601db57df20feb5d72d1e94d23b7a92e3099f121549c8aa2c57b05a3021d88f97291819378462a68664af958de4c9de65887d2cca6642d172bc3 SHA512 a54595e0fd23724f5e30c2ff1b9656dbb6da3b448f4ab6a2579a523c11bae53e47d3843327a1e4499b312ab947ac73b5a9aa6e78fe5e932c55a1be0cdab4e63d diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/gdbm/gdbm-1.23.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/gdbm/gdbm-1.23.ebuild deleted file mode 100644 index 3dee2a792d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/gdbm/gdbm-1.23.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gdbm.asc -inherit libtool multilib-minimal verify-sig - -DESCRIPTION="Standard GNU database libraries" -HOMEPAGE="https://www.gnu.org/software/gdbm/" -SRC_URI="mirror://gnu/gdbm/${P}.tar.gz" -SRC_URI+=" verify-sig? ( mirror://gnu/gdbm/${P}.tar.gz.sig )" - -LICENSE="GPL-3" -SLOT="0/6" # libgdbm.so version -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+berkdb nls +readline static-libs test" -RESTRICT="!test? ( test )" - -DEPEND="readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" -BDEPEND=" - test? ( dev-util/dejagnu ) - verify-sig? ( sec-keys/openpgp-keys-gdbm ) -" - -src_prepare() { - default - - # gdbm ships with very old libtool files, regen to avoid - # errors when cross-compiling. - elibtoolize -} - -multilib_src_configure() { - # gdbm doesn't appear to use either of these libraries - export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no - - local myeconfargs=( - --includedir="${EPREFIX}"/usr/include/gdbm - $(use_enable berkdb libgdbm-compat) - $(use_enable nls) - $(use_enable static-libs static) - $(use_with readline) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs ; then - find "${ED}" -name '*.la' -delete || die - fi - - mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die -} From 2632347bf7857cb8746e1823f8e13ff1be9a4548 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:04 +0000 Subject: [PATCH 133/153] sys-libs/glibc: Sync with Gentoo It's from Gentoo commit 9074a3d84995540c2c814c713e7a67cb01cf0323. --- .../portage-stable/sys-libs/glibc/Manifest | 3 +- .../sys-libs/glibc/glibc-2.40-r8.ebuild | 4 +- ...bc-2.40-r5.ebuild => glibc-2.40-r9.ebuild} | 65 +- .../sys-libs/glibc/glibc-2.41-r1.ebuild | 1759 +++++++++++++++++ .../sys-libs/glibc/glibc-2.41.ebuild | 2 +- .../sys-libs/glibc/glibc-9999.ebuild | 2 +- 6 files changed, 1799 insertions(+), 36 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-libs/glibc/{glibc-2.40-r5.ebuild => glibc-2.40-r9.ebuild} (96%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.41-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/Manifest index 6c69961854..89f9e82891 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/Manifest @@ -23,10 +23,11 @@ DIST glibc-2.38-patches-13.tar.xz 92708 BLAKE2B b2f05a793c92ea0b7901d2124fcd968f DIST glibc-2.38.tar.xz 18913712 BLAKE2B f9b039f0ef98a7dd8e1cba228ed10286b9e4fbe4dd89af4d26fa5c4e4cf266f19c2746b44d797ce54739d86499e74cf334aaf311bcf6e30120fd7748453e653f SHA512 a6dd5e42dcd63d58e2820c783522c8c895890b6e8c8e6c83b025553de0cc77cdf227e7044e431ead98c89c68a9ce4dd63509b47e647775fb2075f011849c1900 DIST glibc-2.39-patches-11.tar.xz 192784 BLAKE2B fef42e0bd2a3341f41cac56dc878dcc95b7f521ffb27686a9109fe92e0458e903a24e763db17631b8ae6c1e8de7add2a11979b970689b2378aeb6ef29da7ceb6 SHA512 9daf2c57d178c7ce9d98ee454f680280738b37571bbbecc1724282e4866df29b78e60de40ad81a6efcc0a75b45d08148cb1a5f942ae7e308ae6fa63f9671b7de DIST glibc-2.39.tar.xz 18520988 BLAKE2B 9d98459a2d58401e07c081e0d841935b23998da75a7eb5a7ebd23a1f9ebab99dee623fe166397c1b6c926960c570f62dbca5cb3b5ce84a918adff6b7a15e16bb SHA512 818f58172a52815b4338ea9f2a69ecaa3335492b9f8f64cbf8afb24c0d737982341968ecd79631cae3d3074ab0ae4bc6056fc4ba3ffe790849dc374835cd57e2 -DIST glibc-2.40-patches-5.tar.xz 87376 BLAKE2B b09b9d2c8e45c0b494223cd01effb14ef205b030f2aeb76e1d7d289997258c1e46d85f8f4ad761e22afc35b1f4747fbca51d7caf252181c7b054b6a3e6bd2bfe SHA512 bf4776c27e5d962d2774afbed2236996a712a6127e5fdccd051af212d86a7e699a932cf4cb22f5516d513b9490b91d5e145727035e845cd4ef290985ac3dc524 DIST glibc-2.40-patches-8.tar.xz 112020 BLAKE2B 17f5a3e5486aa570cb4d9103a84b649af9731bc398a4ff65d3d24c8912215dc7f5f2d6fa9a0222c514374a132b96796e8926a5cc31c87b326bf6d1a39772bd7a SHA512 97a28822f97d1c06773953750a8d9a38a6bd9ce488f4c4d5f0752b573591cbdc84dfbbb277e3fb8e5664c56596efc093fd83a78e4c47bb9c11cafe942b13a0f1 +DIST glibc-2.40-patches-9.tar.xz 187952 BLAKE2B 48aecbdcc9ddc0b1139de1934c26952d85c557da795b400ab5b8308afce08d13583c0d18dfacb46d0e63aa4da64d3c9c8fd242ad87a9ae0966022b5da471158b SHA512 a068f9a4af6b47b1ec572378fcac0db464081d277d697914f54028b174e43eb17b30e4e1026bff365be79ddb41ffb81167c684be9f95abb22df03d70aaa66333 DIST glibc-2.40.tar.xz 18752204 BLAKE2B 8593cab5b2549b77159b6866fbb40b917e491fd5bc0814f7f85b6529166d78d4583436450c479b86cdfe468304fc4d2a9ba8294230a55dbc4c15e89c3ab6c000 SHA512 33caf91dbfddde6480b7cdf7a68b36aff8c522bfee56160af26af297f1b768668edb08bc4e1a7ff61c64721e3c1d49c347a5dd01c5edd3b914ee6479c8b27885 DIST glibc-2.41-patches-1.tar.xz 17560 BLAKE2B dc4e39cb5605867b44c2308a8d6d6c0a662656b80a0aa2734f488e2cc22e26c948177eeb80ff6c79d82925b4dbd146a4d78646879c6e32fd60f817fb0d9ae092 SHA512 94da2092e49ee827d7558bcbfa8ebcbb9f81ed68848221d139039ea788cef57375ccfa61498bc73c6e83050681990d3968791a5f90514de12e45c10baef31d1e +DIST glibc-2.41-patches-2.tar.xz 54320 BLAKE2B cd0779c452159c90adf165da18e61699dc5e53dcfecb44f8e7ddc5bcbb00050705a423a298a57054ddce5daaee728ac03d1e25c71ad5070edf5907ac6eac0783 SHA512 4c74a657faa1cffedc083d061258508f483d25e5f3989d98e61608e245a6e75e5c389fefd0c31e5ccde6926c5173364852957b8d8b83a474842c635d1f7fc1c3 DIST glibc-2.41.tar.xz 19344868 BLAKE2B 4da62f489ba7a95bb069c2cfea8cf78e4d37e3a5f7e1736239670ba1dca12b69aa77bd00ced078c27d91b1e622c58cbd70258161a9d18c5b3bcc95863b8d744d SHA512 894a3e5a796bc13df30c26a5bfbe4d60b5dbdaac54e7763432235124b547070c7dda88c50584536870cab79183d8cad73a3ac6ed09bfe54fa8482aad07253169 DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B 37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979 SHA512 efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238 DIST glibc-systemd-20210814.tar.gz 1469 BLAKE2B 10fa7bcb46d4fdce9c0ab353cbd30871e9b09a347a13a9c9a3b5777f931aa3c826c158d2e49532c604d4a834f2fab4089b67495fb88d0398945dc50d45ad9ef1 SHA512 5346a9ea459a1e6ccf665389f2a294de1e16f1e3e05cdf07e3dd99ed0e4f6f8b52cc333d4bff3c75ac90ab6ce70cd4ab2b3e126f920ce7979abd6dda56315efc diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.40-r8.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.40-r8.ebuild index 0a6d95e2ab..8e0d873be4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.40-r8.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.40-r8.ebuild @@ -41,7 +41,7 @@ HOMEPAGE="https://www.gnu.org/software/libc/" if [[ ${PV} == 9999* ]]; then inherit git-r3 else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" SRC_URI="mirror://gnu/glibc/${P}.tar.xz" SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" fi @@ -1705,7 +1705,7 @@ pkg_postinst() { # must refresh it. See bug #933282 and GCC's documentation: # https://gcc.gnu.org/onlinedocs/gcc/Fixed-Headers.html # - # TODO: Could this be done for non-cross? Some care would be needed + # TODO: Could this be done for cross? Some care would be needed # to pass the right arguments. while IFS= read -r -d $'\0' slot ; do local mkheaders_path="${BROOT}"/usr/libexec/gcc/${CBUILD}/${slot##*/}/install-tools/mkheaders diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.40-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.40-r9.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.40-r5.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.40-r9.ebuild index 3cfc6b6329..003b5ccf16 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.40-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.40-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ TMPFILES_OPTIONAL=1 EMULTILIB_PKG="true" # Gentoo patchset (ignored for live ebuilds) -PATCH_VER=5 +PATCH_VER=9 PATCH_DEV=dilfridge # gcc mulitilib bootstrap files version @@ -41,7 +41,7 @@ HOMEPAGE="https://www.gnu.org/software/libc/" if [[ ${PV} == 9999* ]]; then inherit git-r3 else - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" SRC_URI="mirror://gnu/glibc/${P}.tar.xz" SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" fi @@ -248,29 +248,9 @@ build_eprefix() { is_crosscompile && echo "${EPREFIX}" } -# We need to be able to set alternative headers for compiling for non-native -# platform. Will also become useful for testing kernel-headers without screwing -# up the whole system. alt_headers() { - echo ${ALT_HEADERS:=$(alt_prefix)/usr/include} + echo $(alt_prefix)/usr/include } - -alt_build_headers() { - if [[ -z ${ALT_BUILD_HEADERS} ]] ; then - ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)" - if tc-is-cross-compiler ; then - ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers) - if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then - local header_path=$(echo '#include ' \ - | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 \ - | grep -o '[^"]*linux/version.h') - ALT_BUILD_HEADERS=${header_path%/linux/version.h} - fi - fi - fi - echo "${ALT_BUILD_HEADERS}" -} - alt_libdir() { echo $(alt_prefix)/$(get_libdir) } @@ -629,13 +609,13 @@ setup_env() { # Last, we need the settings of the *build* environment, not of the # target environment... - local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B) + local current_binutils_path=$(env CHOST="${CBUILD}" ROOT="${BROOT}" binutils-config -B "${CTARGET}") local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B) einfo "Overriding clang configuration, since it won't work here" - export CC="${current_gcc_path}/gcc" - export CPP="${current_gcc_path}/cpp" - export CXX="${current_gcc_path}/g++" + export CC="${current_gcc_path}/${CTARGET}-gcc" + export CPP="${current_gcc_path}/${CTARGET}-cpp" + export CXX="${current_gcc_path}/${CTARGET}-g++" export LD="${current_binutils_path}/ld.bfd" export AR="${current_binutils_path}/ar" export AS="${current_binutils_path}/as" @@ -792,7 +772,7 @@ eend_KV() { get_kheader_version() { printf '#include \nLINUX_VERSION_CODE\n' | \ - $(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \ + $(tc-getCPP ${CTARGET}) -I "${ESYSROOT}$(alt_headers)" - | \ tail -n 1 } @@ -1065,7 +1045,7 @@ glibc_do_configure() { --host=${CTARGET_OPT:-${CTARGET}} $(use_enable profile) $(use_with gd) - --with-headers=$(build_eprefix)$(alt_build_headers) + --with-headers="${ESYSROOT}$(alt_headers)" --prefix="$(host_eprefix)/usr" --sysconfdir="$(host_eprefix)/etc" --localstatedir="$(host_eprefix)/var" @@ -1228,7 +1208,7 @@ glibc_headers_configure() { --enable-bind-now --build=${CBUILD_OPT:-${CBUILD}} --host=${CTARGET_OPT:-${CTARGET}} - --with-headers=$(build_eprefix)$(alt_build_headers) + --with-headers="${ESYSROOT}$(alt_headers)" --prefix="$(host_eprefix)/usr" ${EXTRA_ECONF} ) @@ -1720,6 +1700,29 @@ pkg_postinst() { use loong && glibc_refresh_ldconfig use compile-locales || run_locale_gen "${EROOT}/" + + # If fixincludes was/is active for a particular GCC slot, we + # must refresh it. See bug #933282 and GCC's documentation: + # https://gcc.gnu.org/onlinedocs/gcc/Fixed-Headers.html + # + # TODO: Could this be done for cross? Some care would be needed + # to pass the right arguments. + while IFS= read -r -d $'\0' slot ; do + local mkheaders_path="${BROOT}"/usr/libexec/gcc/${CBUILD}/${slot##*/}/install-tools/mkheaders + local pthread_h="${BROOT}"/usr/lib/gcc/${CBUILD}/${slot##*/}/include-fixed/pthread.h + if [[ -x ${mkheaders_path} ]] ; then + ebegin "Refreshing fixincludes for ${CBUILD} with gcc-${slot##*/}" + ${mkheaders_path} -v + eend $? + elif [[ -f ${pthread_h} ]] ; then + # fixincludes might have been enabled in the past for this + # GCC slot but not since we fixed toolchain.eclass to install + # mkheaders, so we need to manually delete pthread.h at least. + ebegin "Deleting stale fixincludes'd pthread.h for ${CBUILD} with gcc-${slot##*/}" + mv -v "${pthread_h}" "${pthread_h}.bak" + eend $? + fi + done < <(find "${BROOT}"/usr/libexec/gcc/${CBUILD}/ -mindepth 1 -maxdepth 1 -type d -print0) fi upgrade_warning diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.41-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.41-r1.ebuild new file mode 100644 index 0000000000..c1c453c31a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.41-r1.ebuild @@ -0,0 +1,1759 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc +# Please read & adapt the page as necessary if obsolete. + +PYTHON_COMPAT=( python3_{10..13} ) +TMPFILES_OPTIONAL=1 + +EMULTILIB_PKG="true" + +# Gentoo patchset (ignored for live ebuilds) +PATCH_VER=2 +PATCH_DEV=dilfridge + +# gcc mulitilib bootstrap files version +GCC_BOOTSTRAP_VER=20201208 + +# systemd integration version +GLIBC_SYSTEMD_VER=20210729 + +# Minimum kernel version that glibc requires +MIN_KERN_VER="3.2.0" + +# Minimum pax-utils version needed (which contains any new syscall changes for +# its seccomp filter!). Please double check this! +MIN_PAX_UTILS_VER="1.3.3" + +# Minimum systemd version needed (which contains any new syscall changes for +# its seccomp filter!). Please double check this! +MIN_SYSTEMD_VER="254.9-r1" + +inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \ + multilib systemd multiprocessing tmpfiles eapi9-ver + +DESCRIPTION="GNU libc C library" +HOMEPAGE="https://www.gnu.org/software/libc/" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + SRC_URI="mirror://gnu/glibc/${P}.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" +fi + +SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" +SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )" + +LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" +SLOT="2.2" +IUSE="audit caps cet compile-locales custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla" + +# Here's how the cross-compile logic breaks down ... +# CTARGET - machine that will target the binaries +# CHOST - machine that will host the binaries +# CBUILD - machine that will build the binaries +# If CTARGET != CHOST, it means you want a libc for cross-compiling. +# If CHOST != CBUILD, it means you want to cross-compile the libc. +# CBUILD = CHOST = CTARGET - native build/install +# CBUILD != (CHOST = CTARGET) - cross-compile a native build +# (CBUILD = CHOST) != CTARGET - libc for cross-compiler +# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler +# For install paths: +# CHOST = CTARGET - install into / +# CHOST != CTARGET - install into /usr/CTARGET/ +# +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +# Note [Disable automatic stripping] +# Disabling automatic stripping for a few reasons: +# - portage's attempt to strip breaks non-native binaries at least on +# arm: bug #697428 +# - portage's attempt to strip libpthread.so.0 breaks gdb thread +# enumeration: bug #697910. This is quite subtle: +# * gdb uses glibc's libthread_db-1.0.so to enumerate threads. +# * libthread_db-1.0.so needs access to libpthread.so.0 local symbols +# via 'ps_pglobal_lookup' symbol defined in gdb. +# * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all +# known symbols in 'libpthread.so.0'. Specifically 'nptl_version' +# (unexported) is used to sanity check compatibility before enabling +# debugging. +# Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint +# * normal 'strip' command trims '.symtab' +# Thus our main goal here is to prevent 'libpthread.so.0' from +# losing it's '.symtab' entries. +# - similarly, valgrind requires knowledge about symbols in ld.so: +# bug #920753 +# As Gentoo's strip does not allow us to pass less aggressive stripping +# options and does not check the machine target we strip selectively. + +# We need a new-enough binutils/gcc to match upstream baseline. +# Also we need to make sure our binutils/gcc supports TLS, +# and that gcc already contains the hardened patches. +# Lastly, let's avoid some openssh nastiness, bug 708224, as +# convenience to our users. + +IDEPEND=" + !compile-locales? ( sys-apps/locale-gen ) +" +BDEPEND=" + ${PYTHON_DEPS} + >=app-misc/pax-utils-${MIN_PAX_UTILS_VER} + sys-devel/bison + compile-locales? ( sys-apps/locale-gen ) + doc? ( + dev-lang/perl + sys-apps/texinfo + ) + test? ( + dev-lang/perl + >=net-dns/libidn2-2.3.0 + sys-apps/gawk[mpfr] + ) +" +COMMON_DEPEND=" + gd? ( media-libs/gd:2= ) + nscd? ( selinux? ( + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap ) + ) ) + suid? ( caps? ( sys-libs/libcap ) ) + selinux? ( sys-libs/libselinux ) + systemtap? ( dev-debug/systemtap ) +" +DEPEND="${COMMON_DEPEND} +" +RDEPEND="${COMMON_DEPEND} + !/dev/null + + rm -f glibc-test* + printf '%b' "$*" > glibc-test.c + + # We assume CC is already set up. + nonfatal emake glibc-test + ret=$? + + popd >/dev/null + + CFLAGS=${save_cflags} + return ${ret} +} + +do_run_test() { + local ret + + if [[ ${MERGE_TYPE} == "binary" ]] ; then + # ignore build failures when installing a binary package #324685 + do_compile_test "" "$@" 2>/dev/null || return 0 + else + ebegin "Performing simple compile test for ABI=${ABI}" + if ! do_compile_test "" "$@" ; then + ewarn "Simple build failed ... assuming this is desired #324685" + eend 1 + return 0 + else + eend 0 + fi + fi + + pushd "${T}" >/dev/null + + ./glibc-test + ret=$? + rm -f glibc-test* + + popd >/dev/null + + return ${ret} +} + +setup_target_flags() { + # This largely mucks with compiler flags. None of which should matter + # when building up just the headers. + just_headers && return 0 + + case $(tc-arch) in + x86) + # -march needed for #185404 #199334 + # TODO: When creating the first glibc cross-compile, this test will + # always fail as it does a full link which in turn requires glibc. + # Probably also applies when changing multilib profile settings (e.g. + # enabling x86 when the profile was amd64-only previously). + # We could change main to _start and pass -nostdlib here so that we + # only test the gcc code compilation. Or we could do a compile and + # then look for the symbol via scanelf. + if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then + local t=${CTARGET_OPT:-${CTARGET}} + t=${t%%-*} + filter-flags '-march=*' + export CFLAGS="-march=${t} ${CFLAGS}" + einfo "Auto adding -march=${t} to CFLAGS #185404" + fi + # For compatibility with older binaries at slight performance cost. + use stack-realign && export CFLAGS+=" -mstackrealign" + ;; + amd64) + # -march needed for #185404 #199334 + # TODO: See cross-compile issues listed above for x86. + if [[ ${ABI} == x86 ]]; then + if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then + local t=${CTARGET_OPT:-${CTARGET}} + t=${t%%-*} + # Normally the target is x86_64-xxx, so turn that into the -march that + # gcc actually accepts. #528708 + [[ ${t} == "x86_64" ]] && t="x86-64" + filter-flags '-march=*' + # ugly, ugly, ugly. ugly. + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + export CFLAGS_x86="${CFLAGS_x86} -march=${t}" + einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" + fi + # For compatibility with older binaries at slight performance cost. + use stack-realign && export CFLAGS_x86+=" -mstackrealign" + fi + ;; + mips) + # The mips abi cannot support the GNU style hashes. #233233 + filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both + ;; + ppc|ppc64) + # Many arch-specific implementations do not work on ppc with + # cache-block not equal to 128 bytes. This breaks memset: + # https://sourceware.org/PR26522 + # https://bugs.gentoo.org/737996 + # Use default -mcpu=. For ppc it means non-multiarch setup. + filter-flags '-mcpu=*' + ;; + sparc) + # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. + filter-flags "-fcall-used-g7" + append-flags "-fcall-used-g6" + + local cpu + case ${CTARGET} in + sparc64-*) + cpu="sparc64" + case $(get-flag mcpu) in + v9) + # We need to force at least v9a because the base build doesn't + # work with just v9. + # https://sourceware.org/bugzilla/show_bug.cgi?id=19477 + append-flags "-Wa,-xarch=v9a" + ;; + esac + ;; + sparc-*) + case $(get-flag mcpu) in + v8|supersparc|hypersparc|leon|leon3) + cpu="sparcv8" + ;; + *) + cpu="sparcv9" + ;; + esac + ;; + esac + [[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}" + ;; + esac +} + +setup_flags() { + # Make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi + + # Store our CFLAGS because it's changed depending on which CTARGET + # we are building when pulling glibc on a multilib profile + CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} + CFLAGS=${CFLAGS_BASE} + CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}} + CXXFLAGS=${CXXFLAGS_BASE} + ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} + ASFLAGS=${ASFLAGS_BASE} + + # Allow users to explicitly avoid flag sanitization via + # USE=custom-cflags. + if ! use custom-cflags; then + # Over-zealous CFLAGS can often cause problems. What may work for one + # person may not work for another. To avoid a large influx of bugs + # relating to failed builds, we strip most CFLAGS out to ensure as few + # problems as possible. + strip-flags + + # Allow -O2 and -O3, but nothing else for now. + # TODO: Test -Os, -Oz. + if ! is-flagq '-O@(2|3)' ; then + # Lock glibc at -O2. We want to be conservative here. + filter-flags '-O?' + append-flags -O2 + fi + fi + + strip-unsupported-flags + filter-lto + filter-flags -m32 -m64 '-mabi=*' + + # glibc aborts if rpath is set by LDFLAGS + filter-ldflags '-Wl,-rpath=*' + + # ld can't use -r & --relax at the same time, bug #788901 + # https://sourceware.org/PR27837 + filter-ldflags '-Wl,--relax' + + # Flag added for cross-prefix, but causes ldconfig to segfault. Not needed + # anyway because glibc already handles this by itself. + filter-ldflags '-Wl,--dynamic-linker=*' + + # Fails to link (bug #940709) in some cases but even if it manages to, + # subtle runtime breakage will occur because the linker scripts need + # adaptation. Mentioned in PR21557#c0. + filter-ldflags '-Wl,--gc-sections' + + # some weird software relies on sysv hashes in glibc, bug 863863, bug 864100 + # we have to do that here already so mips can filter it out again :P + if use hash-sysv-compat ; then + append-ldflags '-Wl,--hash-style=both' + fi + + # #492892 + filter-flags -frecord-gcc-switches + + # #898098 + filter-flags -fno-builtin + + # #798774 + filter-flags -fno-semantic-interposition + + # #829583 + filter-lfs-flags + + unset CBUILD_OPT CTARGET_OPT + if use multilib ; then + CTARGET_OPT=$(get_abi_CTARGET) + [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) + fi + + setup_target_flags + + if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then + CBUILD_OPT=${CTARGET_OPT} + fi + + # glibc's headers disallow -O0 and fail at build time: + # include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization" + # https://sourceware.org/glibc/wiki/FAQ#Why_do_I_get:.60.23error_.22glibc_cannot_be_compiled_without_optimization.22.27.2C_when_trying_to_compile_GNU_libc_with_GNU_CC.3F + replace-flags -O0 -O1 + + # Similar issues as with SSP. Can't inject yourself that early. + filter-flags '-fsanitize=*' + + # See end of bug #830454; we handle this via USE=cet + filter-flags '-fcf-protection=*' + + # When bootstrapping, we may have a situation where + # CET-enabled gcc from seed is used to build CET-disabled + # glibc. As such, gcc implicitly enables CET if no + # -fcf-protection flag is passed. For a typical package it + # should not be a problem, but for glibc it matters as it is + # dealing with CET in ld.so. So if CET is supposed to be + # disabled for glibc, be explicit about it. + if ! use cet; then + case ${ABI}-${CTARGET} in + amd64-x86_64-*|x32-x86_64-*-*-gnux32) + append-flags '-fcf-protection=none' + ;; + arm64-aarch64*) + append-flags '-mbranch-protection=none' + ;; + esac + fi +} + +use_multiarch() { + # Allow user to disable runtime arch detection in multilib. + use multiarch || return 1 + # Make sure binutils is new enough to support indirect functions, + # #336792. This funky sed supports gold and bfd linkers. + local bver nver + bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}') + case $(tc-arch ${CTARGET}) in + amd64|x86) nver="2.20" ;; + arm) nver="2.22" ;; + hppa) nver="2.23" ;; + ppc|ppc64) nver="2.20" ;; + # ifunc support was added in 2.23, but glibc also needs + # machinemode which is in 2.24. + s390) nver="2.24" ;; + sparc) nver="2.21" ;; + *) return 1 ;; + esac + ver_test ${bver} -ge ${nver} +} + +# Setup toolchain variables that had historically been defined in the +# profiles for these archs. +setup_env() { + # silly users + unset LD_RUN_PATH + unset LD_ASSUME_KERNEL + + if is_crosscompile || tc-is-cross-compiler ; then + multilib_env ${CTARGET_OPT:-${CTARGET}} + + if ! use multilib ; then + MULTILIB_ABIS=${DEFAULT_ABI} + else + MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} + fi + + # If the user has CFLAGS_ in their make.conf, use that, + # and fall back on CFLAGS. + local VAR=CFLAGS_${CTARGET//[-.]/_} + CFLAGS=${!VAR-${CFLAGS}} + einfo " $(printf '%15s' 'Manual CFLAGS:') ${CFLAGS}" + fi + + setup_flags + + export ABI=${ABI:-${DEFAULT_ABI:-default}} + + if just_headers ; then + # Avoid mixing host's CC and target's CFLAGS_${ABI}: + # At this bootstrap stage we have only binutils for + # target but not compiler yet. + einfo "Skip CC ABI injection. We can't use (cross-)compiler yet." + return 0 + fi + + # glibc does not work with non-bfd (for various reasons): + # * gold (bug #269274) + # * mold (bug #860900) + tc-ld-force-bfd + + if use doc ; then + export MAKEINFO=makeinfo + else + export MAKEINFO=/dev/null + fi + + # Reset CC and CXX to the value at start of emerge + export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}} + export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}} + export CPP=${glibc__ORIG_CPP:-${CPP:-$(tc-getCPP ${CTARGET})}} + + # and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now. + export glibc__ORIG_CC=${CC} + export glibc__ORIG_CXX=${CXX} + export glibc__ORIG_CPP=${CPP} + + if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then + export glibc__force_gcc=yes + # once this is toggled on, it needs to stay on, since with CPP manipulated + # tc-is-clang does not work correctly anymore... + fi + + if [[ ${glibc__force_gcc} == "yes" ]] ; then + # If we are running in an otherwise clang/llvm environment, we need to + # recover the proper gcc and binutils settings here, at least until glibc + # is finally building with clang. So let's override everything that is + # set in the clang profiles. + # Want to shoot yourself into the foot? Set USE=custom-cflags, that's always + # a good start into that direction. + # Also, if you're crosscompiling, let's assume you know what you are doing. + # Hopefully. + # Last, we need the settings of the *build* environment, not of the + # target environment... + + local current_binutils_path=$(env CHOST="${CBUILD}" ROOT="${BROOT}" binutils-config -B "${CTARGET}") + local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B) + einfo "Overriding clang configuration, since it won't work here" + + export CC="${current_gcc_path}/${CTARGET}-gcc" + export CPP="${current_gcc_path}/${CTARGET}-cpp" + export CXX="${current_gcc_path}/${CTARGET}-g++" + export LD="${current_binutils_path}/ld.bfd" + export AR="${current_binutils_path}/ar" + export AS="${current_binutils_path}/as" + export NM="${current_binutils_path}/nm" + export STRIP="${current_binutils_path}/strip" + export RANLIB="${current_binutils_path}/ranlib" + export OBJCOPY="${current_binutils_path}/objcopy" + export STRINGS="${current_binutils_path}/strings" + export OBJDUMP="${current_binutils_path}/objdump" + export READELF="${current_binutils_path}/readelf" + export ADDR2LINE="${current_binutils_path}/addr2line" + + # do we need to also do flags munging here? yes! at least... + filter-flags '-fuse-ld=*' + filter-flags '-D_FORTIFY_SOURCE=*' + + else + + # this is the "normal" case + + export CC="$(tc-getCC ${CTARGET})" + export CXX="$(tc-getCXX ${CTARGET})" + export CPP="$(tc-getCPP ${CTARGET})" + + # Always use tuple-prefixed toolchain. For non-native ABI glibc's configure + # can't detect them automatically due to ${CHOST} mismatch and fallbacks + # to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup(). + export NM="$(tc-getNM ${CTARGET})" + export READELF="$(tc-getREADELF ${CTARGET})" + + fi + + # We need to export CFLAGS with abi information in them because glibc's + # configure script checks CFLAGS for some targets (like mips). Keep + # around the original clean value to avoid appending multiple ABIs on + # top of each other. (Why does the comment talk about CFLAGS if the code + # acts on CC?) + export glibc__GLIBC_CC=${CC} + export glibc__GLIBC_CXX=${CXX} + export glibc__GLIBC_CPP=${CPP} + + export glibc__abi_CFLAGS="$(get_abi_CFLAGS)" + + # CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760 + # To build .S (assembly) files with the same ABI-specific flags + # upstream currently recommends adding CFLAGS to CC/CXX: + # https://sourceware.org/PR23273 + # Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS + # and breaks multiarch support. See 659030#c3 for an example. + # The glibc configure script doesn't properly use LDFLAGS all the time. + export CC="${glibc__GLIBC_CC} ${glibc__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}" + + # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 + export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}" + + export CPP="${glibc__GLIBC_CPP} ${glibc__abi_CFLAGS} ${CFLAGS}" + + if is_crosscompile; then + # Assume worst-case bootstrap: glibc is built for the first time + # with ${CTARGET}-g++ not available yet. We avoid + # building auxiliary programs that require C++: bug #683074 + # It should not affect final result. + export libc_cv_cxx_link_ok=no + # The line above has the same effect. We set CXX explicitly + # to make build logs less confusing. + export CXX= + fi +} + +foreach_abi() { + setup_env + + local ret=0 + local abilist="" + if use multilib ; then + abilist=$(get_install_abis) + else + abilist=${DEFAULT_ABI} + fi + local -x ABI + for ABI in ${abilist:-default} ; do + setup_env + einfo "Running $1 for ABI ${ABI}" + $1 + : $(( ret |= $? )) + done + return ${ret} +} + +glibc_banner() { + local b="Gentoo ${PVR}" + [[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" (patchset ${PATCH_VER})" + echo "${b}" +} + +# The following Kernel version handling functions are mostly copied from portage +# source. It's better not to use linux-info.eclass here since a) it adds too +# much magic, see bug 326693 for some of the arguments, and b) some of the +# functions are just not provided. + +g_get_running_KV() { + uname -r + return $? +} + +g_KV_major() { + [[ -z $1 ]] && return 1 + local KV=$@ + echo "${KV%%.*}" +} + +g_KV_minor() { + [[ -z $1 ]] && return 1 + local KV=$@ + KV=${KV#*.} + echo "${KV%%.*}" +} + +g_KV_micro() { + [[ -z $1 ]] && return 1 + local KV=$@ + KV=${KV#*.*.} + echo "${KV%%[^[:digit:]]*}" +} + +g_KV_to_int() { + [[ -z $1 ]] && return 1 + local KV_MAJOR=$(g_KV_major "$1") + local KV_MINOR=$(g_KV_minor "$1") + local KV_MICRO=$(g_KV_micro "$1") + local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO )) + + # We make version 2.2.0 the minimum version we will handle as + # a sanity check ... if its less, we fail ... + if [[ ${KV_int} -ge 131584 ]] ; then + echo "${KV_int}" + return 0 + fi + return 1 +} + +g_int_to_KV() { + local version=$1 major minor micro + major=$((version / 65536)) + minor=$(((version % 65536) / 256)) + micro=$((version % 256)) + echo ${major}.${minor}.${micro} +} + +eend_KV() { + [[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]] + eend $? +} + +get_kheader_version() { + printf '#include \nLINUX_VERSION_CODE\n' | \ + $(tc-getCPP ${CTARGET}) -I "${ESYSROOT}$(alt_headers)" - | \ + tail -n 1 +} + +# We collect all sanity checks here. Consistency is not guranteed between +# pkg_ and src_ phases, so we call this function both in pkg_pretend and in +# src_unpack. +sanity_prechecks() { + # Prevent native builds from downgrading + if [[ ${MERGE_TYPE} != "buildonly" ]] && \ + [[ -z ${ROOT} ]] && \ + [[ ${CBUILD} == ${CHOST} ]] && \ + [[ ${CHOST} == ${CTARGET} ]] ; then + + # The high rev # is to allow people to downgrade between -r# + # versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2 + # should be fine. Hopefully we never actually use a r# this + # high. + if has_version ">${CATEGORY}/${P}-r10000" ; then + eerror "Sanity check to keep you from breaking your system:" + eerror " Downgrading glibc is not supported and a sure way to destruction." + [[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system." + fi + + if ! do_run_test '#include \n#include \nint main(){return syscall(1000)!=-1;}\n' ; then + eerror "Your old kernel is broken. You need to update it to a newer" + eerror "version as syscall() will break. See bug 279260." + die "Old and broken kernel." + fi + fi + + if [[ ${CTARGET} == i386-* ]] ; then + eerror "i386 CHOSTs are no longer supported." + eerror "Chances are you don't actually want/need i386." + eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml" + die "Please fix your CHOST" + fi + + if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then + ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS." + ewarn "This will result in a 50% performance penalty when running with a 32bit" + ewarn "hypervisor, which is probably not what you want." + fi + + # ABI-specific checks follow here. Hey, we have a lot more specific conditions that + # we test for... + if ! is_crosscompile ; then + if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then + ebegin "Checking if the system can execute 32-bit binaries" + echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" + local STAT + if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then + "${T}/check-ia32-emulation.elf32" + STAT=$? + else + # Don't fail here to allow single->multi ABI switch + # or recover from breakage like bug #646424 + ewarn "Failed to compile the ABI test. Broken host glibc?" + STAT=0 + fi + rm -f "${T}/check-ia32-emulation.elf32" + eend $STAT + if [[ $STAT -ne 0 ]]; then + eerror "Ensure that CONFIG_IA32_EMULATION is enabled in the kernel." + eerror "Seek support otherwise." + die "Unable to execute 32-bit binaries" + fi + fi + + fi + + # When we actually have to compile something... + if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then + if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then + # bug #833620, bug #643302 + eerror "Found ${ESYSROOT}/usr/lib/include directory!" + eerror "This is known to break glibc's build." + eerror "Please backup its contents then remove the directory." + die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!" + fi + + if [[ ${CTARGET} == *-linux* ]] ; then + local run_kv build_kv want_kv + + run_kv=$(g_get_running_KV) + build_kv=$(g_int_to_KV $(get_kheader_version)) + want_kv=${MIN_KERN_VER} + + if ! is_crosscompile && ! tc-is-cross-compiler ; then + # Building fails on an non-supporting kernel + ebegin "Checking running kernel version (${run_kv} >= ${want_kv})" + if ! eend_KV ${run_kv} ${want_kv} ; then + echo + eerror "You need a kernel of at least ${want_kv}!" + die "Kernel version too low!" + fi + fi + + # Do not run this check for pkg_pretend, just pkg_setup and friends (if we ever get used there). + # It's plausible (seen it in the wild) that Portage will (correctly) schedule a linux-headers + # upgrade before glibc, but because pkg_pretend gets run before any packages are merged at all (not + # just glibc), the whole emerge gets aborted without a good reason. We probably don't + # need to run this check at all given we have a dependency on the right headers, + # but let's leave it as-is for now. + if [[ ${EBUILD_PHASE_FUNC} != pkg_pretend ]] ; then + ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})" + if ! eend_KV ${build_kv} ${want_kv} ; then + echo + eerror "You need linux-headers of at least ${want_kv}!" + die "linux-headers version too low!" + fi + fi + fi + fi +} + +upgrade_warning() { + is_crosscompile && return + + if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then + if ver_replacing -lt $(ver_cut 1-2 ${PV}); then + ewarn "After upgrading glibc, please restart all running processes." + ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)." + ewarn "Alternatively, reboot your system." + ewarn "(See bug #660556, bug #741116, bug #823756, etc)" + fi + fi +} + +# +# the phases +# + +# pkg_pretend + +pkg_pretend() { + upgrade_warning +} + +# pkg_setup + +pkg_setup() { + # see bug 682570 + [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup +} + +# src_unpack + +src_unpack() { + setup_env + + einfo "Checking general environment sanity." + sanity_prechecks + + use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz + + if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git + https://github.com/gentoo/glibc-patches.git + " + EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git + git-r3_src_unpack + mv patches-git/9999 patches || die + EGIT_REPO_URI=" + https://sourceware.org/git/glibc.git + https://git.sr.ht/~sourceware/glibc + https://gitlab.com/x86-glibc/glibc.git + " + EGIT_CHECKOUT_DIR=${S} + git-r3_src_unpack + else + unpack ${P}.tar.xz + + cd "${WORKDIR}" || die + unpack glibc-${PV}-patches-${PATCH_VER}.tar.xz + fi + + cd "${WORKDIR}" || die + use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz +} + +# src_prepare + +src_prepare() { + local patchsetname + if ! use vanilla ; then + if [[ ${PV} == 9999* ]] ; then + patchsetname="from git master" + else + patchsetname="${PV}-${PATCH_VER}" + fi + einfo "Applying Gentoo Glibc patchset ${patchsetname}" + eapply "${WORKDIR}"/patches + einfo "Done." + fi + + default + + gnuconfig_update + + cd "${WORKDIR}" || die + find . -name configure -exec touch {} + + + # Fix permissions on some of the scripts. + chmod u+x "${S}"/scripts/*.sh + + cd "${S}" || die +} + +# src_configure + +glibc_do_configure() { + dump_build_environment + + local myconf=() + + # Use '=strong' instead of '=all' to protect only functions + # worth protecting from stack smashes. + myconf+=( --enable-stack-protector=$(usex ssp strong no) ) + + # Keep a whitelist of targets supporting IFUNC. glibc's ./configure + # is not robust enough to detect proper support: + # https://bugs.gentoo.org/641216 + # https://sourceware.org/PR22634#c0 + case $(tc-arch ${CTARGET}) in + # Keep whitelist of targets where autodetection mostly works. + amd64|x86|sparc|ppc|ppc64|arm|arm64|s390|riscv|loong) ;; + # Blacklist everywhere else + *) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;; + esac + + case ${ABI}-${CTARGET} in + amd64-x86_64-*|x32-x86_64-*-*-gnux32) myconf+=( $(use_enable cet) ) ;; + *) ;; + esac + + [[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp ) + + myconf+=( --enable-kernel=${MIN_KERN_VER} ) + + # Since SELinux support is only required for nscd, only enable it if: + # 1. USE selinux + # 2. only for the primary ABI on multilib systems + # 3. Not a crosscompile + if ! is_crosscompile && use selinux ; then + if use multilib ; then + if is_final_abi ; then + myconf+=( --with-selinux ) + else + myconf+=( --without-selinux ) + fi + else + myconf+=( --with-selinux ) + fi + else + myconf+=( --without-selinux ) + fi + + # Force a few tests where we always know the answer but + # configure is incapable of finding it. + if is_crosscompile ; then + export \ + libc_cv_c_cleanup=yes \ + libc_cv_forced_unwind=yes + fi + + myconf+=( + --disable-werror + --enable-bind-now + --enable-fortify-source + --build=${CBUILD_OPT:-${CBUILD}} + --host=${CTARGET_OPT:-${CTARGET}} + $(use_enable profile) + $(use_with gd) + --with-headers="${ESYSROOT}$(alt_headers)" + --prefix="$(host_eprefix)/usr" + --sysconfdir="$(host_eprefix)/etc" + --localstatedir="$(host_eprefix)/var" + --libdir='$(prefix)'/$(get_libdir) + --mandir='$(prefix)'/share/man + --infodir='$(prefix)'/share/info + --libexecdir='$(libdir)'/misc/glibc + --with-bugurl=https://bugs.gentoo.org/ + --with-pkgversion="$(glibc_banner)" + $(use_multiarch || echo --disable-multi-arch) + $(use_enable systemtap) + $(use_enable nscd) + + # /usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks fail if + # Perl hasn't been installed inside the prefix yet and configure picks + # up a Perl from outside the prefix instead. configure will fail to + # execute Perl during configure if we're cross-compiling a prefix, but + # it will just disable mtrace in that case. + # Note: mtrace is needed by the test suite. + ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl $(usex doc "${EPREFIX}"/usr/bin/perl no)))" + + # locale data is arch-independent + # https://bugs.gentoo.org/753740 + libc_cv_complocaledir='${exec_prefix}/lib/locale' + + # On aarch64 there is no way to override -mcpu=native, and if + # the current cpu does not support SVE configure fails. + # Let's boldly assume our toolchain can always build SVE instructions. + libc_cv_aarch64_sve_asm=yes + + ${EXTRA_ECONF} + ) + + # We rely on sys-libs/timezone-data for timezone tools normally. + myconf+=( $(use_enable vanilla timezone-tools) ) + + # These libs don't have configure flags. + ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no) + ac_cv_lib_cap_cap_init=$(usex caps || echo no) + + # There is no configure option for this and we need to export it + # since the glibc build will re-run configure on itself + export libc_cv_rootsbindir="$(host_eprefix)/sbin" + export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)" + + local builddir=$(builddir nptl) + mkdir -p "${builddir}" + cd "${builddir}" + set -- "${S}"/configure "${myconf[@]}" + echo "$@" + "$@" || die "failed to configure glibc" + + # If we're trying to migrate between ABI sets, we need + # to lie and use a local copy of gcc. Like if the system + # is built with MULTILIB_ABIS="amd64 x86" but we want to + # add x32 to it, gcc/glibc don't yet support x32. + # + if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then + echo 'int main(void){}' > "${T}"/test.c || die + if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then + sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die + fi + fi +} + +glibc_headers_configure() { + export ABI=default + + local builddir=$(builddir "headers") + mkdir -p "${builddir}" + cd "${builddir}" + + # if we don't have a compiler yet, we can't really test it now ... + # hopefully they don't affect header generation, so let's hope for + # the best here ... + local v vars=( + ac_cv_header_cpuid_h=yes + libc_cv_{386,390,alpha,arm,hppa,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes + libc_cv_asm_cfi_directives=yes + libc_cv_broken_visibility_attribute=no + libc_cv_c_cleanup=yes + libc_cv_compiler_powerpc64le_binary128_ok=yes + libc_cv_forced_unwind=yes + libc_cv_gcc___thread=yes + libc_cv_mlong_double_128=yes + libc_cv_mlong_double_128ibm=yes + libc_cv_ppc_machine=yes + libc_cv_ppc_rel16=yes + libc_cv_predef_fortify_source=no + libc_cv_target_power8_ok=yes + libc_cv_visibility_attribute=yes + libc_cv_z_combreloc=yes + libc_cv_z_execstack=yes + libc_cv_z_initfirst=yes + libc_cv_z_nodelete=yes + libc_cv_z_nodlopen=yes + libc_cv_z_relro=yes + libc_mips_abi=${ABI} + libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard) + # These libs don't have configure flags. + ac_cv_lib_audit_audit_log_user_avc_message=no + ac_cv_lib_cap_cap_init=no + ) + + einfo "Forcing cached settings:" + for v in "${vars[@]}" ; do + einfo " ${v}" + export ${v} + done + + local headers_only_arch_CPPFLAGS=() + + # Blow away some random CC settings that screw things up. #550192 + if [[ -d ${S}/sysdeps/mips ]]; then + pushd "${S}"/sysdeps/mips >/dev/null + sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die + sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die + + # Force the mips ABI to the default. This is OK because the set of + # installed headers in this phase is the same between the 3 ABIs. + # If this ever changes, this hack will break, but that's unlikely + # as glibc discourages that behavior. + # https://crbug.com/647033 + sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die + + popd >/dev/null + fi + + local myconf=() + + case ${CTARGET} in + aarch64*) + # The configure checks fail during cross-build, so disable here + # for headers-only + myconf+=( + --disable-mathvec + ) ;; + riscv*) + # RISC-V interrogates the compiler to determine which target to + # build. If building the headers then we don't strictly need a + # RISC-V compiler, so the built-in definitions that are provided + # along with all RISC-V compiler might not exist. This causes + # glibc's RISC-V preconfigure script to blow up. Since we're just + # building the headers any value will actually work here, so just + # pick the standard one (rv64g/lp64d) to make the build scripts + # happy for now -- the headers are all the same anyway so it + # doesn't matter. + headers_only_arch_CPPFLAGS+=( + -D__riscv_xlen=64 + -D__riscv_flen=64 + -D__riscv_float_abi_double=1 + -D__riscv_atomic=1 + ) ;; + esac + + myconf+=( + --disable-sanity-checks + --enable-hacker-mode + --disable-werror + --enable-bind-now + --build=${CBUILD_OPT:-${CBUILD}} + --host=${CTARGET_OPT:-${CTARGET}} + --with-headers="${ESYSROOT}$(alt_headers)" + --prefix="$(host_eprefix)/usr" + ${EXTRA_ECONF} + ) + + # Nothing is compiled here which would affect the headers for the target. + # So forcing CC/CFLAGS is sane. + local headers_only_CC=$(tc-getBUILD_CC) + local headers_only_CFLAGS="-O1 -pipe" + local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}" + local headers_only_LDFLAGS="" + set -- "${S}"/configure "${myconf[@]}" + echo \ + "CC=${headers_only_CC}" \ + "CFLAGS=${headers_only_CFLAGS}" \ + "CPPFLAGS=${headers_only_CPPFLAGS}" \ + "LDFLAGS=${headers_only_LDFLAGS}" \ + "$@" + CC=${headers_only_CC} \ + CFLAGS=${headers_only_CFLAGS} \ + CPPFLAGS=${headers_only_CPPFLAGS} \ + LDFLAGS="" \ + "$@" || die "failed to configure glibc" +} + +do_src_configure() { + if just_headers ; then + glibc_headers_configure + else + glibc_do_configure nptl + fi +} + +src_configure() { + foreach_abi do_src_configure +} + +# src_compile + +do_src_compile() { + emake -C "$(builddir nptl)" +} + +src_compile() { + if just_headers ; then + return + fi + + foreach_abi do_src_compile +} + +# src_test + +glibc_src_test() { + cd "$(builddir nptl)" + + local myxfailparams="" + if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then + local virt=$(systemd-detect-virt 2>/dev/null) + if [[ ${virt} == systemd-nspawn ]] ; then + ewarn "Skipping extra tests because in systemd-nspawn container" + XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" ) + fi + if [[ "$(nice)" == "19" ]] ; then + # Expects to be able to increase niceness, which it can't do if + # already at the highest nice value + XFAIL_TEST_LIST+=( "tst-nice" ) + fi + + for myt in ${XFAIL_TEST_LIST[@]} ; do + myxfailparams+="test-xfail-${myt}=yes " + done + fi + + # sandbox does not understand unshare() and prevents + # writes to /proc/, which makes many tests fail + + # we give the tests a bit more time to avoid spurious + # bug reports on slow arches + + SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 emake ${myxfailparams} check +} + +src_test() { + if just_headers ; then + return + fi + + foreach_abi glibc_src_test || die "tests failed" +} + +# src_install + +run_locale_gen() { + # if the host locales.gen contains no entries, we'll install everything + local root="$1" + local inplace="" + + if [[ "${root}" == "--inplace-glibc" ]] ; then + inplace="--inplace-glibc" + root="$2" + fi + + local locale_list="${root%/}/etc/locale.gen" + + pushd "${ED}"/$(get_libdir) >/dev/null + + if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then + [[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space" + locale_list="${root%/}/usr/share/i18n/SUPPORTED" + fi + + # bug 736794: we need to be careful with the parallelization... the number of + # processors saved in the environment of a binary package may differ strongly + # from the number of processes available during postinst + local mygenjobs="$(makeopts_jobs)" + if [[ "${EMERGE_FROM}" == "binary" ]] ; then + mygenjobs="$(nproc)" + fi + + set -- locale-gen ${inplace} --jobs "${mygenjobs}" --config "${locale_list}" \ + --destdir "${root}" + echo "$@" + "$@" + + popd >/dev/null +} + +glibc_do_src_install() { + local builddir=$(builddir nptl) + cd "${builddir}" + + emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install + + # This version (2.26) provides some compatibility libraries for the NIS/NIS+ support + # which come without headers etc. Only needed for binary packages since the + # external net-libs/libnsl has increased soversion. Keep only versioned libraries. + find "${D}" -name "libnsl.a" -delete + find "${D}" -name "libnsl.so" -delete + + # Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need + # to infer upstream version: + # '#define VERSION "2.26.90"' -> '2.26.90' + local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h) + + # Avoid stripping binaries not targeted by ${CHOST}. Or else + # ${CHOST}-strip would break binaries build for ${CTARGET}. + is_crosscompile && dostrip -x / + + # gdb thread introspection relies on local libpthreads symbols. stripping breaks it + # See Note [Disable automatic stripping] + dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so + # valgrind requires knowledge about ld.so symbols. + dostrip -x $(alt_libdir)/ld-*.so* + + if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then + # Move versioned .a file out of libdir to evade portage QA checks + # instead of using gen_usr_ldscript(). We fix ldscript as: + # "GROUP ( /usr/lib64/libm-.a ..." -> "GROUP ( /usr/lib64/glibc-/libm-.a ..." + sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" \ + "${ED}"/$(alt_usrlibdir)/libm.a || die + dodir $(alt_usrlibdir)/${P} + mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a \ + "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die + fi + + # We configure toolchains for standalone prefix systems with a sysroot, + # which is prepended to paths in ld scripts, so strip the prefix from these. + # Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) ) + # After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) ) + if [[ -n $(host_eprefix) ]] ; then + local file + grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do + sed -i "s|$(host_eprefix)/|/|g" "${file}" || die + done + fi + + # We'll take care of the cache ourselves + rm -f "${ED}"/etc/ld.so.cache + + # Everything past this point just needs to be done once ... + is_final_abi || return 0 + + # Make sure the non-native interp can be found on multilib systems even + # if the main library set isn't installed into the right place. Maybe + # we should query the active gcc for info instead of hardcoding it ? + local i ldso_abi ldso_name + local ldso_abi_list=( + # x86 + amd64 /lib64/ld-linux-x86-64.so.2 + x32 /libx32/ld-linux-x32.so.2 + x86 /lib/ld-linux.so.2 + # mips + o32 /lib/ld.so.1 + n32 /lib32/ld.so.1 + n64 /lib64/ld.so.1 + # powerpc + ppc /lib/ld.so.1 + # riscv + ilp32d /lib/ld-linux-riscv32-ilp32d.so.1 + ilp32 /lib/ld-linux-riscv32-ilp32.so.1 + lp64d /lib/ld-linux-riscv64-lp64d.so.1 + lp64 /lib/ld-linux-riscv64-lp64.so.1 + # s390 + s390 /lib/ld.so.1 + s390x /lib/ld64.so.1 + # sparc + sparc32 /lib/ld-linux.so.2 + sparc64 /lib64/ld-linux.so.2 + ) + case $(tc-endian) in + little) + ldso_abi_list+=( + # arm + arm64 /lib/ld-linux-aarch64.so.1 + # ELFv2 (glibc does not support ELFv1 on LE) + ppc64 /lib64/ld64.so.2 + ) + ;; + big) + ldso_abi_list+=( + # arm + arm64 /lib/ld-linux-aarch64_be.so.1 + # ELFv1 (glibc does not support ELFv2 on BE) + ppc64 /lib64/ld64.so.1 + ) + ;; + esac + if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib + fi + for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do + ldso_abi=${ldso_abi_list[i]} + has ${ldso_abi} $(get_install_abis) || continue + + ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}" + if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then + dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name} + fi + done + + # In the LSB 5.0 definition, someone had the excellent idea to "standardize" + # the runtime loader name, see also https://xkcd.com/927/ + # Normally, in Gentoo one should never come across executables that require this. + # However, binary commercial packages are known to adhere to weird practices. + # https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB + local lsb_ldso_name native_ldso_name lsb_ldso_abi + local lsb_ldso_abi_list=( + # x86 + amd64 ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3 + ) + for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do + lsb_ldso_abi=${lsb_ldso_abi_list[i]} + native_ldso_name=${lsb_ldso_abi_list[i+1]} + lsb_ldso_name=${lsb_ldso_abi_list[i+2]} + has ${lsb_ldso_abi} $(get_install_abis) || continue + + if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then + dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}" + fi + done + + # With devpts under Linux mounted properly, we do not need the pt_chown + # binary to be setuid. This is because the default owners/perms will be + # exactly what we want. + if ! use suid ; then + find "${ED}" -name pt_chown -exec chmod -s {} + + fi + + ################################################################# + # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # + ################################################################# + + # Make sure we install some symlink hacks so that when we build + # a 2nd stage cross-compiler, gcc finds the target system + # headers correctly. See gcc/doc/gccinstall.info + if is_crosscompile ; then + # We need to make sure that /lib and /usr/lib always exists. + # gcc likes to use relative paths to get to its multilibs like + # /usr/lib/../lib64/. So while we don't install any files into + # /usr/lib/, we do need it to exist. + keepdir $(alt_prefix)/lib + keepdir $(alt_prefix)/usr/lib + + dosym usr/include $(alt_prefix)/sys-include + return 0 + fi + + # Files for Debian-style locale updating + dodir /usr/share/i18n + sed \ + -e "/^#/d" \ + -e "/SUPPORTED-LOCALES=/d" \ + -e "s: \\\\::g" -e "s:/: :g" \ + "${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \ + || die "generating /usr/share/i18n/SUPPORTED failed" + + cd "${S}" || die + + # Install misc network config files + insinto /etc + doins posix/gai.conf + + if use systemd ; then + doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf" + else + doins nss/nsswitch.conf + fi + + # Gentoo-specific + newins "${FILESDIR}"/host.conf-1 host.conf + + if use nscd ; then + doins nscd/nscd.conf + + newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd + + local nscd_args=( + -e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):" + ) + + sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd + + use systemd && systemd_dounit nscd/nscd.service + newtmpfiles nscd/nscd.tmpfiles nscd.conf + fi + + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc + doenvd "${T}"/00glibc + + for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do + [[ -s ${d} ]] && dodoc ${d} + done + dodoc -r ChangeLog.old + + # Prevent overwriting of the /etc/localtime symlink. We'll handle the + # creation of the "factory" symlink in pkg_postinst(). + rm -f "${ED}"/etc/localtime + + # Generate all locales if this is a native build as locale generation + if use compile-locales && ! is_crosscompile ; then + run_locale_gen --inplace-glibc "${ED}/" + fi +} + +glibc_headers_install() { + local builddir=$(builddir "headers") + cd "${builddir}" + emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers + + insinto $(alt_headers)/gnu + doins "${S}"/include/gnu/stubs.h + + # Make sure we install the sys-include symlink so that when + # we build a 2nd stage cross-compiler, gcc finds the target + # system headers correctly. See gcc/doc/gccinstall.info + dosym usr/include $(alt_prefix)/sys-include +} + +src_install() { + if just_headers ; then + export ABI=default + glibc_headers_install + return + fi + + foreach_abi glibc_do_src_install + + if ! use static-libs ; then + einfo "Not installing static glibc libraries" + find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete + fi +} + +# Simple test to make sure our new glibc isn't completely broken. +# Make sure we don't test with statically built binaries since +# they will fail. Also, skip if this glibc is a cross compiler. +# +# If coreutils is built with USE=multicall, some of these files +# will just be wrapper scripts, not actual ELFs we can test. +glibc_sanity_check() { + cd / #228809 + + # We enter ${ED} so to avoid trouble if the path contains + # special characters; for instance if the path contains the + # colon character (:), then the linker will try to split it + # and look for the libraries in an unexpected place. This can + # lead to unsafe code execution if the generated prefix is + # within a world-writable directory. + # (e.g. /var/tmp/portage:${HOSTNAME}) + pushd "${ED}"/$(get_libdir) >/dev/null + + # first let's find the actual dynamic linker here + # symlinks may point to the wrong abi + local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit) + + einfo Last-minute run tests with ${newldso} in /$(get_libdir) ... + + local x striptest + for x in cal date env free ls true uname uptime ; do + x=$(type -p ${x}) + [[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue + striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue + case ${striptest} in + *"statically linked"*) continue;; + *"ASCII text"*) continue;; + esac + # We need to clear the locale settings as the upgrade might want + # incompatible locale data. This test is not for verifying that. + LC_ALL=C \ + ${newldso} --library-path . ${x} > /dev/null \ + || die "simple run test (${x}) failed" + done + + popd >/dev/null +} + +pkg_preinst() { + # nothing to do if just installing headers + just_headers && return + + einfo "Checking general environment sanity." + sanity_prechecks + + # prepare /etc/ld.so.conf.d/ for files + mkdir -p "${EROOT}"/etc/ld.so.conf.d + + # Default /etc/hosts.conf:multi to on for systems with small dbs. + if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then + sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf + einfo "Defaulting /etc/host.conf:multi to on" + fi + + [[ -n ${ROOT} ]] && return 0 + [[ -d ${ED}/$(get_libdir) ]] || return 0 + [[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check + + if [[ -L ${EROOT}/usr/lib/locale ]]; then + # Help portage migrate this to a directory + # https://bugs.gentoo.org/753740 + rm "${EROOT}"/usr/lib/locale || die + fi + + # Keep around libcrypt so that Perl doesn't break when merging libxcrypt + # (libxcrypt is the new provider for now of libcrypt.so.{1,2}). + # bug #802207 + if has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then + PRESERVED_OLD_LIBCRYPT=1 + cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" \ + "${T}/libcrypt$(get_libname 1)" || die + else + PRESERVED_OLD_LIBCRYPT=0 + fi +} + +glibc_refresh_ldconfig() { + if [[ ${MERGE_TYPE} == buildonly ]]; then + return + fi + + # Version check could be added to avoid unnecessary work, but ldconfig + # should finish quickly enough to not matter. + ebegin "Refreshing ld.so.cache" + ldconfig -i + if ! eend $?; then + ewarn "Failed to refresh the ld.so.cache for you. Some programs may be broken" + ewarn "before you manually do so (ldconfig -i)." + fi +} + +pkg_postinst() { + # nothing to do if just installing headers + just_headers && return + + if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then + # Generate fastloading iconv module configuration file. + "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/" + fi + + if ! is_crosscompile && [[ -z ${ROOT} ]] ; then + # glibc-2.38+ on loong has ldconfig support added, but the ELF e_flags + # handling has changed as well, which means stale ldconfig auxiliary + # cache entries and failure to lookup libgcc_s / libstdc++ (breaking + # every C++ application) / libgomp etc., among other breakages. + # + # To fix this, simply refresh the ld.so.cache without using the + # auxiliary cache if we're natively installing on loong. This should + # be done relatively soon because we want to minimize the breakage + # window for the affected programs. + use loong && glibc_refresh_ldconfig + + use compile-locales || run_locale_gen "${EROOT}/" + + # If fixincludes was/is active for a particular GCC slot, we + # must refresh it. See bug #933282 and GCC's documentation: + # https://gcc.gnu.org/onlinedocs/gcc/Fixed-Headers.html + # + # TODO: Could this be done for cross? Some care would be needed + # to pass the right arguments. + while IFS= read -r -d $'\0' slot ; do + local mkheaders_path="${BROOT}"/usr/libexec/gcc/${CBUILD}/${slot##*/}/install-tools/mkheaders + local pthread_h="${BROOT}"/usr/lib/gcc/${CBUILD}/${slot##*/}/include-fixed/pthread.h + if [[ -x ${mkheaders_path} ]] ; then + ebegin "Refreshing fixincludes for ${CBUILD} with gcc-${slot##*/}" + ${mkheaders_path} -v + eend $? + elif [[ -f ${pthread_h} ]] ; then + # fixincludes might have been enabled in the past for this + # GCC slot but not since we fixed toolchain.eclass to install + # mkheaders, so we need to manually delete pthread.h at least. + ebegin "Deleting stale fixincludes'd pthread.h for ${CBUILD} with gcc-${slot##*/}" + mv -v "${pthread_h}" "${pthread_h}.bak" + eend $? + fi + done < <(find "${BROOT}"/usr/libexec/gcc/${CBUILD}/ -mindepth 1 -maxdepth 1 -type d -print0) + fi + + upgrade_warning + + # Check for sanity of /etc/nsswitch.conf, take 2 + if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then + local entry + for entry in passwd group shadow; do + if grep -E -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then + ewarn "" + ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been" + ewarn "removed from glibc and is now provided by the package" + ewarn " sys-auth/libnss-nis" + ewarn "Install it now to keep your NIS setup working." + ewarn "" + fi + done + fi + + if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then + cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die + preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1) + + elog "Please ignore a possible later error message about a file collision involving" + elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep" + elog "the upgrade working, but it also needs to be overwritten when" + elog "sys-libs/libxcrypt is installed. See bug 802210 for more details." + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.41.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.41.ebuild index 394b594a66..68691e0cd0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.41.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-2.41.ebuild @@ -1710,7 +1710,7 @@ pkg_postinst() { # must refresh it. See bug #933282 and GCC's documentation: # https://gcc.gnu.org/onlinedocs/gcc/Fixed-Headers.html # - # TODO: Could this be done for non-cross? Some care would be needed + # TODO: Could this be done for cross? Some care would be needed # to pass the right arguments. while IFS= read -r -d $'\0' slot ; do local mkheaders_path="${BROOT}"/usr/libexec/gcc/${CBUILD}/${slot##*/}/install-tools/mkheaders diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-9999.ebuild index f66d2de88d..f1adca0c21 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/glibc/glibc-9999.ebuild @@ -1710,7 +1710,7 @@ pkg_postinst() { # must refresh it. See bug #933282 and GCC's documentation: # https://gcc.gnu.org/onlinedocs/gcc/Fixed-Headers.html # - # TODO: Could this be done for non-cross? Some care would be needed + # TODO: Could this be done for cross? Some care would be needed # to pass the right arguments. while IFS= read -r -d $'\0' slot ; do local mkheaders_path="${BROOT}"/usr/libexec/gcc/${CBUILD}/${slot##*/}/install-tools/mkheaders From ebd06081d1c577d365103cd334027d6d0269c7bb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:05 +0000 Subject: [PATCH 134/153] sys-libs/libnvme: Sync with Gentoo It's from Gentoo commit e37fd11363a6aec2887e3b9a2bff4355eb47f63d. --- .../portage-stable/sys-libs/libnvme/Manifest | 3 - .../files/libnvme-1.9-musl-stdint.patch | 59 -------------- .../sys-libs/libnvme/libnvme-1.10.ebuild | 76 ------------------ .../sys-libs/libnvme/libnvme-1.11.1.ebuild | 4 +- .../sys-libs/libnvme/libnvme-1.11.ebuild | 76 ------------------ .../sys-libs/libnvme/libnvme-1.9.ebuild | 80 ------------------- 6 files changed, 2 insertions(+), 296 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libnvme/files/libnvme-1.9-musl-stdint.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.10.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.11.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.9.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/Manifest index b084f510e7..59fd69b7f8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/Manifest @@ -1,4 +1 @@ -DIST libnvme-1.10.gh.tar.gz 720737 BLAKE2B eb5941cbdec1ccf5782c3e438b55dd09ddd2c3b9ac1079d5642896d0d80d75ece3149ebe9d965c2783a5ae2ddfad64ae0051f9c63822a739108d53eb44a583db SHA512 44e8a407c9fda8c296163832c14ba167caab53eab315bd2dee94275458532429f12a35e0adef1356420d83127e658a354ce65ac946acaa53bef2d46a8189054c DIST libnvme-1.11.1.gh.tar.gz 740327 BLAKE2B eb9a731ce4886e7a76170d4be916e850548710dbbc135bbe94c5ff0c2f3da5e2cb162a6c8ea857d6b9b609ffafba34487cd3419fc4981e9e549419c2bb757568 SHA512 8720f2907a3d13af44fb3deec883cd6eb247d5861c4459b5fe0e67ff9ecfb565462a5faf39d43e08b5284f3e8ca8e72d41b333984beaa45d3287b1a258f3e59d -DIST libnvme-1.11.gh.tar.gz 740365 BLAKE2B c4d5950b0d0769f1aaddc6d82364ad14ae3b1b6e2b5d16225c8599833e51516c14b8802b77562b08cbb54c15b8e5814d7f5b059939c197b87375afba899ffe3d SHA512 5c1d00fe57ff699be01c326e24612da25e1772578928e2c70fb5f67e8a9fe0fa4c95e18f58d4abefa0e163e99c9e37b1109298e805e174b033e749d19865336b -DIST libnvme-1.9.tar.gz 657952 BLAKE2B e9d655709770f7c1d9c916cc9539b8ea096b0d5bf6b12079c2db494f070c98b6c388e2a79ed27a4932994a00d44da93fa3119ee224c48d40347a483548397349 SHA512 39a3346805143f93a17d00cfcb6fb75f82154658db6079134c09dfa989995ac5de79b1ce1ac091b4e997523d3216829ce9eac44110c9f59f9fd21636529c8b25 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/files/libnvme-1.9-musl-stdint.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/files/libnvme-1.9-musl-stdint.patch deleted file mode 100644 index c2319b72bc..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/files/libnvme-1.9-musl-stdint.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://github.com/linux-nvme/libnvme/pull/838 - -From b3ca2923affce631bc302f0fdce565093ffe1b5b Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 4 May 2024 10:59:16 +0100 -Subject: [PATCH] Use C99 types for uint32_t - - provides `uint32_t`, while `u_int_32` is an unofficial/internal -typedef that glibc happens to provide. This fixes the build on musl. - -Bug: https://bugs.gentoo.org/931194 - -Signed-off-by: Sam James ---- a/src/nvme/base64.c -+++ b/src/nvme/base64.c -@@ -7,6 +7,7 @@ - * Author: Hannes Reinecke - */ - -+#include - #include - #include - #include -@@ -29,7 +30,7 @@ static const char base64_table[65] = - int base64_encode(const unsigned char *src, int srclen, char *dst) - { - int i, bits = 0; -- u_int32_t ac = 0; -+ uint32_t ac = 0; - char *cp = dst; - - for (i = 0; i < srclen; i++) { -@@ -64,7 +65,7 @@ int base64_encode(const unsigned char *src, int srclen, char *dst) - */ - int base64_decode(const char *src, int srclen, unsigned char *dst) - { -- u_int32_t ac = 0; -+ uint32_t ac = 0; - int i, bits = 0; - unsigned char *bp = dst; - ---- a/src/nvme/linux.c -+++ b/src/nvme/linux.c -@@ -1513,10 +1513,10 @@ unsigned char *nvme_import_tls_key(const char *encoded_key, int *key_len, - return NULL; - } - crc = crc32(crc, decoded_key, decoded_len); -- key_crc = ((u_int32_t)decoded_key[decoded_len]) | -- ((u_int32_t)decoded_key[decoded_len + 1] << 8) | -- ((u_int32_t)decoded_key[decoded_len + 2] << 16) | -- ((u_int32_t)decoded_key[decoded_len + 3] << 24); -+ key_crc = ((uint32_t)decoded_key[decoded_len]) | -+ ((uint32_t)decoded_key[decoded_len + 1] << 8) | -+ ((uint32_t)decoded_key[decoded_len + 2] << 16) | -+ ((uint32_t)decoded_key[decoded_len + 3] << 24); - if (key_crc != crc) { - nvme_msg(NULL, LOG_ERR, "CRC mismatch (key %08x, crc %08x)", - key_crc, crc); - diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.10.ebuild deleted file mode 100644 index 183c721987..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.10.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit python-r1 meson - -DESCRIPTION="C Library for NVM Express on Linux" -HOMEPAGE="https://github.com/linux-nvme/libnvme" -SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="dbus +json keyutils python ssl test +uuid" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" - -DEPEND=" - json? ( dev-libs/json-c:= ) - keyutils? ( sys-apps/keyutils:= ) - dbus? ( sys-apps/dbus:= ) - python? ( ${PYTHON_DEPS} ) - ssl? ( >=dev-libs/openssl-1.1:= ) - uuid? ( sys-apps/util-linux:= ) -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - dev-lang/swig -" - -src_configure() { - local emesonargs=( - -Dpython=disabled - $(meson_use test tests) - $(meson_feature json json-c) - $(meson_feature dbus libdbus) - $(meson_feature keyutils) - $(meson_feature ssl openssl) - ) - meson_src_configure -} - -python_compile() { - local emesonargs=( - -Dpython=enabled - ) - meson_src_configure --reconfigure - meson_src_compile -} - -src_compile() { - meson_src_compile - - if use python; then - python_copy_sources - python_foreach_impl python_compile - fi -} - -python_install() { - meson_src_install - use python && python_optimize -} - -src_install() { - use python && python_foreach_impl python_install - - meson_src_install -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.11.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.11.1.ebuild index 19b3949be0..cbd3be2b08 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.11.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.11.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz - LICENSE="LGPL-2.1+" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="dbus +json keyutils python ssl test +uuid" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.11.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.11.ebuild deleted file mode 100644 index 3561f1c9e5..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.11.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} python3_13t ) -inherit python-r1 meson - -DESCRIPTION="C Library for NVM Express on Linux" -HOMEPAGE="https://github.com/linux-nvme/libnvme" -SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0/1" -KEYWORDS="~alpha ~amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="dbus +json keyutils python ssl test +uuid" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" - -DEPEND=" - json? ( dev-libs/json-c:= ) - keyutils? ( sys-apps/keyutils:= ) - dbus? ( sys-apps/dbus:= ) - python? ( ${PYTHON_DEPS} ) - ssl? ( >=dev-libs/openssl-1.1:= ) - uuid? ( sys-apps/util-linux:= ) -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - dev-lang/swig -" - -src_configure() { - local emesonargs=( - -Dpython=disabled - $(meson_use test tests) - $(meson_feature json json-c) - $(meson_feature dbus libdbus) - $(meson_feature keyutils) - $(meson_feature ssl openssl) - ) - meson_src_configure -} - -python_compile() { - local emesonargs=( - -Dpython=enabled - ) - meson_src_configure --reconfigure - meson_src_compile -} - -src_compile() { - meson_src_compile - - if use python; then - python_copy_sources - python_foreach_impl python_compile - fi -} - -python_install() { - meson_src_install - use python && python_optimize -} - -src_install() { - use python && python_foreach_impl python_install - - meson_src_install -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.9.ebuild deleted file mode 100644 index 5e8a103a65..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libnvme/libnvme-1.9.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit python-r1 meson - -DESCRIPTION="C Library for NVM Express on Linux" -HOMEPAGE="https://github.com/linux-nvme/libnvme" -SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86" -IUSE="dbus +json keyutils python ssl test +uuid" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" - -DEPEND=" - json? ( dev-libs/json-c:= ) - keyutils? ( sys-apps/keyutils:= ) - dbus? ( sys-apps/dbus:= ) - python? ( ${PYTHON_DEPS} ) - ssl? ( >=dev-libs/openssl-1.1:= ) - uuid? ( sys-apps/util-linux:= ) -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - dev-lang/swig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9-musl-stdint.patch -) - -src_configure() { - local emesonargs=( - -Dpython=disabled - $(meson_use test tests) - $(meson_feature json json-c) - $(meson_feature dbus libdbus) - $(meson_feature keyutils) - $(meson_feature ssl openssl) - ) - meson_src_configure -} - -python_compile() { - local emesonargs=( - -Dpython=enabled - ) - meson_src_configure --reconfigure - meson_src_compile -} - -src_compile() { - meson_src_compile - - if use python; then - python_copy_sources - python_foreach_impl python_compile - fi -} - -python_install() { - meson_src_install - use python && python_optimize -} - -src_install() { - use python && python_foreach_impl python_install - - meson_src_install -} From 0004c49fbeeca83534dfc0d0dc2db80d2888b2db Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:06 +0000 Subject: [PATCH 135/153] sys-libs/libseccomp: Sync with Gentoo It's from Gentoo commit 1b1023ec6bee0475caa7ec6d74a2983bfb8a0238. --- .../files/libseccomp-2.6.0-aliasing.patch | 69 +++++++++++ .../libseccomp-2.6.0-drop-bogus-test.patch | 31 +++++ .../libseccomp/libseccomp-2.6.0-r1.ebuild | 108 ++++++++++++++++++ .../libseccomp/libseccomp-2.6.0.ebuild | 3 +- 4 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.6.0-aliasing.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.6.0-drop-bogus-test.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.6.0-aliasing.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.6.0-aliasing.patch new file mode 100644 index 0000000000..f946dc4688 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.6.0-aliasing.patch @@ -0,0 +1,69 @@ +https://github.com/seccomp/libseccomp/pull/459 + +From e6904da422e68031b0237c1e005fc5e98c12e2cf Mon Sep 17 00:00:00 2001 +From: Romain Geissler +Date: Tue, 18 Feb 2025 22:29:05 +0000 +Subject: [PATCH] Fix strict aliasing UB in MurMur hash implementation. + +This was spotted when trying to upgrade the libseccomp fedora package to +version 2.6.0 in fedora rawhide. It comes with gcc 15 and LTO enabled by +default. When running the test 61-sim-transactions we get plenty of such +errors in valgrind: + +==265507== Use of uninitialised value of size 8 +==265507== at 0x4096AD: _hsh_add (gen_bpf.c:599) +==265507== by 0x40A557: UnknownInlinedFun (gen_bpf.c:2016) +==265507== by 0x40A557: gen_bpf_generate (gen_bpf.c:2341) +==265507== by 0x400CDE: UnknownInlinedFun (db.c:2685) +==265507== by 0x400CDE: UnknownInlinedFun (db.c:2682) +==265507== by 0x400CDE: UnknownInlinedFun (api.c:756) +==265507== by 0x400CDE: UnknownInlinedFun (util.c:162) +==265507== by 0x400CDE: UnknownInlinedFun (util.c:153) +==265507== by 0x400CDE: main (61-sim-transactions.c:128) +==265507== Uninitialised value was created by a stack allocation +==265507== at 0x409590: _hsh_add (gen_bpf.c:573) + +Investigating this a bit, it seems that because of LTO the MurMur hash +implementation is being inlined in _hsh_add. The way we call getblock32 +with the explicit cast to const uint32_t* is a strict aliasing +violation. + +This is reproducible on a "fedora:rawhide" container (gcc 15) and using: +export CFLAGS='-O2 -flto=auto -ffat-lto-objects -g' + +Signed-off-by: Romain Geissler +--- + src/hash.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/hash.c b/src/hash.c +index 4435900f..301abfc9 100644 +--- a/src/hash.c ++++ b/src/hash.c +@@ -12,15 +12,11 @@ + */ + + #include ++#include + #include + + #include "hash.h" + +-static inline uint32_t getblock32(const uint32_t *p, int i) +-{ +- return p[i]; +-} +- + static inline uint32_t rotl32(uint32_t x, int8_t r) + { + return (x << r) | (x >> (32 - r)); +@@ -56,7 +52,7 @@ uint32_t hash(const void *key, size_t length) + /* body */ + blocks = (const uint32_t *)(data + nblocks * 4); + for(i = -nblocks; i; i++) { +- k1 = getblock32(blocks, i); ++ memcpy(&k1, &blocks[i], sizeof(uint32_t)); + + k1 *= c1; + k1 = rotl32(k1, 15); + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.6.0-drop-bogus-test.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.6.0-drop-bogus-test.patch new file mode 100644 index 0000000000..b2466e5e8c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/files/libseccomp-2.6.0-drop-bogus-test.patch @@ -0,0 +1,31 @@ +https://github.com/seccomp/libseccomp/commit/2f0f3b0e9121720108431c5d054164016f476230 + +From 2f0f3b0e9121720108431c5d054164016f476230 Mon Sep 17 00:00:00 2001 +From: Paul Moore +Date: Sat, 25 Jan 2025 11:12:55 -0500 +Subject: [PATCH] tests: remove the fuzzer from test 62-sim-arch_transactions + +We can't reliably run the bpf-sim-fuzz tests on tests which manipulate +the filters arch/ABIs unless the filter is safe to run on all arch/ABIs, +which is more or less impossible. Remove the bpf-sim-fuzz test section +in test #62 to work around this, just as we do with the other similar +tests. + +Signed-off-by: Paul Moore +Signed-off-by: Tom Hromatka +(cherry picked from commit 7db46d72f13c172b290818f624c2966bd0db5677) +--- a/tests/62-sim-arch_transactions.tests ++++ b/tests/62-sim-arch_transactions.tests +@@ -14,11 +14,6 @@ test type: bpf-sim + 62-sim-arch_transactions +x86_64 open N N N N N N KILL + 62-sim-arch_transactions +x86_64 close N N N N N N ALLOW + +-test type: bpf-sim-fuzz +- +-# Testname StressCount +-62-sim-arch_transactions 5 +- + test type: bpf-valgrind + + # Testname + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0-r1.ebuild new file mode 100644 index 0000000000..cbdd8dc79a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) + +inherit distutils-r1 multilib-minimal + +DESCRIPTION="High level interface to Linux seccomp filter" +HOMEPAGE="https://github.com/seccomp/libseccomp" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git" + PRERELEASE="2.6.0" + inherit autotools git-r3 +else + SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="python static-libs test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +# We need newer kernel headers; we don't keep strict control of the exact +# version here, just be safe and pull in the latest stable ones. bug #551248 +DEPEND=" + >=sys-kernel/linux-headers-5.15 + python? ( ${PYTHON_DEPS} ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + ${DEPEND} + dev-util/gperf + python? ( + ${DISTUTILS_DEPS} + dev-python/cython[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}"/libseccomp-2.6.0-python-shared.patch + "${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch + "${FILESDIR}"/${P}-drop-bogus-test.patch + "${FILESDIR}"/${PN}-2.6.0-aliasing.patch +) + +src_prepare() { + default + + if [[ ${PV} == *9999 ]] ; then + sed -i -e "s/0.0.0/${PRERELEASE}/" configure.ac || die + + eautoreconf + fi +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable static-libs static) + --disable-python + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake + + if multilib_is_native_abi && use python ; then + # setup.py expects libseccomp.so to live in "../.libs" + # Copy the python files to the right place for this. + rm -r "${BUILD_DIR}"/src/python || die + cp -r "${S}"/src/python "${BUILD_DIR}"/src/python || die + local -x CPPFLAGS="-I\"${BUILD_DIR}/include\" -I\"${S}/include\" ${CPPFLAGS}" + + # setup.py reads VERSION_RELEASE from the environment + local -x VERSION_RELEASE=${PRERELEASE-${PV}} + + pushd "${BUILD_DIR}/src/python" >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +multilib_src_test() { + emake -Onone check +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python ; then + distutils-r1_src_install + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name "${PN}.la" -delete || die + + einstalldocs +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0.ebuild index cc42ab905d..32045e82e9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.6.0.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 else SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="-* amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2.1" @@ -47,6 +47,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/libseccomp-2.6.0-python-shared.patch "${FILESDIR}"/libseccomp-2.5.3-skip-valgrind.patch + "${FILESDIR}"/${P}-drop-bogus-test.patch ) src_prepare() { From 79d4f83470b43f8de9dffede553ca38cb67f77e7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:06 +0000 Subject: [PATCH 136/153] sys-libs/libselinux: Sync with Gentoo It's from Gentoo commit 3d8ba0aea9baed508a85abeb75f88274dd00ab13. --- .../src/third_party/portage-stable/sys-libs/libselinux/Manifest | 2 +- .../{libselinux-3.8.ebuild => libselinux-3.8.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/portage-stable/sys-libs/libselinux/{libselinux-3.8.ebuild => libselinux-3.8.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest index 1924cfe06b..09385d8f5a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest @@ -1,3 +1,3 @@ DIST libselinux-3.6.tar.gz 194210 BLAKE2B 615198d47ecfb4b6274810cbe32cce5953dd44d1d04e8ce244213dc4ddbd61cde3515f4650046b805cf98f341aba718af8d7a9e1d66773172031ac19599f6032 SHA512 182dcdf3510083ff4b9376a4a6d6a7b33905ac3c5e974c188bf3965686c54b663162c543ecf15eab75102f3c91a2502d33d0f1104dec01dd9b14737ef3f2b544 DIST libselinux-3.7.tar.gz 194834 BLAKE2B 07d87c37608b480d17355334459ecb006573d61a7d3fbf622033838559397abcf343e6399f3a49b6cf24e106d03fd997397d061491d2129c15a378960dacc350 SHA512 e949c20b606c50ad521b9592ce55ad6658e8c4b24d9838028f5aba0a4fc762b6d0d0d0d207f5bef7a2e41485e12d91382fa6090df27152dbb40071b273419352 -DIST libselinux-3.8.tar.gz 204389 BLAKE2B fdba907a3060138e065c016ab510042fc9e5760db278b99a6508f475fdb25125a7cbaba541e3e681b6cf4a092a2ad40ca08d7736687c9f326c9fe2c87953da85 SHA512 e36edec33c3960679a8975f839a4d64d4b1f82d51346fba21082c2686136259040099c7fee2c947ac2ca180d61d10356c9b3d359a1c5f1242b6ecdd7c036005e +DIST libselinux-3.8.1.tar.gz 204411 BLAKE2B f0508b3cf9c0fa2c315cab7b8048980a5a40188411ffd7790c5272e643742de073f0a8da44086e558c1b65ccb55e65cd559aad95e8da3cbfefd6adc9a5e09214 SHA512 646a31dff3b670a530adb9fc2fdc3ca9fe34a58e67e0fac52cc33bc7a01fa63c175987ef254c6c3bc7299cef137bc6f258dc378f4d70ae5c0fa0ece3bef42ab4 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.8.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.8.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.8.1.ebuild From 90def1aabfd8a2948377c685c4c7e9eb78ce9fa7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:06 +0000 Subject: [PATCH 137/153] sys-libs/libsepol: Sync with Gentoo It's from Gentoo commit b097f2ba052c28c9c3d0e0ead8d33e1783be3153. --- .../src/third_party/portage-stable/sys-libs/libsepol/Manifest | 2 +- .../libsepol/{libsepol-3.8.ebuild => libsepol-3.8.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/portage-stable/sys-libs/libsepol/{libsepol-3.8.ebuild => libsepol-3.8.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/Manifest index 88808f3d30..d4accded52 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/Manifest @@ -1,3 +1,3 @@ DIST libsepol-3.6.tar.gz 509100 BLAKE2B c073c9437004df0c723125971ed26354dc6b8a78b069c593977062527342061303bcc48917fcd9623d17998748254f63408b233173f3c62e92ee0ea2f3c4a430 SHA512 35a42d2749fc4f71bc6b7488380714f56975564007128566f1c73e5c50bf81c17535b2cfda4583aacb4870aa2cd5885321c01523e415bda8b3326bfefb13d58e DIST libsepol-3.7.tar.gz 511487 BLAKE2B 8e4a0b2b3731f49d8bc8ea03bd5269672428119578046bc7f38230e3c77459e6b9d4ab39285ea33c89d8e807499ef89faa606e4b4e1ecfac2c3d445454b16420 SHA512 85d12d0ba5a7a3225f08d041a18fd59641608db5e0a78a1e9649754e45be54a807cd422d4889b88da6e806b4af546336c7a0913448f08ac33dc6ffb983890ef8 -DIST libsepol-3.8.tar.gz 513780 BLAKE2B aca232da4f6bc21638f3e76d96c8349109edb64d8134c7d9c64bd4ee25c7ebbf69829eaa92493e0522a2a13e97a70f82514f24c6fff62e17f2a6874dd3fed516 SHA512 06da9bac1075b54177c3237994f3db0f9a50e16a363874df7ba11a52084bce4af9623ecfc1db1779b555dee6aab62fbfbf1cd03cf5760bd00f74ea5775897e09 +DIST libsepol-3.8.1.tar.gz 513830 BLAKE2B f1877499a31289af941e36b80c1c25ca2b32205684d958c4a8b04e05006346138046e3f263e73db3889f918e2ff93818f4d6176de5d17669b863c853d04928e0 SHA512 6a66fbbc25f4ca5f58b07d19a70f3f6c233594ea5bc5a9f5d9f008eb03a83cea84ae0f03329f340b95e4f7135981d06cb9e66a7b3ca2f1494a71bbdcb5a01665 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.8.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.8.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.8.1.ebuild From 1c9bf8dd56db1752cf0f1656e6fa279707388c94 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:08 +0000 Subject: [PATCH 138/153] sys-libs/ncurses: Sync with Gentoo It's from Gentoo commit e54925bf06f6545d3a5e03676d00d9310d509068. --- .../portage-stable/sys-libs/ncurses/Manifest | 15 + .../sys-libs/ncurses/ncurses-6.5-r1.ebuild | 429 ------------------ .../ncurses/ncurses-6.5_p20241109.ebuild | 2 +- .../ncurses/ncurses-6.5_p20250125.ebuild | 2 +- ...18.ebuild => ncurses-6.5_p20250308.ebuild} | 10 +- 5 files changed, 26 insertions(+), 432 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5-r1.ebuild rename sdk_container/src/third_party/portage-stable/sys-libs/ncurses/{ncurses-6.5_p20250118.ebuild => ncurses-6.5_p20250308.ebuild} (99%) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/Manifest index 21079892ca..3ef830a6a7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/Manifest @@ -211,7 +211,22 @@ DIST ncurses-6.5-20250118.patch.gz 405753 BLAKE2B 6aa666a85bf7d1526984ac46cbbeb6 DIST ncurses-6.5-20250118.patch.gz.asc 729 BLAKE2B 22cea1147c6b30e24b2eab79e0f00b9901b45193f391a270799661eb4f45a943d2e0afba4f94f69b6a21a5ed7155636d9f775d29bac7aa4b0248fc2ba90d19d9 SHA512 fba7ea75945879f97294e75bee34e58ff4dbb0d10bf549a8928dbf308fdbdb978b377231a618be444e3a4426acc63a6d5f0f588fca82fda7585ef6af78b602e1 DIST ncurses-6.5-20250125.patch.gz 11864 BLAKE2B f4fa5b4a9a0c87b11f5d3cc84961a19d3948658481255b65eba1041d3ff9952c4941e6879bdd9b3237087353800398eacf47fd44de114f9c57046a0a3b200da8 SHA512 7e8571cf264dad27136a00d7601b2bbe90c497f2caa8e7379b72547c9c1cf07c4b32e54773c22695c183d4444d2816ec020bafc3cec55ff3fb5d191e956a77c8 DIST ncurses-6.5-20250125.patch.gz.asc 729 BLAKE2B 53fde87fdfa46107addc6ee523bfbc7db0b12d288882ae9bf85c1e5ffbcb26562809faa3f284cfe1c68665cf666ab50c52abffd42b03d9f82ca98c7fd8e2895e SHA512 6e3b6c009b0b429238dee41639fd2f1535374c7f84c9b432756fe5e22eba38171f2ced867bc28b924ac2d338938bfa840a560ace54d4ffd329e986a0080749b8 +DIST ncurses-6.5-20250201.patch.gz 77337 BLAKE2B 1bf6c54f1aee6bd06ce712d51185aa8e6efb9b623f233efbfa5cdf320c9798460e1f7efe608984403245548ddafa91960c94d8cd38919baaf72aa19f06d64e9b SHA512 8e934563f2f962c278703c78df7c4ebb6f9d4d6730818b3a993dfb5485c628144c524e8f96105ee51abf6991397e8d2f4636b6fcfe62dd483d49f13a6a62db6d +DIST ncurses-6.5-20250201.patch.gz.asc 729 BLAKE2B 4e2b779d57e72f3ae4f66f3e86a4d6387e99c547daa455566c8023cab15b1b4e02eed0670a927915837d7bcdedeffd097bac05ab5cf782b16f1950f2e411d994 SHA512 2be95ab0d67512ff6bf36247f2d34d0da3b159c81525fdd31b68d46ae0647c8f17c63e98974a64718429d9bc89097de926ba2e5cea7f063930310faf3a80c8f5 +DIST ncurses-6.5-20250208.patch.gz 9350 BLAKE2B 098ab1dfbd7ffd811f8620d4b135e3f6ee2dba4b3262e257a08db87aeded388957a1ac28a86f556238e81b4280462a570fc35de4f83fc754fc869f4304350558 SHA512 227404aa59cf4d91f7ccc18d6fc671bba609976a79f04b36bb8945839a272c180112c2dfcfde09608357c33755aaa46d5701c9e8d014407acf1957fee8c95b81 +DIST ncurses-6.5-20250208.patch.gz.asc 729 BLAKE2B 758e2d76a482ce04a15f480386b09582625175c3bc335af78e16f26ac9130d9b47803290ec5baebfaa408426b506f58d8724379b45f12ee51afb071fb5f2c95f SHA512 e4cf7e188c919d289b01c17b9b3c83a1e43aef88a2a5ac65d5bb393c4b4fd59239f75898d818b6fa437a68934bce8ab03b5ead76ae2f1b07a34e81687cd99422 +DIST ncurses-6.5-20250215.patch.gz 86483 BLAKE2B 368f92979c030d7d997e6abe5727f54fba5c9f7792138a1ef57e45663cb401979c50249618c9ec3a6b1977cdc4848336872b285d93c1ea682a558b04a331c002 SHA512 de4ab7035bac1e430aac49f1d62d2758684a46e25f86bf35db0a13d83cce253b0bca8c9ffcc551d4ed6ec5813c7ec214e6a93e6c57f19e7b3406c968fe89169b +DIST ncurses-6.5-20250215.patch.gz.asc 729 BLAKE2B 1eeab408601e398dc926e9dc527d6ef238c96836bb09d34c71c2816bfe3a70d6c5376f890678828781cfaa92c384ba0a886947fd536cc053612613da8075b1f5 SHA512 ac716540c1ae3c5f19076eef85f91cd0608a61439974a66076d6f63a86ba12db117e11304c2d84aa04f9e1ed5574e775af9d1e067be742c5923e7aa644a2483d +DIST ncurses-6.5-20250216.patch.gz 2939 BLAKE2B 1cd97eed7ae44d7f792a8c1997805044bf8cc58b90e83c0226f3927744cc229b7659f4ebbd1b455b2cbf874c0fa7c0f1bbf1adca254de40f8d5a481653a95a0d SHA512 ca9dcf5a0fe1c46db8d810cd509ee8c824f72f22b110cf6e7958e320fb5d077d92dbe47e94bd10d0c470493d36d8c79ab5f2fcbeef5742c5a7c4b7816f26f4db +DIST ncurses-6.5-20250216.patch.gz.asc 729 BLAKE2B 61c52abe6721bc9328ee1b80e49577d23233c831142c746167428eccb432edc845b1dbee5050cfc339df8fde17fdd0a5dbd47066f8ef734fa8a4688f7a650a05 SHA512 d3411ca77e41b5e560faf28969121b7cd3aa3755ec1920a3e48d955b2d723fac26704ce0b2288d68d180a19ebc5c97624c65c73a04081499dc9a40b11287647f +DIST ncurses-6.5-20250222.patch.gz 11376 BLAKE2B 9c204115b5c9e863b31fe5d995e16c42ff74149e7cb46bffa2eeda652cbb295f4cea76456044884bcbe0c5be09a4fa15cb6badd47a7ce924d4c114e2be9565ac SHA512 bd4bbcefe8038641c758d2a7e7d36db5f737c08b264cf752d9fdfcc7a6283c8e23de4184bfd9e133ec3b8b3c8c1d9ebaeed5acbfd93df9abedc750502c11bf60 +DIST ncurses-6.5-20250222.patch.gz.asc 729 BLAKE2B a02c80b18a4f8e4ba32e206c9c82a1b86b2c3a684c467eaa16f671a1febd4608733714193eca9bb9aef2d7ebfde0a9db42c748682076830158059cd4e8de39ae SHA512 d52a9b4cd6aa77aa9fcf234e5d5284fd737faeda770687ee1ad472b5d2f933aa95491e41c3ed4dd21ccbcef0c6626ae1745059e2410404d903566db1ddd9a76f +DIST ncurses-6.5-20250301.patch.gz 68821 BLAKE2B 5425c87b29bd21109d725f84d9dd32d597a11b87866dc58936f7a4d7a542691278c15ba4e0136cb2802959234a8b89e9183b7433efd9c06f38d8384ddc556c04 SHA512 90243c324ad01a3fc0ca6f00275b1444c0d93b29205070e0b964319e9a11b92ff41bd7f8a995141bc59b722ea858f7616308998e30529b997a77dace9199f8ff +DIST ncurses-6.5-20250301.patch.gz.asc 729 BLAKE2B dc98383dff539f29e095b7815e4809352f717c0096bb006ac4b05065e947b16350cda03f2cbfadf13d9915c049e5b5b6b7c43ef369231525a5fa346d915a6cba SHA512 7290322560a9443b2259f4711d3349cafea3a67a04e80537f0d3f35b4d68c0dff217b004739fbba92e41e290deb866ba00520fd14a6d420a2052cad80eeff31b +DIST ncurses-6.5-20250308.patch.gz 25507 BLAKE2B ce846a29f11a6026f3c2f470a591b364b98bf39b34ffdf45922234d4e5c3402519ee569fc76bb529afd816b26cb33f518a69dd590dab736719ddbc06f19cab9a SHA512 1ac6c11e364efc09769cc4742b3fe6315c882e17d4b7c5aba81cd10d9fe62d103003b60ed1edd3fc3ed3b003c8bb198b47d25506302bdec493c7dc115ccf1d54 +DIST ncurses-6.5-20250308.patch.gz.asc 729 BLAKE2B de715c834df717cd24a5c76a62ae64f8fdbad7ec456b1d8b0c80e404194fb9b5a098889d73e1509527062b82336d8e1c8c9c377c9c30830804918b1ce7c5db51 SHA512 41c3932f3fa6c1fa00213ff384bbb073119ecd3f7e16094d9b98b949e04c6444c5a96e7b747cc250e905a9f45cb2d484824401e0beb29ee65cc3874501216455 DIST ncurses-6.5.tar.gz 3688489 BLAKE2B d0a05c218b5f320ba9abe2f322787baef1d15d764e503c81d49772b54b2927d28ecbeb500c8e514996226b41f69445b4de44ff423cec25b61847307fe61682ec SHA512 fc5a13409d2a530a1325776dcce3a99127ddc2c03999cfeb0065d0eee2d68456274fb1c7b3cc99c1937bc657d0e7fca97016e147f93c7821b5a4a6837db821e8 DIST ncurses-6.5.tar.gz.sig 438 BLAKE2B 5789b47932ec97d3863c7a65306369f0a36cb5b1a35c1e009b5174f50941edceafc22e6f07db3843a096773663a0ca602c0ecb9465e6042d9a78d76ae5008215 SHA512 96ce61a3d529e48e249acecbf4bb9eae2d9f2f67506e92ffa3182f5e98040c38babf0c2c15d92fc5d96e1181e72be1b29fdbff7bee859dfe2ae387f9b8883092 DIST ncurses-6.5_p20241109-patches.tar.xz 63676 BLAKE2B 9981b740fcec18cc794074ccc93ae1dbe175e52449af2bddfd10a6fb1d5dfe9b545bd19fce5e601d2d85008425fd5cd6fc33042d7bcc854363b0642b9c880efe SHA512 076d2d39c46cf9236e5e65472e10182da2dffffa936c7567b11e23323d64f9739bb3818d4fdbdd75a14fd3f5b202dcdb7aaa6813afb5e303f81c094339824162 DIST ncurses-6.5_p20250118-patches.tar.xz 64188 BLAKE2B 46ac7c8bcfb0ec4fb032ccff4ba0c57d15f925910eb4d108c626aba8fdecefd21660a05cf54a88a4668b50e489ce0a08526f978a0084c66b2105fc4d929fdfe5 SHA512 12ff29d5ec76487f8b368d481fc19d841e8ce6bc216ff614b6d6d543a1fa36020b403432c802665d99b7fb4f08ae863d7ac331e6e2d95ff86c719fdca383c3e2 +DIST ncurses-6.5_p20250301-patches.tar.xz 65224 BLAKE2B 9db65c728cc6d79e21b7673bb7700069cbf09287acfb65b23a65d607c3172835a9bf7df9a705d3a05b6197684bc7935e1cbed91bf18343c4fb8ebacf17e61dc1 SHA512 f5808f0c2fc1f6027678d8980a0cf598a64c9e85e1d72459dd712090c2dd24eb45261f35b025fd543aed56e903c658942c163b8fe8bace24a56fb8e9238da29e diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5-r1.ebuild deleted file mode 100644 index 3b8b72cdf0..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5-r1.ebuild +++ /dev/null @@ -1,429 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# sys-libs/ncurses-compat can be bumped with sys-libs/ncurses as upstream -# provide a configure option for the ABI version. - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc -inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig - -MY_PV="${PV:0:3}" -MY_P="${PN}-${MY_PV}" -DESCRIPTION="Console display library" -HOMEPAGE="https://www.gnu.org/software/ncurses/ https://invisible-island.net/ncurses/" -# Keep invisible-mirror.net here as some users reported 403 forbidden with invisible-island.net -SRC_URI=" - mirror://gnu/ncurses/${MY_P}.tar.gz - https://invisible-island.net/archives/${PN}/${MY_P}.tar.gz - https://invisible-mirror.net/archives/${PN}/${MY_P}.tar.gz - verify-sig? ( mirror://gnu/ncurses/${MY_P}.tar.gz.sig ) -" - -GENTOO_PATCH_DEV=sam -GENTOO_PATCH_PV=6.4_p20240413 -GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches - -# Populated below in a loop. Do not add patches manually here. -UPSTREAM_PATCHES=() - -if [[ ${PV} == *_p* ]] ; then - # Sometimes, after releases, there's no megapatch available yet. - # - # From upstream README at e.g. https://invisible-island.net/archives/ncurses/6.3/: - # - # "At times (generally to mark a relatively stable point), I create a rollup - # patch, which consists of all changes from the release through the current date." - # - # Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html, - # the patches are considered to be acceptable to use after some testing. They - # are both for development but also bug fixes. - # - # This array should contain a list of all the snapshots since the last - # release if there's no megapatch available yet. - PATCH_DATES=( - #20240101 - - # Latest patch is just _pN = $(ver_cut 4) - $(ver_cut 4) - ) - - if [[ -z ${PATCH_DATES[@]} ]] ; then - SRC_URI+=" https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P/_p/-}.patch.sh.gz" - SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P/_p/-}.patch.sh.gz.asc" - - # If we have a rollup patch, use that instead of the individual ones. - UPSTREAM_PATCHES+=( patch.sh ) - else - # We use a mirror as well because we've had reports of 403 forbidden for some users. - upstream_url_base="https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}-" - upstream_m_url_base="https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${MY_P}-" - - # Prefix each date with the upstream location (https://invisible-island.net/archives/${PN}/${PV/_p*}/${MY_P}) - mangled_patches=( "${PATCH_DATES[@]/#/${upstream_url_base}}" ) - # Suffix each with .patch.gz - mangled_patches=( "${mangled_patches[@]/%/.patch.gz}" ) - mangled_patches_sig=( "${mangled_patches[@]/%/.asc}" ) - # Repeat for .patch.gz.asc for verify-sig - SRC_URI+=" ${mangled_patches[@]}" - SRC_URI+=" verify-sig? ( ${mangled_patches_sig[@]} )" - - # For all of the URLs, chuck in invisible-island.net too: - SRC_URI+=" ${mangled_patches[@]/${upstream_url_base}/${upstream_m_url_base}}" - SRC_URI+=" verify-sig? ( ${mangled_patches_sig[@]/${upstream_url_base}/${upstream_m_url_base}} )" - - UPSTREAM_PATCHES=( "${PATCH_DATES[@]/%/.patch}" ) - - unset upstream_url_base upstream_m_url_base mangled_patches mangled_patches_sig - fi -fi - -SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${GENTOO_PATCH_NAME}.tar.xz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -# The subslot reflects the SONAME. -SLOT="0/6" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace" -RESTRICT="!test? ( test )" - -# TODO: ncurses allows (and we take advantage of this, even) passing -# the SONAME for dlopen() use, so only the header is needed at build time. -# Maybe we should bundle a copy of gpm.h so we can move gpm to PDEPEND -# which would be far nicer UX-wise. -DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" -# Block the older ncurses that installed all files w/SLOT=5, bug #557472 -RDEPEND=" - ${DEPEND} - !<=sys-libs/ncurses-5.9-r4:5 - !& /dev/null \ - || lbuildflags="${dbuildflags}" - - # We can't re-use the multilib BUILD_DIR because we run outside of it. - BUILD_DIR="${WORKDIR}" \ - CC=${BUILD_CC} \ - CXX=${BUILD_CXX} \ - CPP=${BUILD_CPP} \ - CHOST=${CBUILD} \ - CFLAGS=${BUILD_CFLAGS} \ - CXXFLAGS=${BUILD_CXXFLAGS} \ - CPPFLAGS=${BUILD_CPPFLAGS} \ - LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \ - do_configure cross --without-shared --with-normal --with-progs --without-ada - fi - multilib-minimal_src_configure -} - -multilib_src_configure() { - if [[ ${ABI} == x86 ]] ; then - # For compatibility with older binaries at slight performance cost. - # bug #616402 - use stack-realign && append-flags -mstackrealign - fi - - local t - for t in "${NCURSES_TARGETS[@]}" ; do - do_configure "${t}" - done -} - -do_configure() { - local target=$1 - shift - - mkdir "${BUILD_DIR}/${target}" || die - cd "${BUILD_DIR}/${target}" || die - - local conf=( - # We need the basic terminfo files in /etc, bug #37026. We will - # add '--with-terminfo-dirs' and then populate /etc/terminfo in - # src_install() ... - --with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo" - - # Enable installation of .pc files. - --enable-pc-files - # This path is used to control where the .pc files are installed. - --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" - - # Now the rest of the various standard flags. - --with-shared - --enable-fvisibility - # (Originally disabled until bug #245417 is sorted out, but now - # just keeping it off for good, given nobody needed it until now - # (2022) and we're trying to phase out bdb.) - --without-hashed-db - $(use_with ada) - $(use_with cxx) - $(use_with cxx cxx-binding) - --with-cxx-shared - $(use_with debug) - $(use_with profile) - # The configure script uses ldd to parse the linked output which - # is flaky for cross-compiling/multilib/ldd versions/etc... - $(use_with gpm gpm libgpm.so.1) - - # bug #930806 - --disable-setuid-environ - # TODO: Maybe do these for USE=hardened - #--disable-root-access - #--disable-root-environ - - --disable-term-driver - --disable-termcap - --enable-symlinks - --with-manpage-format=normal - --enable-const - --enable-colorfgbg - --enable-hard-tabs - --enable-echo - $(use_enable !ada warnings) - $(use_with debug assertions) - $(use_enable !debug leaks) - $(use_with debug expanded) - $(use_with !debug macros) - $(multilib_native_with progs) - $(use_with test tests) - $(use_with trace) - $(use_with tinfo termlib) - --disable-stripping - --disable-pkg-ldflags - ) - - if [[ ${target} == ncurses*w ]] ; then - conf+=( --enable-widec ) - else - conf+=( --disable-widec ) - fi - if [[ ${target} == ncursest* ]] ; then - conf+=( --with-{pthread,reentrant} ) - else - conf+=( --without-{pthread,reentrant} ) - fi - - # Make sure each variant goes in a unique location. - if [[ ${target} == "ncurses" ]] ; then - # "ncurses" variant goes into "${EPREFIX}"/usr/include - # It is needed on Prefix because the configure script appends - # "ncurses" to "${prefix}/include" if "${prefix}" is not /usr. - conf+=( --enable-overwrite ) - else - conf+=( --includedir="${EPREFIX}"/usr/include/${target} ) - fi - # See comments in src_configure. - if [[ ${target} != "cross" ]] ; then - local cross_path="${WORKDIR}/cross" - [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" - fi - - ECONF_SOURCE="${S}" econf "${conf[@]}" "$@" -} - -src_compile() { - # See comments in src_configure. - if ! has_version -b "~sys-libs/${P}:0" ; then - BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext) - fi - - multilib-minimal_src_compile -} - -multilib_src_compile() { - local t - for t in "${NCURSES_TARGETS[@]}" ; do - do_compile "${t}" - done -} - -do_compile() { - local target=$1 - shift - - cd "${BUILD_DIR}/${target}" || die - - # A little hack to fix parallel builds ... they break when - # generating sources so if we generate the sources first (in - # non-parallel), we can then build the rest of the package - # in parallel. This is not really a perf hit since the source - # generation is quite small. - emake -j1 sources - - # For some reason, sources depends on pc-files which depends on - # compiled libraries which depends on sources which ... - # Manually delete the pc-files file so the install step will - # create the .pc files we want. - rm -f misc/pc-files || die - emake "$@" -} - -multilib_src_install() { - local target - for target in "${NCURSES_TARGETS[@]}" ; do - emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install - done - - # Move main libraries into /. - if multilib_is_native_abi ; then - gen_usr_ldscript -a \ - "${NCURSES_TARGETS[@]}" \ - $(usex tinfo 'tinfow tinfo' '') - fi - - # Don't delete '*.dll.a', needed for linking, bug #631468 - if ! use static-libs; then - find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die - fi - - # Build fails to create this ... - # -FIXME- - # Ugly hackaround for riscv having two parts libdir (bug #689240) - # Replace this hack with an official solution once we have one... - # -FIXME- - dosym $(sed 's@[^/]\+@..@g' <<< $(get_libdir))/share/terminfo \ - /usr/$(get_libdir)/terminfo - - # Remove obsolete libcurses symlink that is created by the build - # system. Technically, this could be also achieved - # via --disable-overwrite but it also moves headers implicitly, - # and we do not want to do this yet. - # bug #836696 - rm "${ED}"/usr/$(get_libdir)/libcurses* || die -} - -multilib_src_install_all() { - local terms=( - # Dumb/simple values that show up when using the in-kernel VT. - ansi console dumb linux - vt{52,100,102,200,220} - # [u]rxvt users used to be pretty common. Probably should drop this - # since upstream is dead and people are moving away from it. - rxvt{,-unicode}{,-256color} - # xterm users are common, as is terminals re-using/spoofing it. - xterm xterm-{,256}color - # screen is common (and reused by tmux). - screen{,-256color} - screen.xterm-256color - ) - if use split-usr ; then - local x - # We need the basic terminfo files in /etc for embedded/recovery, bug #37026 - einfo "Installing basic terminfo files in /etc..." - for x in "${terms[@]}"; do - local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) - local basedir=$(basename "$(dirname "${termfile}")") - - if [[ -n ${termfile} ]] ; then - dodir "/etc/terminfo/${basedir}" - mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die - dosym "../../../../etc/terminfo/${basedir}/${x}" \ - "/usr/share/terminfo/${basedir}/${x}" - fi - done - - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses - - use minimal && rm -r "${ED}"/usr/share/terminfo* - # Because ncurses5-config --terminfo returns the directory we keep it - # bug #245374 - keepdir /usr/share/terminfo - elif use minimal ; then - # Keep only the basic terminfo files - find "${ED}"/usr/share/terminfo/ \ - \( -type f -o -type l \) ${terms[*]/#/! -name } -delete , \ - -type d -empty -delete || die - fi - - cd "${S}" || die - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc - if use doc ; then - docinto html - dodoc -r doc/html/ - fi -} - -pkg_preinst() { - preserve_old_lib /$(get_libdir)/libncurses.so.5 - preserve_old_lib /$(get_libdir)/libncursesw.so.5 -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/libncurses.so.5 - preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20241109.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20241109.ebuild index 9b250194be..373f1c811b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20241109.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20241109.ebuild @@ -109,7 +109,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" # The subslot reflects the SONAME. SLOT="0/6" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20250125.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20250125.ebuild index 116c0aa435..eb79876c2f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20250125.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20250125.ebuild @@ -119,7 +119,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" # The subslot reflects the SONAME. SLOT="0/6" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ada +cxx debug doc gpm minimal profile split-usr +stack-realign static-libs test tinfo trace" # In 6.5_p20250118, the C++ examples fail to link, but there's no automated # testsuite anyway. Controlling building examples isn't really what USE=test diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20250118.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20250308.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20250118.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20250308.ebuild index 4475535dc2..78a75ac0c0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20250118.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ncurses/ncurses-6.5_p20250308.ebuild @@ -22,7 +22,7 @@ SRC_URI=" " GENTOO_PATCH_DEV=sam -GENTOO_PATCH_PV=6.5_p20250118 +GENTOO_PATCH_PV=6.5_p20250301 GENTOO_PATCH_NAME=${PN}-${GENTOO_PATCH_PV}-patches # Populated below in a loop. Do not add patches manually here. @@ -77,6 +77,14 @@ if [[ ${PV} == *_p* ]] ; then 20241228 20250104 20250111 + 20250118 + 20250125 + 20250201 + 20250208 + 20250215 + 20250216 + 20250222 + 20250301 # Latest patch is just _pN = $(ver_cut 4) $(ver_cut 4) From 89ef5d69f308f877fdb58bc6f2b7b23fe72a4ef5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:19 +0000 Subject: [PATCH 139/153] sys-process/tini: Sync with Gentoo It's from Gentoo commit 86bb4af29fee8a1c83ca9f30f885e0e0b4147329. --- .../tini/files/tini-0.19.0-musl-basename.patch | 13 +++++++++++++ .../sys-process/tini/tini-0.19.0-r1.ebuild | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-process/tini/files/tini-0.19.0-musl-basename.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-process/tini/files/tini-0.19.0-musl-basename.patch b/sdk_container/src/third_party/portage-stable/sys-process/tini/files/tini-0.19.0-musl-basename.patch new file mode 100644 index 0000000000..69808d773d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-process/tini/files/tini-0.19.0-musl-basename.patch @@ -0,0 +1,13 @@ +diff --git a/src/tini.c b/src/tini.c +index eb62015..0e7d5da 100644 +--- a/src/tini.c ++++ b/src/tini.c +@@ -18,6 +18,8 @@ + #include "tiniConfig.h" + #include "tiniLicense.h" + ++#define basename(name) (strrchr((name),'/') ? strrchr((name),'/')+1 : (name)) ++ + #if TINI_MINIMAL + #define PRINT_FATAL(...) fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); + #define PRINT_WARNING(...) if (verbosity > 0) { fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); } diff --git a/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r1.ebuild index 0f911be287..f55bbf7f30 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,6 +19,8 @@ SLOT="0" KEYWORDS="amd64 arm arm64 hppa ppc64 ~riscv ~x86" IUSE="+args +static" +PATCHES=("${FILESDIR}/tini-0.19.0-musl-basename.patch") + src_prepare() { [[ -z ${GIT_COMMIT} ]] && die "forgetful maintainer! please define GIT_COMMIT_${PV//./} on bump" From 78857eb0532315c715d071466739b589b57ae10a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 17 Mar 2025 10:40:11 +0100 Subject: [PATCH 140/153] overlay profiles: Add or update accept keywords --- .../profiles/coreos/base/package.accept_keywords | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 1bd462daa0..9993710e18 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -29,7 +29,7 @@ =app-emulation/open-vmdk-1.0 * # Keep versions on both arches in sync. -=app-emulation/qemu-guest-agent-8.2.0 ~arm64 +=app-emulation/qemu-guest-agent-9.2.0 ~arm64 =dev-build/meson-1.6.1 ~arm64 =dev-lang/yasm-1.3.0-r1 ~arm64 =dev-libs/ding-libs-0.6.2-r1 ~arm64 @@ -97,4 +97,5 @@ # Keep versions on both arches in sync. =sys-libs/libsemanage-3.7 ~arm64 +=sys-libs/ncurses-6.5_p20250125 ~arm64 =sys-process/audit-4.0.2-r1 ~arm64 From 77da183658d92a15648e94ff5991fcd87f2cc35d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 17 Mar 2025 11:36:35 +0100 Subject: [PATCH 141/153] overlay profiles: Drop accept keywords for dev-build/meson --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 9993710e18..08974dde65 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -30,7 +30,6 @@ # Keep versions on both arches in sync. =app-emulation/qemu-guest-agent-9.2.0 ~arm64 -=dev-build/meson-1.6.1 ~arm64 =dev-lang/yasm-1.3.0-r1 ~arm64 =dev-libs/ding-libs-0.6.2-r1 ~arm64 From d303941693b7846b6d7ccbeb68ef6c6af08205fd Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 20 Mar 2025 11:32:40 +0100 Subject: [PATCH 142/153] overlay profiles: Drop accept keywords for dev-libs/glib --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 08974dde65..34643001c3 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -33,9 +33,6 @@ =dev-lang/yasm-1.3.0-r1 ~arm64 =dev-libs/ding-libs-0.6.2-r1 ~arm64 -# Needed to address CVE-2024-52533 -=dev-libs/glib-2.82.4-r1 ~amd64 ~arm64 - # The only available ebuild (from GURU) has ~amd64 and no keyword for arm64 yet. =dev-libs/jose-12 ** From fbbfe700cdc61aade3925b64b2466447617f80a8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 20 Mar 2025 11:41:24 +0100 Subject: [PATCH 143/153] overlay profiles: Drop accept keywords for dev-libs/libtasn1 --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 34643001c3..cd53130744 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -36,9 +36,6 @@ # The only available ebuild (from GURU) has ~amd64 and no keyword for arm64 yet. =dev-libs/jose-12 ** -# Needed to address CVE-2024-12133. -=dev-libs/libtasn1-4.20.0 ~amd64 ~arm64 - # The only available ebuild (from GURU) has ~amd64 and no keyword for arm64 yet. =dev-libs/luksmeta-9-r1 ** From 8ea1b8fa9915e0a8b690bd8dba64084f6aa2ccbd Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 20 Mar 2025 12:07:30 +0100 Subject: [PATCH 144/153] overlay profiles: Drop accept keywords for dev-util/gdbus-codegen --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index cd53130744..a7d8daf8c4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -46,7 +46,6 @@ =dev-util/catalyst-4.0.0 ~amd64 ~arm64 # Needed to address CVE-2024-52533 -=dev-util/gdbus-codegen-2.82.4 ~amd64 ~arm64 =dev-util/glib-utils-2.82.4 ~amd64 ~arm64 # Keep versions on both arches in sync. From 86a135d288e168c7347f9c5ce226ffb8ad1a4d81 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 20 Mar 2025 12:08:21 +0100 Subject: [PATCH 145/153] overlay profiles: Drop accept keywords for dev-util/glib-utils --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index a7d8daf8c4..16f9507046 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -45,9 +45,6 @@ # Catalyst 4 is not stable yet, but earlier versions are masked now. =dev-util/catalyst-4.0.0 ~amd64 ~arm64 -# Needed to address CVE-2024-52533 -=dev-util/glib-utils-2.82.4 ~amd64 ~arm64 - # Keep versions on both arches in sync. =net-firewall/conntrack-tools-1.4.8-r1 ~arm64 From bd7a950491117ea061e9014fd5b7d151168b8304 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 20 Mar 2025 12:46:44 +0100 Subject: [PATCH 146/153] overlay coreos-base/misc-files: Drop our selinux config Gentoo's selinux config is the same as ours now, so we don't need to override it any more. --- .../coreos-base/misc-files/files/selinux/config | 15 --------------- ...c-files-0-r6.ebuild => misc-files-0-r7.ebuild} | 3 --- 2 files changed, 18 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/selinux/config rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/{misc-files-0-r6.ebuild => misc-files-0-r7.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/selinux/config b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/selinux/config deleted file mode 100644 index 7b66367667..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/selinux/config +++ /dev/null @@ -1,15 +0,0 @@ -# This file controls the state of SELinux on the system on boot. - -# SELINUX can take one of these three values: -# enforcing - SELinux security policy is enforced. -# permissive - SELinux prints warnings instead of enforcing. -# disabled - No SELinux policy is loaded. -SELINUX=permissive - -# SELINUXTYPE can take one of these four values: -# targeted - Only targeted network daemons are protected. -# strict - Full SELinux protection. -# mls - Full SELinux protection with Multi-Level Security -# mcs - Full SELinux protection with Multi-Category Security -# (mls, but only one sensitivity level) -SELINUXTYPE=mcs diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r7.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r6.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r7.ebuild index a66ef091a8..3917896acf 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r7.ebuild @@ -130,9 +130,6 @@ src_install() { fi done - insinto '/etc/selinux/' - doins "${FILESDIR}/selinux/config" - insinto '/etc/bash/bashrc.d' doins "${FILESDIR}/bash/99-flatcar-bcc" From 827e7f829dd128eecb56b0eeecef35c2ea7ac324 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 20 Mar 2025 12:46:59 +0100 Subject: [PATCH 147/153] overlay coreos/config: Stop masking installation of selinux config Gentoo's selinux config is the same as ours now, so we don't need to override it any more. --- .../coreos-overlay/coreos/config/env/sec-policy/selinux-base | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/sec-policy/selinux-base diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sec-policy/selinux-base b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sec-policy/selinux-base deleted file mode 100644 index b94efbdd1d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sec-policy/selinux-base +++ /dev/null @@ -1,2 +0,0 @@ -PKG_INSTALL_MASK+=" /etc/selinux/config" -INSTALL_MASK+=" /etc/selinux/config" From 60edde1b549f848eeb83db3bcea37484f62ece21 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 20 Mar 2025 13:01:23 +0100 Subject: [PATCH 148/153] overlay profiles: Drop accept keywords for sys-devel/binutils --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 16f9507046..f991249ec2 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -81,7 +81,6 @@ # Needed to address CVE-2024-53589, CVE-2025-1176, CVE-2025-1178, # CVE-2025-1179, CVE-2025-1180, CVE-2025-1181, CVE-2025-1182. -=sys-devel/binutils-2.44 ~amd64 ~arm64 =sys-libs/binutils-libs-2.44 ~amd64 ~arm64 # Keep versions on both arches in sync. From 8a596a0f8a9fe7fe93e15c3665a922f71acf5f0d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 20 Mar 2025 13:14:58 +0100 Subject: [PATCH 149/153] overlay profiles: Drop accept keywords for sys-libs/binutils-libs --- .../profiles/coreos/base/package.accept_keywords | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index f991249ec2..bb1402adc8 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -79,10 +79,6 @@ # Enable ipvsadm for arm64. =sys-cluster/ipvsadm-1.31-r1 ~arm64 -# Needed to address CVE-2024-53589, CVE-2025-1176, CVE-2025-1178, -# CVE-2025-1179, CVE-2025-1180, CVE-2025-1181, CVE-2025-1182. -=sys-libs/binutils-libs-2.44 ~amd64 ~arm64 - # Keep versions on both arches in sync. =sys-libs/libsemanage-3.7 ~arm64 =sys-libs/ncurses-6.5_p20250125 ~arm64 From 2c15410552b5520eea07c946c733bafeb1d58cc5 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 20 Mar 2025 17:48:22 +0100 Subject: [PATCH 150/153] changelog: Add entries --- .../security/2025-03-20-weekly-updates.md | 2 ++ .../updates/2025-03-20-weekly-updates.md | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 changelog/security/2025-03-20-weekly-updates.md create mode 100644 changelog/updates/2025-03-20-weekly-updates.md diff --git a/changelog/security/2025-03-20-weekly-updates.md b/changelog/security/2025-03-20-weekly-updates.md new file mode 100644 index 0000000000..31abb55e0f --- /dev/null +++ b/changelog/security/2025-03-20-weekly-updates.md @@ -0,0 +1,2 @@ +- expat ([CVE-2024-8176](https://nvd.nist.gov/vuln/detail/CVE-2024-8176)) +- libxml2 ([CVE-2024-56171](https://nvd.nist.gov/vuln/detail/CVE-2024-56171), [CVE-2025-24928](https://nvd.nist.gov/vuln/detail/CVE-2025-24928), [CVE-2025-27113](https://nvd.nist.gov/vuln/detail/CVE-2025-27113)) diff --git a/changelog/updates/2025-03-20-weekly-updates.md b/changelog/updates/2025-03-20-weekly-updates.md new file mode 100644 index 0000000000..25707af394 --- /dev/null +++ b/changelog/updates/2025-03-20-weekly-updates.md @@ -0,0 +1,27 @@ +- SDK: go ([1.24.1](https://go.dev/doc/go1.24)) +- base, dev: expat ([2.7.0](https://github.com/libexpat/libexpat/blob/R_2_7_0/expat/Changes#L40)) +- base, dev: git ([2.48.1](https://github.com/git/git/blob/v2.48.1/Documentation/RelNotes/2.48.1.txt) (includes [2.48.0](https://github.com/git/git/blob/v2.48.0/Documentation/RelNotes/2.48.0.txt), [2.47.2](https://github.com/git/git/blob/v2.47.2/Documentation/RelNotes/2.47.2.txt), [2.47.1](https://github.com/git/git/blob/v2.47.1/Documentation/RelNotes/2.47.1.txt), [2.47.0](https://github.com/git/git/blob/v2.47.0/Documentation/RelNotes/2.47.0.txt), [2.46.3](https://github.com/git/git/blob/v2.46.3/Documentation/RelNotes/2.46.3.txt), [2.46.2](https://github.com/git/git/blob/v2.46.2/Documentation/RelNotes/2.46.2.txt), [2.46.1](https://github.com/git/git/blob/v2.46.1/Documentation/RelNotes/2.46.1.txt), [2.46.0](https://github.com/git/git/blob/v2.46.0/Documentation/RelNotes/2.46.0.txt))) +- base, dev: glib ([2.82.5](https://gitlab.gnome.org/GNOME/glib/-/releases/2.82.5)) +- base, dev: iproute2 ([6.13.0](https://lore.kernel.org/all/20250120194053.3744d96b@hermes.local/)) +- base, dev: libpcre2 ([10.45](https://github.com/PCRE2Project/pcre2/blob/pcre2-10.45/NEWS)) +- base, dev: libseccomp ([2.6.0](https://github.com/seccomp/libseccomp/releases/tag/v2.6.0) (includes [2.5.6](https://github.com/seccomp/libseccomp/releases/tag/v2.5.6))) +- base, dev: libuv ([1.50.0](https://github.com/libuv/libuv/releases/tag/v1.50.0)) +- base, dev: libxml2 ([2.12.10](https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.10)) +- base, dev: ncurses ([6.5_p20250125](https://invisible-island.net/ncurses/announce-6.5.html)) +- base, dev: oniguruma ([6.9.10](https://github.com/kkos/oniguruma/releases/tag/v6.9.10)) +- base, dev: qemu-guest-agent ([9.2.0](https://wiki.qemu.org/ChangeLog/9.2#Guest_agent) (includes [9.1](https://wiki.qemu.org/ChangeLog/9.1#Guest_agent), [9.0](https://wiki.qemu.org/ChangeLog/9.0#Guest_agent))) +- base, dev: userspace-rcu ([0.15.1](https://lore.kernel.org/lkml/6894741e-c3c8-4464-92ab-ba8b88929961@efficios.com/T/) (includes [0.15.0](https://lore.kernel.org/all/51160e24-389a-41b6-871b-ba522d427220@efficios.com/))) +- base, dev: which ([2.23](https://git.savannah.gnu.org/cgit/which.git/tree/NEWS?id=3e2c8f8acc3a333b66b06de234bc9324c6fe5500)) +- base, dev: xfsprogs ([6.12.0](https://web.git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/doc/CHANGES?h=v6.12.0)) +- base, dev: xz-utils ([5.6.4](https://github.com/tukaani-project/xz/releases/tag/v5.6.4)) +- base, dev: zstd ([1.5.7](https://github.com/facebook/zstd/releases/tag/v1.5.7)) +- containerd: containerd ([2.0.2](https://github.com/containerd/containerd/releases/tag/v2.0.2)) +- dev: eselect ([1.4.29](https://gitweb.gentoo.org/proj/eselect.git/tree/NEWS?h=eselect-1.4.29)) +- dev: getuto ([1.15](https://github.com/projg2/getuto/commits/getuto-1.15/)) +- dev: man-pages ([6.10](https://lkml.org/lkml/2025/1/22/1229)) +- dev: portage ([3.0.67](https://github.com/gentoo/portage/blob/portage-3.0.67/NEWS)) +- docker: docker ([28.0.1](https://github.com/moby/moby/releases/tag/v28.0.1) (includes [28.0.0](https://github.com/moby/moby/releases/tag/v28.0.0))) +- sysext-podman: crun ([1.19.1](https://github.com/containers/crun/releases/tag/1.19.1) (includes [1.19](https://github.com/containers/crun/releases/tag/1.19), [1.18.2](https://github.com/containers/crun/releases/tag/1.18.2), [1.18.1](https://github.com/containers/crun/releases/tag/1.18.1), [1.18](https://github.com/containers/crun/releases/tag/1.18))) +- sysext-python: setuptools ([75.8.2](https://github.com/pypa/setuptools/blob/v75.8.2/NEWS.rst) (includes [75.8.1](https://github.com/pypa/setuptools/blob/v75.8.1/NEWS.rst))) +- sysext-python: setuptools-scm ([8.2.0](https://github.com/pypa/setuptools-scm/blob/v8.2.0/CHANGELOG.md)) +- sysext-python: trove-classifiers ([2025.3.3.18](https://github.com/pypa/trove-classifiers/releases/tag/2025.3.3.18)) From b1220b6e4ef6a3bc1db8bb1e908340322028c980 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 21 Mar 2025 10:26:28 +0100 Subject: [PATCH 151/153] build_library/toolchain_util: Fix setting a profile Setting a profile in a newly created sysroot when building native toolchains broke after an eselect update. Apparently eselect gets the path to the coreos-overlay repository and then prefixes it with ROOT. Since ROOT was set to /build/-usr, the resulting patch was wrong. Fix this by telling eselect where to find our make.profile symlink in new sysroot by setting PORTAGE_CONFIGROOT to /build/-usr and where to find our profiles by setting ROOT (and SYSROOT, because it must match ROOT) to /. --- build_library/toolchain_util.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh index cdab619339..8960a37483 100644 --- a/build_library/toolchain_util.sh +++ b/build_library/toolchain_util.sh @@ -284,7 +284,11 @@ _configure_sysroot() { "${sudo[@]}" mkdir -p "${ROOT}/etc/portage/"{profile,repos.conf} "${sudo[@]}" cp /etc/portage/repos.conf/* "${ROOT}/etc/portage/repos.conf/" - "${sudo[@]}" eselect profile set --force "$profile" + # set PORTAGE_CONFIGROOT to tell eselect to modify the profile + # inside /build/-usr, but set ROOT to /, so eselect will + # actually find the profile which is outside /build/-usr, + # set SYSROOT to / as well, because it must match ROOT + "${sudo[@]}" PORTAGE_CONFIGROOT=${ROOT} SYSROOT=/ ROOT=/ eselect profile set --force "$profile" local coreos_path coreos_path=$(portageq get_repo_path "${ROOT}" coreos-overlay) From 39825d59c0648355db228ea18f5a4a959fae2dd6 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 21 Mar 2025 14:15:00 +0100 Subject: [PATCH 152/153] sdk_lib: Silence some docker warnings --- sdk_lib/Dockerfile.lean-arch | 4 ++-- sdk_lib/Dockerfile.sdk-build | 2 +- sdk_lib/Dockerfile.sdk-import | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_lib/Dockerfile.lean-arch b/sdk_lib/Dockerfile.lean-arch index ee3bbf68ed..6819233e53 100644 --- a/sdk_lib/Dockerfile.lean-arch +++ b/sdk_lib/Dockerfile.lean-arch @@ -1,4 +1,4 @@ -ARG VERSION +ARG VERSION=9999.99.99-version-missing FROM flatcar-sdk-build:${VERSION} as meta ARG RMARCH @@ -26,4 +26,4 @@ RUN chown -R sdk:sdk /mnt/host/source # but it's useful for standalone container use. RUN mkdir -p /mnt/host/source/src/scripts COPY --chown=sdk:sdk sdk_lib/sdk_init_selfcontained.sh /mnt/host/source/src/ -ENTRYPOINT /home/sdk/sdk_entry.sh +ENTRYPOINT ["/home/sdk/sdk_entry.sh"] diff --git a/sdk_lib/Dockerfile.sdk-build b/sdk_lib/Dockerfile.sdk-build index 868ba436cd..25aa6e333f 100644 --- a/sdk_lib/Dockerfile.sdk-build +++ b/sdk_lib/Dockerfile.sdk-build @@ -1,4 +1,4 @@ -ARG VERSION +ARG VERSION=9999.99.99-version-missing FROM flatcar-sdk-import:${VERSION} ARG BINHOST diff --git a/sdk_lib/Dockerfile.sdk-import b/sdk_lib/Dockerfile.sdk-import index 835c74919b..c5762a56fb 100644 --- a/sdk_lib/Dockerfile.sdk-import +++ b/sdk_lib/Dockerfile.sdk-import @@ -1,4 +1,4 @@ -ARG VERSION +ARG VERSION=9999.99.99-version-missing FROM flatcar-sdk-tarball:${VERSION} # Make build scripts believe we're in the SDK chroot (which technically, we are) @@ -55,4 +55,4 @@ RUN chmod 755 /home/sdk/sdk_entry.sh # it's likely that scripts and SDK tarball are out of sync RUN /home/sdk/sdk_entry.sh ./update_chroot --toolchain_boards="amd64-usr arm64-usr" -ENTRYPOINT /home/sdk/sdk_entry.sh +ENTRYPOINT ["/home/sdk/sdk_entry.sh"] From 9439203f49e825a1de435dd311c5d9a26b72728f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 21 Mar 2025 16:24:31 +0100 Subject: [PATCH 153/153] setup_board: Fix setting a profile Same fix as done in build_library/toolchain_util.sh. --- setup_board | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup_board b/setup_board index 83f784f018..7073f2d037 100755 --- a/setup_board +++ b/setup_board @@ -236,7 +236,13 @@ sudo mkdir -p "${BOARD_ETC}/portage/"{profile,repos.conf} sudo ln -sfT "$(portageq get_repo_path / coreos-overlay)/coreos/user-patches" \ "${BOARD_ETC}/portage/patches" sudo cp /etc/portage/repos.conf/* "${BOARD_ETC}"/portage/repos.conf/ -sudo ROOT="${BOARD_ROOT}" eselect profile set --force "${PORTAGE_PROFILE}" +# set PORTAGE_CONFIGROOT to tell eselect to modify the profile inside +# /build/-usr, but set ROOT to /, so eselect will actually find +# the profile which is outside /build/-usr, set SYSROOT to / as +# well, because it must match ROOT +sudo \ + PORTAGE_CONFIGROOT="${BOARD_ROOT}" ROOT=/ SYSROOT=/ \ + eselect profile set --force "${PORTAGE_PROFILE}" # Cleanup/migrate from older make.conf files sudo rm -f "${BOARD_ETC}/make.conf" "${BOARD_ETC}/make.conf.common"