1 |
commit: 40bf1a5a5a1af94674217c21ea2a92a6ee7d4da5 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 4 01:48:37 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 4 01:48:55 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40bf1a5a |
7 |
|
8 |
app-admin/ansible: cleanup for bug 639694 CVE-2017-7550 |
9 |
|
10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
11 |
|
12 |
app-admin/ansible/Manifest | 3 -- |
13 |
app-admin/ansible/ansible-2.3.2.0-r2.ebuild | 65 ----------------------------- |
14 |
app-admin/ansible/ansible-2.4.0.0.ebuild | 56 ------------------------- |
15 |
3 files changed, 124 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest |
18 |
index 66eb2947139..afa08114b7a 100644 |
19 |
--- a/app-admin/ansible/Manifest |
20 |
+++ b/app-admin/ansible/Manifest |
21 |
@@ -1,5 +1,2 @@ |
22 |
-DIST ansible-2.3.2.0-pycryptodome.patch 32472 BLAKE2B 7e46379063586ac29b62afebe225faeeaacdcd15d03e9ac2d241c2581cde4b87a586efb8ca01eb3a00a245676fd176469789187992c4aa6c0ab4d9859b31b9eb SHA512 cf2b1528176a12e8e48001155d8f2351e1c4914df56ae8b8542a48ccee4158c23ed1eda537ac500f1b71553aa84c574b8297398a82c4c0721ed6f9d08ad5257d |
23 |
-DIST ansible-2.3.2.0.tar.gz 4319664 BLAKE2B e31ecd6652b58ca83a2b4533cb76422b29825ce33aac29eb02567851b19986b80323a6f6c2783a72a9cfc86f691d27a8dd7f24c19b753daa9adc28a7f9885584 SHA512 458506da8ae65a80b442834c6047f02eb92acf9f7dd4465c63b4360c4c4817a0f7c48c92a614b91760a54d036ed13f417edf3524bb8a34a8a53ceb11efc928ac |
24 |
-DIST ansible-2.4.0.0.tar.gz 6623856 BLAKE2B 7b70173ddb81e1dbb4862e7918fd5aeff2bf8ec0ad1d38b4f6b683e1c178188c409bdfad840c033b42eddea0cb5be4328b85dbc9c9921f08d3f35f5e5a7ab235 SHA512 78717b19599bdd46a7285b0b2a4c9d0d5b4cb86fd41dcf0b3340cf65945a55fae4508097058098fbeab871422c31d4f37ab4cd149abfd0af5add6004f65a207b |
25 |
DIST ansible-2.4.1.0.tar.gz 6675552 BLAKE2B 00497b33e833149510669c9e481b0893a2d016caf2949fa064ca0a2e4f62a6c5a3f94597673822418253b85abaf380308115dfaa4c1acd88f0c73322d87822d4 SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d |
26 |
DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0 |
27 |
|
28 |
diff --git a/app-admin/ansible/ansible-2.3.2.0-r2.ebuild b/app-admin/ansible/ansible-2.3.2.0-r2.ebuild |
29 |
deleted file mode 100644 |
30 |
index dce26e1069d..00000000000 |
31 |
--- a/app-admin/ansible/ansible-2.3.2.0-r2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,65 +0,0 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-PYTHON_COMPAT=( python2_7 python3_5 ) |
40 |
- |
41 |
-inherit distutils-r1 eutils versionator |
42 |
- |
43 |
-DESCRIPTION="Model-driven deployment, config management, and command execution framework" |
44 |
-HOMEPAGE="http://ansible.com/" |
45 |
-SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz |
46 |
- https://dev.gentoo.org/~prometheanfire/dist/ansible/ansible-2.3.2.0-pycryptodome.patch" |
47 |
- |
48 |
-LICENSE="GPL-3" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="amd64 x86 ~x64-macos" |
51 |
-IUSE="test" |
52 |
- |
53 |
-RDEPEND=" |
54 |
- dev-python/paramiko[${PYTHON_USEDEP}] |
55 |
- dev-python/jinja[${PYTHON_USEDEP}] |
56 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
57 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
58 |
- || ( |
59 |
- dev-python/pycryptodome[${PYTHON_USEDEP}] |
60 |
- >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] |
61 |
- ) |
62 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
63 |
- dev-python/six[${PYTHON_USEDEP}] |
64 |
- dev-python/netaddr[${PYTHON_USEDEP}] |
65 |
- net-misc/sshpass |
66 |
- virtual/ssh |
67 |
-" |
68 |
-DEPEND=" |
69 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
70 |
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}] |
71 |
- test? ( |
72 |
- ${RDEPEND} |
73 |
- dev-python/nose[${PYTHON_USEDEP}] |
74 |
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] |
75 |
- <dev-python/mock-1.1[${PYTHON_USEDEP}] |
76 |
- dev-python/passlib[${PYTHON_USEDEP}] |
77 |
- dev-python/coverage[${PYTHON_USEDEP}] |
78 |
- dev-python/unittest2[${PYTHON_USEDEP}] |
79 |
- dev-vcs/git |
80 |
- )" |
81 |
- |
82 |
-# not included in release tarball |
83 |
-RESTRICT="test" |
84 |
- |
85 |
-PATCHES=( |
86 |
- "${DISTDIR}/${PN}-2.3.2.0-pycryptodome.patch" |
87 |
- "${FILESDIR}/${PN}-2.3.2.0-fix_key_error.patch" |
88 |
-) |
89 |
- |
90 |
-python_test() { |
91 |
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die |
92 |
-} |
93 |
- |
94 |
-python_install_all() { |
95 |
- distutils-r1_python_install_all |
96 |
- |
97 |
- doman docs/man/man1/*.1 |
98 |
-} |
99 |
|
100 |
diff --git a/app-admin/ansible/ansible-2.4.0.0.ebuild b/app-admin/ansible/ansible-2.4.0.0.ebuild |
101 |
deleted file mode 100644 |
102 |
index 546c17afaf9..00000000000 |
103 |
--- a/app-admin/ansible/ansible-2.4.0.0.ebuild |
104 |
+++ /dev/null |
105 |
@@ -1,56 +0,0 @@ |
106 |
-# Copyright 1999-2017 Gentoo Foundation |
107 |
-# Distributed under the terms of the GNU General Public License v2 |
108 |
- |
109 |
-EAPI=6 |
110 |
- |
111 |
-PYTHON_COMPAT=( python2_7 python3_5 ) |
112 |
- |
113 |
-inherit distutils-r1 eutils versionator |
114 |
- |
115 |
-DESCRIPTION="Model-driven deployment, config management, and command execution framework" |
116 |
-HOMEPAGE="http://ansible.com/" |
117 |
-SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz" |
118 |
- |
119 |
-LICENSE="GPL-3" |
120 |
-SLOT="0" |
121 |
-KEYWORDS="amd64 x86 ~x64-macos" |
122 |
-IUSE="test" |
123 |
- |
124 |
-RDEPEND=" |
125 |
- dev-python/paramiko[${PYTHON_USEDEP}] |
126 |
- dev-python/jinja[${PYTHON_USEDEP}] |
127 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
128 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
129 |
- dev-python/cryptography[${PYTHON_USEDEP}] |
130 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
131 |
- dev-python/six[${PYTHON_USEDEP}] |
132 |
- dev-python/netaddr[${PYTHON_USEDEP}] |
133 |
- net-misc/sshpass |
134 |
- virtual/ssh |
135 |
-" |
136 |
-DEPEND=" |
137 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
138 |
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}] |
139 |
- test? ( |
140 |
- ${RDEPEND} |
141 |
- dev-python/nose[${PYTHON_USEDEP}] |
142 |
- >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] |
143 |
- <dev-python/mock-1.1[${PYTHON_USEDEP}] |
144 |
- dev-python/passlib[${PYTHON_USEDEP}] |
145 |
- dev-python/coverage[${PYTHON_USEDEP}] |
146 |
- dev-python/unittest2[${PYTHON_USEDEP}] |
147 |
- dev-vcs/git |
148 |
- )" |
149 |
- |
150 |
-# not included in release tarball |
151 |
-RESTRICT="test" |
152 |
- |
153 |
-python_test() { |
154 |
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die |
155 |
-} |
156 |
- |
157 |
-python_install_all() { |
158 |
- distutils-r1_python_install_all |
159 |
- |
160 |
- doman docs/man/man1/*.1 |
161 |
-} |