gentoo auto-resync : 15:05:2024 - 00:01:27

6 files changed, 121 insertions, 1 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b04521b06459..396589bc6a8f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 75d3d71c1010..63cecee1bebb 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.32.103.gh.tar.gz 2726436 BLAKE2B 7c08f29df7b0f786a99a7469263cb367ed8024cadb700a56955669abe6fd562cde349fe1e17e7b328b6cc69e6af6db30293f5a13129d700ebfedc1950c26fed3 SHA512 248659ee989df69ffbfbe6dd181632d4a784d4de333b8592c5e0b4a0333d2b201ec652f8ff0f44b51ffe4bc9bea230d047f655016742816cfc52bbb871a707d7
+DIST aws-cli-1.32.104.gh.tar.gz 2726763 BLAKE2B 997fc73890d033485fb22cf7c5e6ab2844aaec60fe2017cea2513f4f439f6fab8c70519a5ded46ed269b3733eed52579236e577d8db172448812128c68687d50 SHA512 a416f93d77a7f314294aff14a337dbea1ae7d5ef10221a97abec71f8b4c23d764455b4bcb48d10fc5cbb1fcc9cfb149bc4b49e102d0e488a8f3bd4d91782878c
 DIST aws-cli-1.32.93.gh.tar.gz 2695489 BLAKE2B d2f81786d4db158a13ec50ed833668db26bde00cc1e4f5254aa127aba82113074abafa996f525b5f7cd215fd51639481a01a49c425bb4c01e990261529f06082 SHA512 e03892ef522fa43442d1b053d0bf8dbd6c892d94398934c4af58e81153c2759f7e55a289457bb3e5b46f2f01697642498fdd6d51cdc18ad8b6c0f6a31d7c606a
 DIST aws-cli-1.32.98.gh.tar.gz 2723261 BLAKE2B f854a78226a9480d2966e0dcc817e372de96f32723c28bd7189ed484ab24e8fa9f33a018b1b3193d1a5be82e1ad2b69b2d0d6642f004aa6fd601a68862cbbbdc SHA512 989ad96da152423001832a502935ed64a92ef61ba63f9f413fa07e84910d2aa905056bbfcf49202508d6d0a910b4a2969da27e736857e918077693909e4ca0ea
 EBUILD awscli-1.32.103.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+EBUILD awscli-1.32.104.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.93.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.32.98.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.32.104.ebuild b/app-admin/awscli/awscli-1.32.104.ebuild
new file mode 100644
index 000000000000..4a677affdbc4
--- /dev/null
+++ b/app-admin/awscli/awscli-1.32.104.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 7e9c6149ae51..c6bd9faa39a6 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,3 +1,4 @@
+AUX testdisk-7.2-musl.patch 676 BLAKE2B 44fe9e0d72eec836f3d4bc3ee2f325134be9c8ba6ea69b561e045431ef40663ad862653e9d764a002c80bb52092cc91b861e951988f43e5169b7d21a1f69c195 SHA512 cd64ece1e629df879e06e311f4e2bb79e9bae10f228f230faf3b0302a5739e11327ab0b3132d9e325d27ac25ef5d9a933335a5731c141b1f83d05fff7dc363c1
 DIST testdisk-7.2.tar.bz2 855781 BLAKE2B 224fae052fa9264ee83fdf6804159c77257b9db4c96ff36c7cb1dc184ec4a9f0955f0d817de24ef1e5fe69e7ef1a20c140e73fc130fb092e6df3b02df2845239 SHA512 f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26
-EBUILD testdisk-7.2.ebuild 2720 BLAKE2B 203daafeedbcd35c8e38083b1cc90df170a9e774b0400d47424d6ffed7f1151b3c443ffd0813911deef386863dfd38f12ef29e9cfef7a67e906be35988ec6ba0 SHA512 70e0bf4334da27251c5ad688f02b6100e35e418c74120429a645719cd78214f1c20b0bd6166e4c479ec43966b5f4f0e4664b6decd5ccf681650de838c6ed784f
+EBUILD testdisk-7.2.ebuild 2841 BLAKE2B 0531a19f218c36d45932629b7c463ef29e9e6fb70c1c8cfd676e78545554bd02748c15f22ebef09bebeaa58390f4e6307dc4723b9b16d3dbf50a6d7d32797ccb SHA512 337bc518f35d9656d870447ae78aaf2a6c806d23a6ef403bbbe560f8897a29ba17713494c51c28981f2d2d1d29f5d1e4994f1bd5164c88ab2905d2fb419a2f27
 MISC metadata.xml 698 BLAKE2B c594b2322501214086fc8505094d104b1cba10338e8e2d1831eaa6e13fa12406b0e7e374dc0c4b72c93b7c10fb4709d39d8790274b5b38ff326d7ea99d42ec70 SHA512 bbd13b1109ddbcbd8c676886c432b8fe5ed276a93de6e829ab8d708c84b8ea50e9846a717b3d9a9b6c5d400971f8d79b049285a1bf999c81e50fb4d820ebc7e4
diff --git a/app-admin/testdisk/files/testdisk-7.2-musl.patch b/app-admin/testdisk/files/testdisk-7.2-musl.patch
new file mode 100644
index 000000000000..d01c2797bf28
--- /dev/null
+++ b/app-admin/testdisk/files/testdisk-7.2-musl.patch
@@ -0,0 +1,25 @@
+From 2c6780ca1edd0b0ba2e5e86b12634e3cc8475872 Mon Sep 17 00:00:00 2001
+From: Christophe Grenier <grenier@cgsecurity.org>
+Date: Tue, 14 May 2024 17:34:56 +0200
+Subject: [PATCH] src/hdaccess.c: Fix build with musl-1.2.5 See
+ https://github.com/cgsecurity/testdisk/issues/154
+ https://bugs.gentoo.org/931887
+
+---
+ src/hdaccess.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/hdaccess.c b/src/hdaccess.c
+index 91ec7915..9768c07c 100644
+--- a/src/hdaccess.c
++++ b/src/hdaccess.c
+@@ -109,6 +109,9 @@
+ #ifdef HAVE_GLOB_H
+ #include <glob.h>
+ #endif
++#ifdef HAVE_LIBGEN_H
++#include <libgen.h>
++#endif
+ 
+ #if defined(__CYGWIN__) || defined(__MINGW32__)
+ #include "win32.h"
diff --git a/app-admin/testdisk/testdisk-7.2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild
index ea419d0652ee..cfc23c0f8bc4 100644
--- a/app-admin/testdisk/testdisk-7.2.ebuild
+++ b/app-admin/testdisk/testdisk-7.2.ebuild
@@ -60,6 +60,8 @@ BDEPEND="gui? ( dev-qt/linguist-tools:5 )"
 DOCS=()
 
 PATCHES=(
+	# https://github.com/cgsecurity/testdisk/commit/2c6780ca1edd0b0ba2e5e86b12634e3cc8475872
+	"${FILESDIR}/${P}-musl.patch"
 )
 
 src_configure() {