1 |
commit: dcafe3c0e0de0634372e32fbc560a732efc9be37 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 26 19:59:52 2016 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 26 19:59:52 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcafe3c0 |
7 |
|
8 |
app-admin/salt: drop versions vulnerable to CVE-2015-8034 |
9 |
|
10 |
Gentoo-Bug: 569880 |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
app-admin/salt/Manifest | 3 - |
15 |
app-admin/salt/salt-2015.5.6.ebuild | 119 ----------------------------------- |
16 |
app-admin/salt/salt-2015.8.1.ebuild | 121 ------------------------------------ |
17 |
3 files changed, 243 deletions(-) |
18 |
|
19 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
20 |
index 830259c..1454c32 100644 |
21 |
--- a/app-admin/salt/Manifest |
22 |
+++ b/app-admin/salt/Manifest |
23 |
@@ -1,6 +1,3 @@ |
24 |
-DIST salt-2015.5.6.tar.gz 5564414 SHA256 4fe478132ce84076b3e424cdd217443766d83ac40fa0ec0e914ca46111971c38 SHA512 6f091b2de8d5f949eb8df8d5173bc122b971a3966b3f4fa55209906dba83b744a72b24e40ee1b0b4dc0a51d740bc336e10798a310da3544e36d4d8585934ac11 WHIRLPOOL 2d25cfada4dab07e82dad6542ac8c290d55ca493fe90186af4b1f78b3684dcb7c9d95eab4a0fe22a0c82cb8b31e8176cc750ebab5304927bbbc7f2a2545ebc8b |
25 |
DIST salt-2015.5.8.tar.gz 5741097 SHA256 07c3eb054ef214c17481fed1262a5e4fd3c429df3058b504eb2cfc36ce4ad2fc SHA512 969cfdfb82f40957d1fa923a4640596cd08529eb9159527365094a3ab0d3e5ad6ff023eea34ad3b1328102f5d03ec8bf7da0958c77dfaee058f5e361a3dc395a WHIRLPOOL bf6960fe18c5181253d428ae678ed3f2e8203cbfcf0d7105d19ac5c6ce1d3c7acdf131062cfca255839c95bfa8f692f6463c9b7d41ad62d80c7a738b758bad71 |
26 |
DIST salt-2015.5.9.tar.gz 5689839 SHA256 71e1c31ebe73edf17b43afcee7de689bb39cc6e97742cd0e110386106fa3fc5b SHA512 389fa09e2e89bb0631f5a2f1d7ef363f8b3a260d466cd7b5fdf7bfc296f5fb64fa355dc56a401df326cefe43e63904061db4fc01a3b5c1cd54fa34ee102a6ad9 WHIRLPOOL 094350e78b96c2633dedb2c4ab0caa959a634e84bf2e92145880eec883ec076765c8b897c873e8f601325a69e7e3fe139163eec45fc6daa109edbd9a884b0dc2 |
27 |
-DIST salt-2015.8.1.tar.gz 6527650 SHA256 04133839b4632859ad696a40261d1d14b62902dbcaf7df2f9e5e926c89401c23 SHA512 d882e3a8e70cf19c64e14c35d4c69fa308b8502d01095ce3f8c383a0ee0b70dbefd4b8eda95205f2cba2fe237279e2a3425daf0d5bf66144fb97ca3be0ec162a WHIRLPOOL a1014b8b2b1f815e2f9981cf3c8696b151a4788afb5525021ad94a6d9da774870290ed94fa159b5e3d8f8c73a682417937a1c48b0431d009a21c1e89a32d61f0 |
28 |
DIST salt-2015.8.3.tar.gz 6757678 SHA256 2e9a262789b018f3443513105c0c6ae98934c9bc105a04cf9e5c073ef706218a SHA512 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121 WHIRLPOOL 5f1e1562904aecf97027688adbe9a2eb1b910065e52a2e20e7bad67fc4e91660e3e1e04612ee3b18d9632f3ff782837336cf1a5d85d771b67071422a3cea9861 |
29 |
-DIST salt-vim-20141109.tar.gz 3783 SHA256 4989d111ad618ea3f5f7a7046a0ff6ce3ca6bc7f71fca90849f7c38947ab6d9a SHA512 d8d62ee827012e29586cf492f2881ee5870ed058828102f985e8b27300c115e01bb126f89decb15a19a8e206dc54c89856d4c31b3ff5320a36385cb5ed517a63 WHIRLPOOL 98026b2cdcb64665790475e3b20a7de294e5cefb390b414294756cad440bc040d9044ffd37a13f3c93af9be1a1bfd444710ff0df24895db624f49fddd16b5545 |
30 |
|
31 |
diff --git a/app-admin/salt/salt-2015.5.6.ebuild b/app-admin/salt/salt-2015.5.6.ebuild |
32 |
deleted file mode 100644 |
33 |
index 875bbaa..0000000 |
34 |
--- a/app-admin/salt/salt-2015.5.6.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,119 +0,0 @@ |
37 |
-# Copyright 1999-2015 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Id$ |
40 |
- |
41 |
-EAPI=5 |
42 |
-PYTHON_COMPAT=(python2_7) |
43 |
- |
44 |
-inherit eutils systemd vim-plugin distutils-r1 |
45 |
- |
46 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
47 |
-HOMEPAGE="http://saltstack.org/" |
48 |
-SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05" |
49 |
- |
50 |
-if [[ ${PV} == 9999* ]]; then |
51 |
- inherit git-r3 |
52 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
53 |
- EGIT_BRANCH="develop" |
54 |
- SRC_URI="" |
55 |
- KEYWORDS="" |
56 |
-else |
57 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
58 |
- KEYWORDS="~x86 ~amd64" |
59 |
-fi |
60 |
- |
61 |
-SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )" |
62 |
- |
63 |
-LICENSE="Apache-2.0" |
64 |
-SLOT="0" |
65 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
66 |
-IUSE+=" openssl redis selinux test timelib raet +zeromq vim-syntax" |
67 |
- |
68 |
-RDEPEND="sys-apps/pciutils |
69 |
- dev-python/jinja[${PYTHON_USEDEP}] |
70 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
71 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
72 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
73 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
74 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
75 |
- >=www-servers/tornado-4.0[${PYTHON_USEDEP}] |
76 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
77 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
78 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
79 |
- openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
80 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
81 |
- raet? ( |
82 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
83 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
84 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
85 |
- ) |
86 |
- zeromq? ( |
87 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
88 |
- >=dev-python/m2crypto-0.22.3[${PYTHON_USEDEP}] |
89 |
- dev-python/pycrypto[${PYTHON_USEDEP}] |
90 |
- ) |
91 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
92 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
93 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
94 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
95 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
96 |
- selinux? ( sec-policy/selinux-salt ) |
97 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
98 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
99 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
100 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )" |
101 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
102 |
- test? ( |
103 |
- dev-python/pip[${PYTHON_USEDEP}] |
104 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
105 |
- dev-python/mock[${PYTHON_USEDEP}] |
106 |
- dev-python/timelib[${PYTHON_USEDEP}] |
107 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
108 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
109 |
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
110 |
- ${RDEPEND} |
111 |
- )" |
112 |
- |
113 |
-DOCS=(README.rst AUTHORS) |
114 |
- |
115 |
-REQUIRED_USE="|| ( raet zeromq )" |
116 |
- |
117 |
-PATCHES=( |
118 |
- "${FILESDIR}/${PN}-2014.7.1-remove-pydsl-includes-test.patch" |
119 |
- "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" |
120 |
- "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" |
121 |
- "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" |
122 |
-) |
123 |
- |
124 |
-python_prepare() { |
125 |
- # this test fails because it trys to "pip install distribute" |
126 |
- rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py \ |
127 |
- || die "Failed to remove broken tests" |
128 |
-} |
129 |
- |
130 |
-python_install_all() { |
131 |
- local svc |
132 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
133 |
- |
134 |
- for svc in minion master syndic api; do |
135 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
136 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
137 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
138 |
- done |
139 |
- |
140 |
- insinto /etc/${PN} |
141 |
- doins -r conf/* |
142 |
- |
143 |
- use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \ |
144 |
- vim-plugin_src_install |
145 |
-} |
146 |
- |
147 |
-python_test() { |
148 |
- # testsuite likes lots of files |
149 |
- ulimit -n 3072 |
150 |
- |
151 |
- # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX |
152 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \ |
153 |
- ${EPYTHON} tests/runtests.py \ |
154 |
- --unit-tests --no-report --verbose || die "testing failed" |
155 |
-} |
156 |
|
157 |
diff --git a/app-admin/salt/salt-2015.8.1.ebuild b/app-admin/salt/salt-2015.8.1.ebuild |
158 |
deleted file mode 100644 |
159 |
index aaf7c84..0000000 |
160 |
--- a/app-admin/salt/salt-2015.8.1.ebuild |
161 |
+++ /dev/null |
162 |
@@ -1,121 +0,0 @@ |
163 |
-# Copyright 1999-2015 Gentoo Foundation |
164 |
-# Distributed under the terms of the GNU General Public License v2 |
165 |
-# $Id$ |
166 |
- |
167 |
-EAPI=5 |
168 |
-PYTHON_COMPAT=(python2_7) |
169 |
- |
170 |
-inherit eutils systemd vim-plugin distutils-r1 |
171 |
- |
172 |
-DESCRIPTION="Salt is a remote execution and configuration manager" |
173 |
-HOMEPAGE="http://saltstack.org/" |
174 |
-SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05" |
175 |
- |
176 |
-if [[ ${PV} == 9999* ]]; then |
177 |
- inherit git-r3 |
178 |
- EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" |
179 |
- EGIT_BRANCH="develop" |
180 |
- SRC_URI="" |
181 |
- KEYWORDS="" |
182 |
-else |
183 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
184 |
- KEYWORDS="~x86 ~amd64" |
185 |
-fi |
186 |
- |
187 |
-SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )" |
188 |
- |
189 |
-LICENSE="Apache-2.0" |
190 |
-SLOT="0" |
191 |
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" |
192 |
-IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax" |
193 |
- |
194 |
-RDEPEND="sys-apps/pciutils |
195 |
- dev-python/jinja[${PYTHON_USEDEP}] |
196 |
- >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] |
197 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
198 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
199 |
- >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] |
200 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
201 |
- >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] |
202 |
- virtual/python-futures[${PYTHON_USEDEP}] |
203 |
- libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) |
204 |
- mako? ( dev-python/mako[${PYTHON_USEDEP}] ) |
205 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
206 |
- openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] ) |
207 |
- libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) |
208 |
- raet? ( |
209 |
- >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] |
210 |
- >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] |
211 |
- >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] |
212 |
- ) |
213 |
- zeromq? ( |
214 |
- >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] |
215 |
- >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
216 |
- ) |
217 |
- cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) |
218 |
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) |
219 |
- keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) |
220 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
221 |
- redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) |
222 |
- selinux? ( sec-policy/selinux-salt ) |
223 |
- timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) |
224 |
- nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) |
225 |
- neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) |
226 |
- gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) |
227 |
- profile? ( dev-python/yappi[${PYTHON_USEDEP}] )" |
228 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
229 |
- test? ( |
230 |
- dev-python/pip[${PYTHON_USEDEP}] |
231 |
- dev-python/virtualenv[${PYTHON_USEDEP}] |
232 |
- dev-python/mock[${PYTHON_USEDEP}] |
233 |
- dev-python/timelib[${PYTHON_USEDEP}] |
234 |
- >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] |
235 |
- >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] |
236 |
- >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] |
237 |
- ${RDEPEND} |
238 |
- )" |
239 |
- |
240 |
-DOCS=(README.rst AUTHORS) |
241 |
- |
242 |
-REQUIRED_USE="|| ( raet zeromq )" |
243 |
- |
244 |
-PATCHES=( |
245 |
- "${FILESDIR}/${PN}-2015.8.0-remove-pydsl-includes-test.patch" |
246 |
- "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch" |
247 |
- "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" |
248 |
- "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" |
249 |
- "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" |
250 |
-) |
251 |
- |
252 |
-python_prepare() { |
253 |
- # this test fails because it trys to "pip install distribute" |
254 |
- rm tests/unit/{modules,states}/zcbuildout_test.py \ |
255 |
- tests/unit/modules/{rh_ip,win_network,random_org}_test.py |
256 |
-} |
257 |
- |
258 |
-python_install_all() { |
259 |
- local svc |
260 |
- USE_SETUPTOOLS=1 distutils-r1_python_install_all |
261 |
- |
262 |
- for svc in minion master syndic api; do |
263 |
- newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} |
264 |
- newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} |
265 |
- systemd_dounit "${FILESDIR}"/salt-${svc}.service |
266 |
- done |
267 |
- |
268 |
- insinto /etc/${PN} |
269 |
- doins -r conf/* |
270 |
- |
271 |
- use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \ |
272 |
- vim-plugin_src_install |
273 |
-} |
274 |
- |
275 |
-python_test() { |
276 |
- # testsuite likes lots of files |
277 |
- ulimit -n 3072 |
278 |
- |
279 |
- # using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX |
280 |
- USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \ |
281 |
- ${EPYTHON} tests/runtests.py \ |
282 |
- --unit-tests --no-report --verbose || die "testing failed" |
283 |
-} |