Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/glance/
Date: Fri, 30 Oct 2015 14:13:48
Message-Id: 1446213829.5d224a2a4da6350819edf1a57938b9406d1cd2bb.prometheanfire@gentoo
1 commit: 5d224a2a4da6350819edf1a57938b9406d1cd2bb
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 30 14:00:47 2015 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 30 14:03:49 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d224a2a
7
8 Revert "app-admin/glance: Clean vulnerable version"
9
10 This reverts commit 1d56fda8ae8dbf384176751bb5f0530cc7b48aee.
11
12 app-admin/glance/Manifest | 1 +
13 app-admin/glance/glance-11.0.0.ebuild | 214 ++++++++++++++++++++++++++++++++++
14 2 files changed, 215 insertions(+)
15
16 diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
17 index f208b7e..e9b277f 100644
18 --- a/app-admin/glance/Manifest
19 +++ b/app-admin/glance/Manifest
20 @@ -1,2 +1,3 @@
21 +DIST glance-11.0.0.tar.gz 1565001 SHA256 35abd3af08b97a56556fdd1a68c61fcfa99ead6354f746f8f7cdc4517e90084e SHA512 33ceab2c7f52f5ce92b2bb33732697a85e4bdf552ca9d08bb7b21430ef942b545614de9b834bdd455b0544474217675731b77cded7218c56ef44274c29a97f47 WHIRLPOOL a256b0525f8a42e588a1d7cce4a6add919b9bd31752560dc7664814178fb4b3c952bfd7ec5d0d40932dc39c380c866561f9cb5ed1383482d4320f5417179c028
22 DIST glance-2015.1.1.tar.gz 1102359 SHA256 5c5714264c4ad9c3d178b983899b54f69f138505ddd77e13141dc5f3d1598ebe SHA512 d9233b78174ec0f84b317abf7d26153a7e3ead25b4ebc31acbe5d0806b6877da5875de52ee0742dcbdd5fd3d23cb0240208f6fd57fa59cc403ad228ac85f2a0f WHIRLPOOL 69a4cd27b4ac57a47523ceb4b899bbbb3569e7af2bb8f3e64373d98b7c72450bd587c6da96d33903dcbf44e02f89ea563d116d9d2dc90d4a0f472eca89963a87
23 DIST glance-2015.1.2.tar.gz 1108933 SHA256 e46bc6648a74a643cef3825dcd44c7e275ed3385b96cab83ef50c4c514932541 SHA512 0f8b8dbc3c507a47ad0873f35ec2212903d7e419b61c0298f77661f89a9718e3604786d52976860c78841fe0a94ad8fc1fe99514183d2b29ed414efe448e590a WHIRLPOOL df8ba6586b2f71c5d7ecb252b80e6c6de6f08df1029576fc8b2fb2a68633f5ce76de1334949af955e85c39e9f1df25b2f8763837ef8efa228b29559dc34be863
24
25 diff --git a/app-admin/glance/glance-11.0.0.ebuild b/app-admin/glance/glance-11.0.0.ebuild
26 new file mode 100644
27 index 0000000..260b5b0
28 --- /dev/null
29 +++ b/app-admin/glance/glance-11.0.0.ebuild
30 @@ -0,0 +1,214 @@
31 +# Copyright 1999-2015 Gentoo Foundation
32 +# Distributed under the terms of the GNU General Public License v2
33 +# $Id$
34 +
35 +EAPI=5
36 +PYTHON_COMPAT=( python2_7 python3_4 )
37 +
38 +inherit distutils-r1 user
39 +
40 +DESCRIPTION="Provides services for discovering, registering, and retrieving
41 +virtual machine images"
42 +HOMEPAGE="https://launchpad.net/glance"
43 +SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
44 +
45 +LICENSE="Apache-2.0"
46 +SLOT="0"
47 +KEYWORDS="~amd64 ~x86"
48 +IUSE="doc mysql postgres +sqlite +swift test"
49 +REQUIRED_USE="|| ( mysql postgres sqlite )"
50 +
51 +CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
52 +DEPEND="
53 + dev-python/setuptools[${PYTHON_USEDEP}]
54 + ${CDEPEND}
55 + test? (
56 + ${RDEPEND}
57 + >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
58 + <=dev-python/Babel-2.0[${PYTHON_USEDEP}]
59 + >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
60 + <=dev-python/coverage-4.0[${PYTHON_USEDEP}]
61 + >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
62 + <=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
63 + >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
64 + <=dev-python/mox3-0.10.0[${PYTHON_USEDEP}]
65 + >=dev-python/mock-1.2[${PYTHON_USEDEP}]
66 + <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
67 + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
68 + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
69 + <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
70 + >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
71 + <=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
72 + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
73 + <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
74 + >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
75 + <=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
76 + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
77 + <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
78 + >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
79 + <=dev-python/testtools-1.8.0[${PYTHON_USEDEP}]
80 + >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
81 + <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
82 + >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
83 + <=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}]
84 + >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
85 + <=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
86 + >=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
87 + <=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
88 + >=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
89 + <=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
90 + <=dev-python/qpid-python-0.26[$(python_gen_usedep 'python2_7')]
91 + >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
92 + >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
93 + <=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
94 + )"
95 +
96 +#note to self, wsgiref is a python builtin, no need to package it
97 +#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
98 +
99 +RDEPEND="
100 + ${CDEPEND}
101 + sqlite? (
102 + >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
103 + <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
104 + )
105 + mysql? (
106 + dev-python/mysql-python
107 + >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
108 + <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
109 + )
110 + postgres? (
111 + dev-python/psycopg:2[${PYTHON_USEDEP}]
112 + >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
113 + <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
114 + )
115 + ~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
116 + >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
117 + <=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
118 + >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
119 + <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
120 + >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
121 + !~dev-python/routes-2.0[${PYTHON_USEDEP}]
122 + !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
123 + <=dev-python/routes-2.2[${PYTHON_USEDEP}]
124 + >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
125 + <=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
126 + >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
127 + <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
128 + >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
129 + <=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
130 + >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
131 + <=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
132 + >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
133 + <=dev-python/iso8601-0.1.10[${PYTHON_USEDEP}]
134 + >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
135 + <=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
136 + >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
137 + <=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}]
138 + >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
139 + <=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}]
140 + >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
141 + <=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}]
142 + >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
143 + <=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}]
144 + >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
145 + <=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}]
146 + >=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
147 + <=dev-python/futurist-0.5.0[${PYTHON_USEDEP}]
148 + >=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
149 + <=dev-python/taskflow-1.21.0[${PYTHON_USEDEP}]
150 + >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
151 + <=dev-python/keystonemiddleware-2.3.1[${PYTHON_USEDEP}]
152 + >=dev-python/WSME-0.7[${PYTHON_USEDEP}]
153 + <=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
154 + <=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
155 + >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
156 + !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
157 + <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
158 + >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
159 + <=dev-python/python-keystoneclient-1.7.2-r9999[${PYTHON_USEDEP}]
160 + >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
161 + <=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
162 + ~dev-python/six-1.9.0[${PYTHON_USEDEP}]
163 + >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
164 + <=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
165 + >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
166 + <=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
167 + >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
168 + <=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}]
169 + >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
170 + !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
171 + !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
172 + <=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}]
173 + >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
174 + <=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
175 + >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
176 + <=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}]
177 + >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
178 + <=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}]
179 + >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
180 + !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
181 + <=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
182 + ~dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
183 + >=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
184 + !~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
185 + <=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
186 + >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
187 + <=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
188 + >=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
189 + <=dev-python/castellan-0.2.1[${PYTHON_USEDEP}]
190 + >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
191 + <=dev-python/cryptography-1.0.1-r9999[${PYTHON_USEDEP}]
192 +"
193 +
194 +PATCHES=(
195 +)
196 +
197 +pkg_setup() {
198 + enewgroup glance
199 + enewuser glance -1 -1 /var/lib/glance glance
200 +}
201 +
202 +python_prepare_all() {
203 + sed -i '/xattr/d' test-requirements.txt || die
204 + sed -i '/pysendfile/d' test-requirements.txt || die
205 + sed -i '/^hacking/d' test-requirements.txt || die
206 + distutils-r1_python_prepare_all
207 +}
208 +
209 +python_compile_all() {
210 + use doc && "${PYTHON}" setup.py build_sphinx
211 +}
212 +
213 +python_test() {
214 + # https://bugs.launchpad.net/glance/+bug/1251105
215 + # https://bugs.launchpad.net/glance/+bug/1242501
216 + testr init
217 + testr run --parallel || die "failed testsuite under python2.7"
218 +}
219 +
220 +python_install() {
221 + distutils-r1_python_install
222 +
223 + for svc in api registry scrubber; do
224 + newinitd "${FILESDIR}/glance.initd" glance-${svc}
225 + done
226 +
227 + diropts -m 0750 -o glance -g glance
228 + dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
229 + keepdir /etc/glance
230 + keepdir /var/log/glance
231 + keepdir /var/lib/glance/images
232 + keepdir /var/lib/glance/scrubber
233 +
234 + insinto /etc/glance
235 + insopts -m 0640 -o glance -g glance
236 + doins etc/*.ini
237 + doins etc/*.conf
238 + doins etc/*.sample
239 +}
240 +
241 +python_install_all() {
242 + use doc && local HTML_DOCS=( doc/build/html/. )
243 + distutils-r1_python_install_all
244 +}
Report Message
Find on MARC Find on Google Groups