8 files changed, 394 insertions, 66 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 717dfad1e296..f74df60304bd 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 239dd3544bd6..d416db841913 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,9 +1,11 @@
 DIST aws-cli-1.35.23.gh.tar.gz 2819656 BLAKE2B 6e9d20410344f075ce12bfc8c0a49941a846f02304de9a30516376d0b6666b8c0a9affb36dd94a463f48f17f478f5d27e0f7375a48c63eca1b3a28927211e6aa SHA512 9075af833da9abc9494a2dd01a987b874e2b4444d7d5d1f4f974da1b56940b88603e8ec115662c85c2beb7cb70a65c3bcdbbd5510a1973433f8030efc6a1c69a
 DIST aws-cli-1.36.10.gh.tar.gz 2836233 BLAKE2B 92c5d80b122e68e2b5fa647ed7c2d1a55e7c1d0f45005ab530e71ab70dbda6c90f37d0cb740e9f2e7c804ae62cfed6cd3b14ab3f80ec06ab35cb4ba823a72c78 SHA512 c881b0a202c9f388941832d1cf0c88158200ac1da7e6955d0284ea10abb71d0c816be6419a53e7c7264e177000ff37483ecf269bcc1c6920d2790be3b40afdfa
+DIST aws-cli-1.36.11.gh.tar.gz 2841610 BLAKE2B 3bbfd5a3087fd87ad93a28f9eeb1b35d4491c3fcd3eaad2fb15d4a6c611ef48282a3bf769ad276304971dc8e800c9c3464df7d99f45ff8236f79d757d29f7924 SHA512 63035bd341f15aa6d30fa79ff6c45e399053c891109fbcc5f350775d5fb5b0a0bf2a5f17df6065949879eb0d0ca91a1dba56e57136e3b874d1a3ada62191be4d
 DIST aws-cli-1.36.4.gh.tar.gz 2825870 BLAKE2B 3a13a50077087633972c0eb908e0116e432f0036871f4d5a5e2429ea86dfc0c5d40a87e0950c02bc7622fb0e56b9a3ee9fc8ee9a6a1ed8ae17728bf479401d13 SHA512 735a228d52b525cfc4a9a403ad8364bfb9c558ba86daf6966743126eb21de6d0f49d76fd21d9c7a0fd29f229b4b71e0778d4b1ccd0b2e27b0c794f1e11cd6c83
 DIST aws-cli-1.36.9.gh.tar.gz 2836018 BLAKE2B aada8a63f5bedd5aeeddd56fe18bb49ae1763ba5c737f72aa2f2e00b57fa4e1ab52ec266ca6883859ec633ec2b1658383426809870ba1372d86f9d8e0a055ac6 SHA512 ec47c26012027071732d60f9bd8b3322c1c75b2362dffe7affd8cd6d70732e6239bfbb6531759a247bcb2f29613a88b196d10f405302d25a05ada7968bd7574e
 EBUILD awscli-1.35.23.ebuild 3165 BLAKE2B e800ab81504d6e1e59a6e06c30720b8b05a2ace905fe2545ddf9a57c8021d05aa6d7a264afa3e1e4b9b2db1e9c2d2ba752ed00d210734ab2c9bb85903124258d SHA512 131420b9eae0530bf0e581fb34a269174a1e760844c1c89fff4351f90b0f27590469410ec856d1af49aa4722d4e4fc5b7fd63bc818a5fef3c60c90cc7b9294ce
 EBUILD awscli-1.36.10.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
+EBUILD awscli-1.36.11.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
 EBUILD awscli-1.36.4.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
 EBUILD awscli-1.36.9.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.36.11.ebuild b/app-admin/awscli/awscli-1.36.11.ebuild
new file mode 100644
index 000000000000..2960403cf7e0
--- /dev/null
+++ b/app-admin/awscli/awscli-1.36.11.ebuild
@@ -0,0 +1,95 @@
+# 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..13} )
+
+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-1).(z+59)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
+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[@]}"
+
+		# flaky (some ordering?)
+		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
+	)
+	# 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/restart-services/Manifest b/app-admin/restart-services/Manifest
index 1a1192861824..c21ba6391332 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,7 +1,5 @@
-DIST restart-services-0.17.0.tgz 25643 BLAKE2B 5999e12e38207d00266928504da05c00482c8297b7fee634f302f09cfa09e206bcf9d5a558d2a91e5de1d97318025fa995fbc3a61f0d0e74b8dfb1af3db8670b SHA512 c11ca431fbbc6899ab268e8979049144448479d953ed7373cc7483cca2c03cd4041a1ca1e47c0e810f91a18a43aa32cc305a4ea791e8b992246f972e0fbb19ab
-DIST restart-services-1.2.tgz 27526 BLAKE2B 3936a4145767f917d4f1c856c65ee2b6445b495988e77ada488ff4b43d87abaaca7b9d59e48c89c59a666559d0416d5cf1a6171c5d903ee0385dabb922929882 SHA512 815fb40c4616afaf2e27877a4cbba86c0d44432cbf4be04991431e71f5e495dcb92f66bda020dca47d5363388455fbeaa3f3e35d2e9451785301386c73f724c0
 DIST restart-services-1.3.tgz 27740 BLAKE2B b49fce16771c055aa93b8ac55f5eb37af18cc66b3c63152c276a34b6e8b6e953af651d190e167f036c003d9d615727b3efb382c9e770d55a8885974e9158a750 SHA512 1f45d333be5d342d2bc206380c1fbe4713d2e02d17547b7c9e648ee7be568900042b7e240c16e8d018020ecefd018a5564268c57a32fe3d9f2f660fc062bc45a
-EBUILD restart-services-0.17.0-r1.ebuild 1913 BLAKE2B 4fec8b61fff3ce3661404933ec9e5b7a07e175509967d5b88c2c174027452cbd503429d4b1c6e10922001993f12c6626b614f3d167ca241efdc46e66e3a913fe SHA512 7aba7904058a5cc54d03908276e5d1dd816d7827705bc74435d69c2670e3e1855a140930573f588252b4da3a56185da95c540b25121e67f39daea45fc9a43591
-EBUILD restart-services-1.2.ebuild 1038 BLAKE2B 3c61d53e443370167d8f2a289159225fb531c644ed232c44f456e6eae9879519ee917b328aded6f975fc09aaeeea1690bfe83b182901c6f0e3505aa3680e7cec SHA512 ace076bdd68e3e9301d69966a16ec00446d952ccef180cfd2537371d8613acffb7e08ffe4fed71168b4b74ab600ee912218042981bfcfd56a3e1b7a8a496fa07
+DIST restart-services-1.4.tgz 28970 BLAKE2B d945724d86cdfc206455cd9cdf59418a8f08b8804d35cbd554e08093be76bedec07b81bf4ee34c43c2d61a75d2c89b51c3087e084f28fcbe838d2c8a5c0742fc SHA512 8dcdb3e24889fcca6bbad77e3f33b68ce84db718297f3414d0f9509f3a31f420e79078d5661704447ea80b606af3090aecc50e3ed6fd74fbb9d3539198b3cb6a
 EBUILD restart-services-1.3-r1.ebuild 1057 BLAKE2B e921bc34603b8fcd87e40411d668bb97f448ebefdc565252cd6aad647bb7669287a50635211b67bf8c190d18023736af4ba790d6a1ba2debaf2c3ae5f97ed286 SHA512 6788e4cc8b0b2ab925646ded8080dbcddc09209fc5e977e17ead4472c3c7a089a387aec69628e924add14d49d2df42c91ca9ee27da625a553627374f3b14586d
+EBUILD restart-services-1.4.ebuild 1059 BLAKE2B c93803690d84e5aad7e62c0660fd2fd1ae95c9551cf9a14c8a490f50ec682037ea91af0953a106a2da3cdb4c6cbdd358e1a563bf94b5a10f75c2be26152b5757 SHA512 a5010307eb4ac47a6e3aa982cbb272c0b6428aac7d6c7ff93aa4bfcadac4dcd7fdc1d0b4b9ee4191f035a8d614352622b420d819738a66abb1dc33cd2a6f47c5
 MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
diff --git a/app-admin/restart-services/restart-services-0.17.0-r1.ebuild b/app-admin/restart-services/restart-services-0.17.0-r1.ebuild
deleted file mode 100644
index aee74d1cc63c..000000000000
--- a/app-admin/restart-services/restart-services-0.17.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Tool to manage OpenRC and systemd services that need to be restarted"
-HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
-SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	app-admin/lib_users
-	app-portage/portage-utils
-	|| ( sys-apps/openrc sys-apps/systemd )
-"
-
-src_install() {
-	dosbin restart-services
-	doman restart-services.1
-	keepdir /etc/restart-services.d
-	insinto /etc
-	doins restart-services.conf
-	dodoc README CHANGES
-
-	sed -i -e 's/^#include/include/' "${ED}"/etc/restart-services.conf || die
-	cat > "${ED}"/etc/restart-services.d/00-local.conf <<- EOF || die
-	# You may put your local changes here or in any other *.conf file
-	# in this directory so you can leave /etc/restart-services.conf as is.
-	# Example:
-	# *extend* SV_ALWAYS to match 'myservice'
-	# SV_ALWAYS+=( myservice )
-	EOF
-}
-
-pkg_postinst() {
-	# migrate config data for versions < 0.13.2
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-
-		if [[ $(ver_cut 1 ${REPLACING_VERSIONS}) -eq 0 ]] \
-				&& [[ $(ver_cut 2 ${REPLACING_VERSIONS}) -lt 14 ]]; then
-			local have_old_config=0
-			ebegin "Checking for old config"
-			if [[ -f /etc/restart_services.conf ]]; then
-				have_old_config=1
-				ewarn "Old config file found: /etc/restart_services.conf"
-				ewarn "It will be ignored so please migrate settings to a file in"
-				ewarn "/etc/restart-services.d/ and/or remove /etc/restart_services.conf"
-			fi
-			if [[ -d /etc/restart_services.d ]]; then
-				have_old_config=1
-				ewarn "Old config directory found: /etc/restart_services.d"
-				ewarn "It will be ignored so please migrate files to /etc/restart-services.d"
-				ewarn "and/or remove /etc/restart_services.d"
-			fi
-			eend ${have_old_config}
-		fi
-	fi
-}
diff --git a/app-admin/restart-services/restart-services-1.2.ebuild b/app-admin/restart-services/restart-services-1.4.ebuild
index 10daef1472d7..20767bc5b37d 100644
--- a/app-admin/restart-services/restart-services-1.2.ebuild
+++ b/app-admin/restart-services/restart-services-1.4.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 RDEPEND="
 	app-admin/lib_users
 	app-portage/portage-utils
-	|| ( sys-apps/openrc sys-apps/systemd )
+	|| ( sys-apps/openrc sys-apps/openrc-navi sys-apps/systemd )
 "
 
 src_install() {
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index ac09cf0be7c0..bfc24950e3c4 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -5,8 +5,11 @@ DIST sudo-1.9.16.tar.gz 5392026 BLAKE2B 19daa789af3ca2c4832950f0dd6f26a97285fdc1
 DIST sudo-1.9.16.tar.gz.sig 566 BLAKE2B 9eb9fd2db0de5b9ce965c2109a9722e0b5f0793b7c9003123b1540d7cb5b8178043221296fd51c7f0b24ce1b1cda9f196a6d50083da172ca2afcb8f130d8eae1 SHA512 edf066f9ffdf2653468f8b45866a65214f0dff0164318d5f6bd9252f6211e82522161b1b9621798fbc9112253e6940d7137d18e8b42e8c6e5ba52ccac64d99cf
 DIST sudo-1.9.16p1.tar.gz 5396038 BLAKE2B 7f973510658e91af54121d8c4c634b26231ef270abac50f658c9ad8a446a7dbbc44cb878561fb8da51e4ec15ebc8873fdaed05be142907f96964ff42c7e4f896 SHA512 3239d16513c431383b6d54cf40690a9b8fcf905d9b8f5a2085679dd5daeaacbd7efb153b41fd672fc634277c3203aaa1dc18e6a6c01799ebc9948763ec93a038
 DIST sudo-1.9.16p1.tar.gz.sig 566 BLAKE2B 0f68bb4a653cfaacf05d6c148f690ae0022035090e6e60df7efde6b25193ac46d12905ca898e5aadb8339ca3f08e27a4408edeb75f26f7e483f136026835aa24 SHA512 96cdd7f646d2fe7eeefce7710ba421be12a9bfd6811284ba8ccb3f7288b328531bbd7215cf0182c13670f2ec7c0ee25dfd6396214ddd61ee4ee153fec19bef7e
+DIST sudo-1.9.16p2.tar.gz 5398419 BLAKE2B ef9f1c2cd4044454a808d1dff5f865355e1bd061d1b5c93a005207e28e9b9df7c267cf01358ce60dd2c98f6844b51dab00eac4e7a08bade1d621235c3a4774bf SHA512 1e2ea762671890a03b0ea4b95b3849f2d3a4c301432db8767433e9d80c517efd8b7a68e0bbce1b178aff5857907600f1f5e0d889779cb27e38c2f602395f6f06
+DIST sudo-1.9.16p2.tar.gz.sig 566 BLAKE2B 90f90658a7d6ec3b32f6a726a2cd28e156826a65749a88a2a29d970e97804d2d75de856bc85c9a459233b59e35564c5fbf93aff53ffe42d17d0e94dd23724acd SHA512 7f0e3269c9befada535590b2cfc36f96cd70831b5c030df5b3bf8c7cb3eff296d22193429f940db4a0df849b4d8080e4006086c49869b4bbae663836b2632b49
 EBUILD sudo-1.9.15_p5.ebuild 7479 BLAKE2B a05bc37a197726aeffb370e311d02f5e57178be9e27fabb42dd6960b34466354da1267431996427545a28d430ffeb5727bb26abe738c931d38b4c5300124491a SHA512 f94eb4c5d4e68fac20d4cad7ddf521066fa79ed29e263ba970eca1db27ff937ed07b9beb7fb9f8ab87a1f6a800118e7d6edff82fea131abf1785420833f1353a
 EBUILD sudo-1.9.16-r1.ebuild 7716 BLAKE2B 2ae65c8b412ceade23e8a71e8f1dcc81a3f4b59c4974f7df2198e5bf8aecfcd4bab5898683facf131d67b131f823a4a056a2ffa59cc667289759e71aef28b8c4 SHA512 a45430f23541bd53cb87b32317add7be84cd089995ceb8641bb9bba8c8aa8c31d0e602e23d6070db2ad84594f2f93523018b45bb0dbb40235797659c65e110f2
 EBUILD sudo-1.9.16_p1.ebuild 7585 BLAKE2B cb76708dad4ac7724f763c8f84e784d0124f790dcd02c694906b8990491df2096276076de176e7698b09dccaae2e5994357aa5857894a1878fe34306f3e1e052 SHA512 081370de30ae4b55d6a0ecfae42ed631e66d9ddb583aa43833ce6097cf965ea19b6bd511f54d31b3ba2bbce84e40e8902d870988250d58d3d9bbf39196d73fdd
+EBUILD sudo-1.9.16_p2.ebuild 7507 BLAKE2B bd9568563e72c881c3d215f40583d41b4805da5dbcb38dbdb3193d629b138cf3287eb37f6d7fcc37adc78733a6727de0cd51afb38744c0bace3bcced5fec1ba7 SHA512 c2ec6606469e9467813714543950e1c4b76653fd74cfe3e0326724c25500c29e3ba1fc2255aebe887bba3a42a5025930753b625d6b50ad1aa2fee8055f411b75
 EBUILD sudo-9999.ebuild 7585 BLAKE2B cb76708dad4ac7724f763c8f84e784d0124f790dcd02c694906b8990491df2096276076de176e7698b09dccaae2e5994357aa5857894a1878fe34306f3e1e052 SHA512 081370de30ae4b55d6a0ecfae42ed631e66d9ddb583aa43833ce6097cf965ea19b6bd511f54d31b3ba2bbce84e40e8902d870988250d58d3d9bbf39196d73fdd
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.16_p2.ebuild b/app-admin/sudo/sudo-1.9.16_p2.ebuild
new file mode 100644
index 000000000000..2738ddd0e886
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.16_p2.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic pam tmpfiles toolchain-funcs
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sudo.ws.asc
+	inherit libtool verify-sig
+
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="
+		https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+		verify-sig? (
+			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+		)
+	"
+
+	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+	sys-libs/zlib:=
+	virtual/libcrypt:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1:=
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap:=[sasl]
+		)
+	)
+	pam? ( sys-libs/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( sys-libs/libselinux )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ssl? ( dev-libs/openssl:= )
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND+="
+	app-alternatives/yacc
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	?? ( pam skey )
+	?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+set_secure_path() {
+	# First extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+
+	case "${SECURE_PATH}" in
+		*/usr/sbin*)
+			;;
+		*)
+			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+			;;
+	esac
+
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# Then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# Finally, strip gcc paths, bug #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do
+				[[ ${thisp} == ${e} ]] && continue 2 ;
+			done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+}
+
+src_configure() {
+	local SECURE_PATH
+
+	set_secure_path
+
+	# bug #767712
+	tc-export PKG_CONFIG
+
+	# - audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# - plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	local myeconfargs=(
+		# We set all of the relevant options by ourselves (patched
+		# into the toolchain) and setting these in the build system
+		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
+		# (it'll downgrade to =2). So, this has no functional effect on
+		# the hardening for users. It's safe.
+		--disable-hardening
+
+		# requires some python eclass
+		--disable-python
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with pam)
+		$(use_with pam pam-login)
+		$(use_with secure-path)
+		"$(use_with secure-path secure-path-value "${SECURE_PATH}")"
+		$(use_with selinux)
+		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP.md
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP.md for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins docs/schema.OpenLDAP sudo.schema
+	fi
+
+	if use pam ; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	# bug #652958
+	fperms 0711 /var/db/sudo
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run || die
+
+	# bug #697812
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	# bug #652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}