Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/glance: glance-2014.2.2.ebuild glance-2014.2.9999.ebuild ChangeLog glance-9999.ebuild
Date: Sun, 08 Feb 2015 01:52:01
Message-Id: 20150208015157.058941149F@oystercatcher.gentoo.org
1 prometheanfire 15/02/08 01:51:57
2
3 Modified: glance-2014.2.9999.ebuild ChangeLog
4 Added: glance-2014.2.2.ebuild
5 Removed: glance-9999.ebuild
6 Log:
7 bumping :D
8
9 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
10
11 Revision Changes Path
12 1.6 app-admin/glance/glance-2014.2.9999.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild?rev=1.6&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild?rev=1.6&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild?r1=1.5&r2=1.6
17
18 Index: glance-2014.2.9999.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v
21 retrieving revision 1.5
22 retrieving revision 1.6
23 diff -u -r1.5 -r1.6
24 --- glance-2014.2.9999.ebuild 9 Dec 2014 01:20:13 -0000 1.5
25 +++ glance-2014.2.9999.ebuild 8 Feb 2015 01:51:56 -0000 1.6
26 @@ -1,6 +1,6 @@
27 -# Copyright 1999-2014 Gentoo Foundation
28 +# Copyright 1999-2015 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v 1.5 2014/12/09 01:20:13 prometheanfire Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v 1.6 2015/02/08 01:51:56 prometheanfire Exp $
32
33 EAPI=5
34 PYTHON_COMPAT=( python2_7 )
35 @@ -22,28 +22,31 @@
36 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
37 >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
38 <dev-python/pbr-1.0[${PYTHON_USEDEP}]
39 - test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
40 - <dev-python/hacking-0.9[${PYTHON_USEDEP}]
41 - >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
42 - >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
43 - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
44 - >=dev-python/mock-1.0[${PYTHON_USEDEP}]
45 - >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
46 - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
47 - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
48 - <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
49 - >=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
50 - !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
51 - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
52 - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
53 - >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
54 - <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
55 - dev-python/mysql-python[${PYTHON_USEDEP}]
56 - dev-python/psycopg[${PYTHON_USEDEP}]
57 - ~dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
58 - dev-python/qpid-python[${PYTHON_USEDEP}]
59 - >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
60 - >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] )"
61 + test? (
62 + ${RDEPEND}
63 + >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
64 + <dev-python/hacking-0.9[${PYTHON_USEDEP}]
65 + >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
66 + >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
67 + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
68 + >=dev-python/mock-1.0[${PYTHON_USEDEP}]
69 + >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
70 + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
71 + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
72 + <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
73 + >=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
74 + !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
75 + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
76 + >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
77 + >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
78 + <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
79 + dev-python/mysql-python[${PYTHON_USEDEP}]
80 + dev-python/psycopg[${PYTHON_USEDEP}]
81 + ~dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
82 + dev-python/qpid-python[${PYTHON_USEDEP}]
83 + >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
84 + >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
85 + )"
86
87 #note to self, wsgiref is a python builtin, no need to package it
88 #>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
89 @@ -51,52 +54,29 @@
90 RDEPEND="
91 >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
92 sqlite? (
93 - || (
94 - (
95 - >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
96 - <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
97 - )
98 - (
99 - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
100 - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
101 - )
102 - )
103 + >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
104 + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
105 )
106 mysql? (
107 dev-python/mysql-python
108 - || (
109 - (
110 - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
111 - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
112 - )
113 - (
114 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
115 - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
116 - )
117 - )
118 + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
119 + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
120 )
121 postgres? (
122 dev-python/psycopg:2
123 - || (
124 - (
125 - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
126 - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
127 - )
128 - (
129 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
130 - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
131 - )
132 - )
133 + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
134 + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
135 )
136 >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
137 >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
138 + <dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
139 >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
140 >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
141 !~dev-python/routes-2.0[${PYTHON_USEDEP}]
142 >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
143 >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
144 - >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
145 - !~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
146 + >=dev-python/boto-2.35.0[${PYTHON_USEDEP}]
147 + ~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
148 >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
149 >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
150 >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
151 @@ -112,6 +92,7 @@
152 >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
153 )
154 >=dev-python/oslo-vmware-0.6.0[${PYTHON_USEDEP}]
155 + <dev-python/oslo-vmware-0.9.0[${PYTHON_USEDEP}]
156 dev-python/paste[${PYTHON_USEDEP}]
157 >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
158 <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
159 @@ -120,15 +101,19 @@
160 >=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
161 >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
162 >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
163 + <dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
164 >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
165 >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
166 !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
167 + <dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
168 >=dev-python/retrying-1.2.2[${PYTHON_USEDEP}]
169 !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
170 >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
171 >=dev-python/glance_store-0.1.1[${PYTHON_USEDEP}]"
172
173 -PATCHES=( "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch" )
174 +PATCHES=(
175 + "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch"
176 +)
177
178 pkg_setup() {
179 enewgroup glance
180
181
182
183 1.59 app-admin/glance/ChangeLog
184
185 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?rev=1.59&view=markup
186 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?rev=1.59&content-type=text/plain
187 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?r1=1.58&r2=1.59
188
189 Index: ChangeLog
190 ===================================================================
191 RCS file: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v
192 retrieving revision 1.58
193 retrieving revision 1.59
194 diff -u -r1.58 -r1.59
195 --- ChangeLog 29 Jan 2015 05:39:38 -0000 1.58
196 +++ ChangeLog 8 Feb 2015 01:51:56 -0000 1.59
197 @@ -1,6 +1,16 @@
198 # ChangeLog for app-admin/glance
199 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
200 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.58 2015/01/29 05:39:38 prometheanfire Exp $
201 +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.59 2015/02/08 01:51:56 prometheanfire Exp $
202 +
203 +*glance-2014.2.2 (08 Feb 2015)
204 +
205 + 08 Feb 2015; Matthew Thode <prometheanfire@g.o>
206 + +glance-2014.2.2.ebuild,
207 + -files/0001-Prevent-file-swift-config-and-filesystem-schemes.patch,
208 + -files/0001-To-prevent-client-use-v2-patch-api-to-handle-file-an.patch,
209 + -files/glance-CVE-2014-9623.patch, -glance-9999.ebuild,
210 + glance-2014.2.9999.ebuild:
211 + bumping :D
212
213 *glance-2014.2.1-r2 (29 Jan 2015)
214
215
216
217
218 1.1 app-admin/glance/glance-2014.2.2.ebuild
219
220 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2014.2.2.ebuild?rev=1.1&view=markup
221 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2014.2.2.ebuild?rev=1.1&content-type=text/plain
222
223 Index: glance-2014.2.2.ebuild
224 ===================================================================
225 # Copyright 1999-2015 Gentoo Foundation
226 # Distributed under the terms of the GNU General Public License v2
227 # $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.2.ebuild,v 1.1 2015/02/08 01:51:56 prometheanfire Exp $
228
229 EAPI=5
230 PYTHON_COMPAT=( python2_7 )
231
232 inherit distutils-r1 user
233
234 DESCRIPTION="Provides services for discovering, registering, and retrieving
235 virtual machine images with Openstack"
236 HOMEPAGE="https://launchpad.net/glance"
237 SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz"
238
239 LICENSE="Apache-2.0"
240 SLOT="0"
241 KEYWORDS="~amd64 ~x86"
242 IUSE="doc mysql postgres +sqlite +swift test"
243 REQUIRED_USE="|| ( mysql postgres sqlite )"
244
245 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
246 >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
247 <dev-python/pbr-1.0[${PYTHON_USEDEP}]
248 test? (
249 ${RDEPEND}
250 >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
251 <dev-python/hacking-0.9[${PYTHON_USEDEP}]
252 >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
253 >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
254 >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
255 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
256 >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
257 >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
258 !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
259 <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
260 >=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
261 !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
262 >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
263 >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
264 >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
265 <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
266 dev-python/mysql-python[${PYTHON_USEDEP}]
267 dev-python/psycopg[${PYTHON_USEDEP}]
268 ~dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
269 dev-python/qpid-python[${PYTHON_USEDEP}]
270 >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
271 >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
272 )"
273
274 #note to self, wsgiref is a python builtin, no need to package it
275 #>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
276
277 RDEPEND="
278 >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
279 sqlite? (
280 >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
281 <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
282 )
283 mysql? (
284 dev-python/mysql-python
285 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
286 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
287 )
288 postgres? (
289 dev-python/psycopg:2
290 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
291 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
292 )
293 >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
294 >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
295 <dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
296 >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
297 >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
298 !~dev-python/routes-2.0[${PYTHON_USEDEP}]
299 >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
300 >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
301 >=dev-python/boto-2.35.0[${PYTHON_USEDEP}]
302 ~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
303 >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
304 >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
305 >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
306 >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
307 dev-python/ordereddict[${PYTHON_USEDEP}]
308 >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
309 >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
310 >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
311 >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
312 >=dev-python/WSME-0.6[${PYTHON_USEDEP}]
313 dev-python/posix_ipc[${PYTHON_USEDEP}]
314 swift? (
315 >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
316 )
317 >=dev-python/oslo-vmware-0.6.0[${PYTHON_USEDEP}]
318 <dev-python/oslo-vmware-0.9.0[${PYTHON_USEDEP}]
319 dev-python/paste[${PYTHON_USEDEP}]
320 >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
321 <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
322 >=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
323 >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
324 >=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
325 >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
326 >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
327 <dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
328 >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
329 >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
330 !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
331 <dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
332 >=dev-python/retrying-1.2.2[${PYTHON_USEDEP}]
333 !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
334 >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
335 >=dev-python/glance_store-0.1.1[${PYTHON_USEDEP}]"
336
337 PATCHES=(
338 "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch"
339 )
340
341 pkg_setup() {
342 enewgroup glance
343 enewuser glance -1 -1 /var/lib/glance glance
344 }
345
346 python_compile_all() {
347 use doc && "${PYTHON}" setup.py build_sphinx
348 }
349
350 python_test() {
351 # https://bugs.launchpad.net/glance/+bug/1251105
352 # https://bugs.launchpad.net/glance/+bug/1242501
353 nosetests glance/ || die "tests failed under python2.7"
354 }
355
356 python_install() {
357 distutils-r1_python_install
358
359 for svc in api registry scrubber; do
360 newinitd "${FILESDIR}/glance.initd" glance-${svc}
361 done
362
363 diropts -m 0750 -o glance -g glance
364 dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
365 keepdir /etc/glance
366 keepdir /var/log/glance
367 keepdir /var/lib/glance/images
368 keepdir /var/lib/glance/scrubber
369
370 insinto /etc/glance
371 insopts -m 0640 -o glance -g glance
372 doins "etc/glance-api-paste.ini"
373 doins "etc/glance-api.conf"
374 doins "etc/glance-cache.conf"
375 doins "etc/glance-registry-paste.ini"
376 doins "etc/glance-registry.conf"
377 doins "etc/glance-scrubber.conf"
378 doins "etc/logging.cnf.sample"
379 doins "etc/policy.json"
380 doins "etc/schema-image.json"
381 }
382
383 python_install_all() {
384 use doc && local HTML_DOCS=( doc/build/html/. )
385 distutils-r1_python_install_all
386 }