diff options
Diffstat (limited to 'app-admin/ansible')
| -rw-r--r-- | app-admin/ansible/Manifest | 5 | ||||
| -rw-r--r-- | app-admin/ansible/ansible-2.10.5.ebuild | 61 | ||||
| -rw-r--r-- | app-admin/ansible/files/ansible-2.10.0-CVE-2020-25635-6.patch | 54 | ||||
| -rw-r--r-- | app-admin/ansible/metadata.xml | 4 |
4 files changed, 64 insertions, 60 deletions
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index 962ca9dd0fde..48273506066f 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,5 +1,6 @@ -AUX ansible-2.10.0-CVE-2020-25635-6.patch 2961 BLAKE2B bd023424bb075a743881056d6e0c0c194ae56cde0ed3b9aad2ef5a2f75d6a63994a0455a896e6e9f16cacd0f1c3438eb45cd2352d4f4b53810f19728b5a7de5e SHA512 36bb9321e9524d04f06d7156ad6f7f72ce4bd75332437a33ff49c226e12e8e4f8cd82976ccb0c02076ee95de762988d6783a2ed00453b1b8893fe8127847bc30 DIST ansible-2.10.4.tar.gz 28622006 BLAKE2B 94551986f5e8ef54dd4f806a264f8373b19564f74b32bfc6d852d49b7b9ff1030ad3c2fdda2f16bc78c0dae5e07cc750a3992bca23fd9bff0f2466716ac32374 SHA512 da9517ad1f478eb8ccab3bad15f3f6ca4d6151798b5aab6db261c4b19a0ac023db1e294745a06748788820ece8980bf1c2c6274314fa0a2943b76c0658383b72 +DIST ansible-2.10.5.tar.gz 29123326 BLAKE2B a63ba7d26d2bf49f8367c48962ad77461994601b073986342ce090f7ec16a2c4d23e9176f9463adb558996ad33a5b6e27bf829983e648f2b9b3d9992b7678f01 SHA512 9eca87e0a98e2641112ac3c4fff07d624afa3db9655ba88d3ac5faa76464f7e89f6a64fe0613582c6e5528c2c0408fe1ee237f4c69353bdfcd73b264444fe3dc EBUILD ansible-2.10.4.ebuild 1515 BLAKE2B c144c9099dcc347fd5eec6945222d1c4b80f357e0d5c6645dc8a45f1812adc75d8b33bd1d7aaf3c233d718f15152242834115ce78376f2e5b7f40819db9046c2 SHA512 5a65db7ac0770ae19d32f9c19a391d6a2b17ea64d21d182b6fc6fcd1cd274bce31f1e623a1b56a1711f42c63d1e7519fa28292a56086fbb02a858cb2cf0b18e2 +EBUILD ansible-2.10.5.ebuild 1518 BLAKE2B 26ca3c2e12c6c7cec26f87d488e42d19105219c68c5043fcf029b3e8a56f07dbae477fd833b44db16cb3fc7521edd9800b6887032cfad760167459e827c7bc98 SHA512 e2dcfca4af8878fe7cd03002be684a55b9939db2ac815bc7666ecf1a3323a4594c1cfaf4a8ab87fc82a3080234a5a72c0ec021548f311f623193e4956b00e56c EBUILD ansible-9999.ebuild 1520 BLAKE2B e7358a5fb39611b0aca5c62cc18c9e40a992844d3a94d8f2677ce1a05cd80d4ec730a4c701566d65a4d4bb993630bab13db24e84748cedab7ac13e826ef74012 SHA512 f349dc7ab23e08540a103ff4724b81f50d54c8f99ea6e9c1a28555e752fb0ebd8bce7aec11791da718349dc7f1b96fd16f9d7448616d3571c8025d6b5f8478c2 -MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7 +MISC metadata.xml 837 BLAKE2B ace15c05a5ac41dcf4889ed6cbf1b920793af9b67d415b0e51ddb1da179efc1ccf6efb821bc1ea6031283b7896cc5fde309fdff6a7d30b5f4902fec471b901a4 SHA512 dc6e6af5b2c5e14afca5719a4fcb920edff8386c89145895784c8b4ed95942b2313035eb4b7d5c595871b316b21a3119d5f584d9851a643a18f6e6fae3c26506 diff --git a/app-admin/ansible/ansible-2.10.5.ebuild b/app-admin/ansible/ansible-2.10.5.ebuild new file mode 100644 index 000000000000..3d022874c45f --- /dev/null +++ b/app-admin/ansible/ansible-2.10.5.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +DISTUTILS_USE_SETUPTOOLS=bdepend + +inherit distutils-r1 eutils + +DESCRIPTION="Model-driven deployment, config management, and command execution framework" +HOMEPAGE="https://ansible.com/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ansible/ansible.git" + EGIT_BRANCH="devel" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="test" +RESTRICT="test" + +RDEPEND=" + dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/httplib2[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/netaddr[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + net-misc/sshpass + virtual/ssh + app-admin/ansible-base +" +DEPEND=" + >=dev-python/packaging-16.6[${PYTHON_USEDEP}] + app-admin/ansible-base + test? ( + ${RDEPEND} + dev-python/nose[${PYTHON_USEDEP}] + >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/unittest2[${PYTHON_USEDEP}] + dev-vcs/git + )" + +python_compile() { + export ANSIBLE_SKIP_CONFLICT_CHECK=1 + distutils-r1_python_compile +} + +python_test() { + nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die +} diff --git a/app-admin/ansible/files/ansible-2.10.0-CVE-2020-25635-6.patch b/app-admin/ansible/files/ansible-2.10.0-CVE-2020-25635-6.patch deleted file mode 100644 index df88be4264ff..000000000000 --- a/app-admin/ansible/files/ansible-2.10.0-CVE-2020-25635-6.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 921bd53103c2b543e95c9e6b863702db3ff54d0c Mon Sep 17 00:00:00 2001 -From: Jill R <4121322+jillr@users.noreply.github.com> -Date: Fri, 2 Oct 2020 11:37:37 -0700 -Subject: [PATCH] aws_ssm: Namespace S3 buckets and delete transferred files - (#237) - -Files transferred to instances via the SSM connection plugin should use -folders within the bucket that are namespaced per-host, to prevent collisions. -Files should also be deleted from buckets when they are no longer required. - -Fixes: #221 -Fixes: #222 - -Based on work by abeluck - -changelog ---- - ansible_collections/community/aws/changelogs/fragments/221_222_ssm_bucket_operations.yaml | 2 ++ - ansible_collections/community/aws/plugins/connection/aws_ssm.py | 6 +++++- - 2 files changed, 7 insertions(+), 1 deletion(-) - create mode 100644 ansible_collections/community/aws/changelogs/fragments/221_222_ssm_bucket_operations.yaml - -diff --git a/ansible_collections/community/aws/changelogs/fragments/221_222_ssm_bucket_operations.yaml b/ansible_collections/community/aws/changelogs/fragments/221_222_ssm_bucket_operations.yaml -new file mode 100644 -index 00000000..247d5e36 ---- /dev/null -+++ b/ansible_collections/community/aws/changelogs/fragments/221_222_ssm_bucket_operations.yaml -@@ -0,0 +1,2 @@ -+bugfixes: -+ - aws_ssm connection plugin - namespace file uploads to S3 into unique folders per host, to prevent name collisions. Also deletes files from S3 to ensure temp files are not left behind. (https://github.com/ansible-collections/community.aws/issues/221, https://github.com/ansible-collections/community.aws/issues/222) -diff --git a/ansible_collections/community/aws/plugins/connection/aws_ssm.py b/ansible_collections/community/aws/plugins/connection/aws_ssm.py -index 7f7d6926..94289eee 100644 ---- a/ansible_collections/community/aws/plugins/connection/aws_ssm.py -+++ b/ansible_collections/community/aws/plugins/connection/aws_ssm.py -@@ -522,7 +522,8 @@ def _get_boto_client(self, service, region_name=None): - def _file_transport_command(self, in_path, out_path, ssm_action): - ''' transfer a file from using an intermediate S3 bucket ''' - -- s3_path = out_path.replace('\\', '/') -+ path_unescaped = "{0}/{1}".format(self.instance_id, out_path) -+ s3_path = path_unescaped.replace('\\', '/') - bucket_url = 's3://%s/%s' % (self.get_option('bucket_name'), s3_path) - - if self.is_windows: -@@ -546,6 +547,9 @@ def _file_transport_command(self, in_path, out_path, ssm_action): - client.upload_fileobj(data, self.get_option('bucket_name'), s3_path) - (returncode, stdout, stderr) = self.exec_command(get_command, in_data=None, sudoable=False) - -+ # Remove the files from the bucket after they've been transferred -+ client.delete_object(Bucket=self.get_option('bucket_name'), Key=s3_path) -+ - # Check the return code - if returncode == 0: - return (returncode, stdout, stderr) diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml index 7c4e1dffb27b..ede75031e55a 100644 --- a/app-admin/ansible/metadata.xml +++ b/app-admin/ansible/metadata.xml @@ -10,10 +10,6 @@ <name>Matthew Thode</name> </maintainer> <maintainer type="person"> - <email>calchan@gentoo.org</email> - <name>Denis Dupeyron</name> - </maintainer> - <maintainer type="person"> <email>monsieurp@gentoo.org</email> <name>Patrice Clement</name> </maintainer> |