Gentoo Archives: gentoo-commits

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