gentoo auto-resync : 31:07:2022 - 03:11:29

7 files changed, 126 insertions, 2 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 27a8a565d17a..7b01116b8cca 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest
index b1039693524e..f4b72336a59c 100644
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@@ -1,7 +1,10 @@
 DIST awscli-exe-linux-aarch64-2.7.11.zip 46384612 BLAKE2B 1728dac769441954b86f1436708c7b84aa4d1f7affc634de9e6a7bea66a10e5143a6d1da3fd24e8e721cdaabff0bb4b363bef78e29aecc976e9cd5b961284a2b SHA512 3f3e2670614bdcf6751d556a8a150d573712b036ad904a7cbfbb85600241d04f7f257df2d1159e2fb6f5b0d02b7f65df1bfb00764218ef60782a04a7fdebdc2a
 DIST awscli-exe-linux-aarch64-2.7.16.zip 46227549 BLAKE2B 28c72891454779337e7da8cb554310d54af0d3e3aab45a9aea76350eb0db5cba592c67f55f8feb0b4f57044a7b2292d6ac79809ceafd1a8d62639c67f6018e7c SHA512 e577e3507310dc48d323635592df5c7c12ac5ba90578d5e9e0a74264007b3c4bcaa0bf43d95f37d4974e7a83e57fdd3ec3a36e43ccd8ad359d5a56b7cda7402c
+DIST awscli-exe-linux-aarch64-2.7.20.zip 46289081 BLAKE2B 1750e609bef53775e4bf66f1be78e2b05f763bde7677be99867ae89e252f1deb81dddf6011718ceafe1f97b53ac4871657f2644c478887eb4d021e14be400121 SHA512 f519aaaf2ebc3e163ae55abdb85b08dd49e148f902a06e671f582879790bdfa07e32f8d8e773ddeb95494aee3a38dc3fbdf91a93b14215f63e13ae87cdf3de4a
 DIST awscli-exe-linux-x86_64-2.7.11.zip 47188206 BLAKE2B 9530ad2cf832dab1d5fb38a4942d338629c24bdadebe6abd0ba3a1759688e2ea9666cd97d8643d6ba7469bc446f09bd4c63a43f36deba1afb133ef00da49ce6d SHA512 6a15745502e273ddfad1d9ac118aea1684cf62f533a0fa3ac7661c31e49984ce1d0b608c61f5ed182692686ab7fd992f9a8da6a066bc4da6fe5e3d386548ab8f
 DIST awscli-exe-linux-x86_64-2.7.16.zip 47030919 BLAKE2B 1ac5789003753b015278eda42109c9ca5ee4710d32b07940c3abac0100844065fa6bffdc854446a7b4493727d3648f0514fe10e09b50c77d79f42139e2c64fcc SHA512 ae76d7425974154f481546b804cc6f359702f9357e670dfaaa7f943aa2ca27124c66388032ad9b4fbd05d82f73b7401fa7d07d7d4742c8f37c49eca17e6e6564
+DIST awscli-exe-linux-x86_64-2.7.20.zip 47092365 BLAKE2B 26320deb54f66043693aa40cd2fee2e110f2dbf1710278ce431781d49096860dacd906bd91a01160c69c484020cc1ca497954283213e85d42206ab2dba3f1c92 SHA512 6f5ab60fe3b59a7c8ad73e81b3d3003660736fe9da35e5e44b8d222a94cf195676a4802e8ea391bbefb9cbece77860148be1f616f32281d18726af126c7daa4b
 EBUILD awscli-bin-2.7.11-r1.ebuild 2289 BLAKE2B a10366396fb39fc81382351de2b57dd95afac77cb9eddac2c11245460fb16614d8d50be696dd88ca978f13096070bc0de3909f9433784c2b3ae3ef7d1237d3a0 SHA512 19eba643095a14c9e3a4723f704b4a6d34a8fe6e60b75d6baa56030b55f7870af23cbfa8ddab7307929d611843d43ad1ebf0dbc65eeb2abcd2a198e42afff871
 EBUILD awscli-bin-2.7.16.ebuild 2289 BLAKE2B a10366396fb39fc81382351de2b57dd95afac77cb9eddac2c11245460fb16614d8d50be696dd88ca978f13096070bc0de3909f9433784c2b3ae3ef7d1237d3a0 SHA512 19eba643095a14c9e3a4723f704b4a6d34a8fe6e60b75d6baa56030b55f7870af23cbfa8ddab7307929d611843d43ad1ebf0dbc65eeb2abcd2a198e42afff871
+EBUILD awscli-bin-2.7.20.ebuild 2305 BLAKE2B 49bd417c8c54ac715176c3043dff2c99ff48f2eb62c80e26f4464c9b9bba989de0eed39f7e12a435098a02b50790cf0b6c3f2ea073f4af3669981728d3124cd8 SHA512 2977797f3c8e9a1a16e5cbad3de6c765234d2d093cca1f166929465f75d116e92fc7be4bc6f1bafe63f1a82d303bbc9cf10b3cff88fb89f79aca5df7c10a88e3
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-admin/awscli-bin/awscli-bin-2.7.20.ebuild b/app-admin/awscli-bin/awscli-bin-2.7.20.ebuild
new file mode 100644
index 000000000000..84c6be57c790
--- /dev/null
+++ b/app-admin/awscli-bin/awscli-bin-2.7.20.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="command line interface for Amazon Web Services"
+HOMEPAGE="
+	https://aws.amazon.com/cli/
+	https://github.com/aws/aws-cli/
+	"
+SRC_URI="
+	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
+	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
+	"
+
+LICENSE="
+	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
+	openssl PSF-2 BSD-2 GPL-3+ public-domain
+	"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+RDEPEND="!app-admin/awscli
+	sys-libs/glibc"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="*"
+RESTRICT="strip"
+S="${WORKDIR}"
+
+# This code is based on the install script in the upstream archive.
+
+set_global_vars() {
+	ROOT_INSTALL_DIR=/opt/aws-cli
+	BIN_DIR=/usr/bin
+
+	EXE_NAME="aws"
+	COMPLETER_EXE_NAME="aws_completer"
+	INSTALLER_DIR="aws"
+	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
+	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
+	AWS_EXE_VERSION=${PV}
+
+	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
+	# INSTALL_DIR="${INSTALL_DIR}"
+	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
+	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
+	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
+	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
+
+	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
+	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
+	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
+
+	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
+	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
+}
+
+create_install_dir() {
+	dodir "${INSTALL_DIR}"
+	setup_install_dist
+	setup_install_bin
+	create_current_symlink
+}
+
+setup_install_dist() {
+	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
+}
+
+setup_install_bin() {
+	dodir "${INSTALL_BIN_DIR}"
+	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
+	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
+}
+
+create_current_symlink() {
+	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
+}
+
+create_bin_symlinks() {
+	dodir "${BIN_DIR}"
+	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
+	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
+}
+
+src_install() {
+	set_global_vars
+	create_install_dir
+	create_bin_symlinks
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index a64a4c33480a..e37dcb8f9193 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -5,7 +5,7 @@ DIST aws-cli-1.25.37.gh.tar.gz 2237143 BLAKE2B 3c51a5e56964fb8c4e5374892e185da78
 DIST aws-cli-1.25.40.gh.tar.gz 2238762 BLAKE2B 62d4db7d25ca82f744726a7daef740bc9726b5c99098c5f6d45cc469dba73000371c76cdb19a7bedb2fbc3196a11c31ff4701f9ca26d39127fbe10210dd5b480 SHA512 e7f1c368ecbdb75440072e0bbe2f839713b49922be0375e2c9df3d3e99e42c71e266c39923694b143685ce5f5d3dc719aa0baf1dd190f3d0a83c20d4e905db21
 DIST aws-cli-1.25.41.gh.tar.gz 2238897 BLAKE2B b0e4d1b96048971f41a0fce9c9149154778177ec8569f467cd210edaa063d629ea6998c1ebfa4506f8b2cca65caef7f73b307ef6aeec683801045c6121f85a8c SHA512 712c237181b166cdf1148ca4b3588a92939dbbfbaa5cdff9bffd8e2da35089539ef3b0b0ba271b234918796cd5fd83bf2a59e29c974f9e341d0e42e05bb8b69e
 EBUILD awscli-1.25.26.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
-EBUILD awscli-1.25.31.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.31.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.36.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.37.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.40.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
diff --git a/app-admin/awscli/awscli-1.25.31.ebuild b/app-admin/awscli/awscli-1.25.31.ebuild
index 9f176fa05cc8..f241876330bb 100644
--- a/app-admin/awscli/awscli-1.25.31.ebuild
+++ b/app-admin/awscli/awscli-1.25.31.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 8e380ebc29c1..48df9fc32ae0 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -1,4 +1,7 @@
 DIST kube-bench-0.6.6-deps.tar.xz 182543748 BLAKE2B c3084b6940a380a6b25d24fd397f9e6ea777c4fb156729e0adadf0c96b882d710b475ee1b69d2359f43cd595aa934c49ab60fd44dd5d10ea6366c770c0d131a2 SHA512 a5e88c687c0cf858ea504b345bf54424c7a9d10e5cde889c73e5cf3f0402b65a8c7bb2e8c9edd7c0be9bfa3b8f7c9e6a5f8c568ca951437cf552413e126c0295
 DIST kube-bench-0.6.6.tar.gz 717589 BLAKE2B 727323530d471cc9256c654a0b5b2d1f7ada3beed6b06f4d425cd97e8aab0bd218db539a266f25a1b3fa0fb39158d724371763cb8add82f3ad89c4f44e6877f8 SHA512 26071730eea02e87145b44bec19f7cc9d34fdc6b6f8ec7dcb569437bd6bd2c8e72bf223432413027efb96ec7027ffd8e0d62f44263c0b5bab2468204505603b9
+DIST kube-bench-0.6.8-deps.tar.xz 189993884 BLAKE2B e7e1f791552f4dafada11898bcc89656198f94822852e3b50d02a4739649d8f9b30c71f542921c7dc03baf15729df7c6b83ebaac3472a92a4ca156b34013ff5e SHA512 ec895053686325954f79c5960e1d6548db4186c1ddc04b29f07005306f7026c058ed9d16880ad8bce80ed77b7f8b517da2c079a0e5dfb2ef22b0eb66d53cd4d6
+DIST kube-bench-0.6.8.tar.gz 728744 BLAKE2B 633c6be69e388e9ee33c92fd7bf6b5f75e6646e1b8c00a2a9974425ee66e02ea816ba7a106e125559c783b86030f177e21486894f665dfc4aaf0d55880055a88 SHA512 3ad1bfdece19bd71f8c34ff2b1cb7c046a2c3ceb625f25c80e43b0c63a3c350b7dd883902c79430faf851c60547be024f2b7b6ca049d131506c750e61adf71b4
 EBUILD kube-bench-0.6.6.ebuild 664 BLAKE2B d796276ca689d579b87eccee1f64ac6b85182c098e1c2352335ad2e30d64aa9a1f0f68d968df11ea5e57aba0919131440e9a8f6d086b45403bdd973dac0926c7 SHA512 03f83286c48ec1c7896ecd72a743d734c87f9252e3ad85c9982a3437ab7e6b85ec6aa9d86ed2ed443ec4a14d01853ef8b27022ed742cbab64f6fd71f97e7cd29
+EBUILD kube-bench-0.6.8.ebuild 648 BLAKE2B d8b1bcb4c00024f2188eb8b3aac35201da2152865881a92cd71f5c4857a1d647a3a68f5ddbbc51f7d9132e17328a91b00a75f0b97df92df66a43984f9b4df10e SHA512 3f66074d85fb3b342da3c7e4f7fea51e592313691474cfa458231c0f57fed5e512dd7598123830bd33131b2050e17a505cdfe857461f4ebe6c6db172cfb94690
 MISC metadata.xml 337 BLAKE2B a1d859f37bda81ca78e1fcf7831f3af6d35801ef2d7365dde7ad79f98c27d6bd7ef5e4e1db542cf54ff510be654cff9d4238f63a94a3ff4de75bf6b2cbc3d31d SHA512 1147e5d02349c1976419c9c7e139048d20b47090d1d3037b6af7acd713034fc9edbedb69ca108de0d8f729b8ad8ad9016f3b31f76dc1f06f33035b0c68e8f0b1
diff --git a/app-admin/kube-bench/kube-bench-0.6.8.ebuild b/app-admin/kube-bench/kube-bench-0.6.8.ebuild
new file mode 100644
index 000000000000..4d7ff54265c5
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.6.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 MIT MPL-2.0 BSD BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	emake KUBEBENCH_VERSION=v${PV} build
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc/kube-bench
+	doins -r cfg
+}
+
+src_test() {
+	emake tests
+}