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.1-r2.ebuild ChangeLog glance-2014.2.1-r1.ebuild
Date: Thu, 29 Jan 2015 05:39:44
Message-Id: 20150129053938.445F9108B2@oystercatcher.gentoo.org
1 prometheanfire 15/01/29 05:39:38
2
3 Modified: ChangeLog
4 Added: glance-2014.2.1-r2.ebuild
5 Removed: glance-2014.2.1-r1.ebuild
6 Log:
7 bumping glance for CVE-2014-9623
8
9 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
10
11 Revision Changes Path
12 1.58 app-admin/glance/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?rev=1.58&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?rev=1.58&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?r1=1.57&r2=1.58
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v
21 retrieving revision 1.57
22 retrieving revision 1.58
23 diff -u -r1.57 -r1.58
24 --- ChangeLog 14 Jan 2015 02:46:07 -0000 1.57
25 +++ ChangeLog 29 Jan 2015 05:39:38 -0000 1.58
26 @@ -1,6 +1,13 @@
27 # ChangeLog for app-admin/glance
28 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.57 2015/01/14 02:46:07 prometheanfire Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.58 2015/01/29 05:39:38 prometheanfire Exp $
31 +
32 +*glance-2014.2.1-r2 (29 Jan 2015)
33 +
34 + 29 Jan 2015; Matthew Thode <prometheanfire@g.o>
35 + +files/glance-CVE-2014-9623.patch, +glance-2014.2.1-r2.ebuild,
36 + -glance-2014.2.1-r1.ebuild:
37 + bumping glance for CVE-2014-9623
38
39 *glance-2014.2.1-r1 (14 Jan 2015)
40
41
42
43
44 1.1 app-admin/glance/glance-2014.2.1-r2.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2014.2.1-r2.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2014.2.1-r2.ebuild?rev=1.1&content-type=text/plain
48
49 Index: glance-2014.2.1-r2.ebuild
50 ===================================================================
51 # Copyright 1999-2015 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.1-r2.ebuild,v 1.1 2015/01/29 05:39:38 prometheanfire Exp $
54
55 EAPI=5
56 PYTHON_COMPAT=( python2_7 )
57
58 inherit distutils-r1 user
59
60 DESCRIPTION="Provides services for discovering, registering, and retrieving
61 virtual machine images with Openstack"
62 HOMEPAGE="https://launchpad.net/glance"
63 SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz"
64
65 LICENSE="Apache-2.0"
66 SLOT="0"
67 KEYWORDS="~amd64 ~x86"
68 IUSE="doc mysql postgres +sqlite +swift test"
69 REQUIRED_USE="|| ( mysql postgres sqlite )"
70
71 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
72 >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
73 <dev-python/pbr-1.0[${PYTHON_USEDEP}]
74 test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
75 <dev-python/hacking-0.9[${PYTHON_USEDEP}]
76 >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
77 >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
78 >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
79 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
80 >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
81 >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
82 !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
83 <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
84 >=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
85 !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
86 >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
87 >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
88 >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
89 <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
90 dev-python/mysql-python[${PYTHON_USEDEP}]
91 dev-python/psycopg[${PYTHON_USEDEP}]
92 ~dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
93 dev-python/qpid-python[${PYTHON_USEDEP}]
94 >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
95 >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] )"
96
97 #note to self, wsgiref is a python builtin, no need to package it
98 #>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
99
100 RDEPEND="
101 >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
102 sqlite? (
103 || (
104 (
105 >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
106 <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
107 )
108 (
109 >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
110 <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
111 )
112 )
113 )
114 mysql? (
115 dev-python/mysql-python
116 || (
117 (
118 >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
119 <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
120 )
121 (
122 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
123 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
124 )
125 )
126 )
127 postgres? (
128 dev-python/psycopg:2
129 || (
130 (
131 >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
132 <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
133 )
134 (
135 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
136 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
137 )
138 )
139 )
140 >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
141 >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
142 >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
143 >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
144 !~dev-python/routes-2.0[${PYTHON_USEDEP}]
145 >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
146 >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
147 >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
148 !~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
149 >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
150 >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
151 >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
152 >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
153 dev-python/ordereddict[${PYTHON_USEDEP}]
154 >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
155 >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
156 >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
157 >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
158 >=dev-python/WSME-0.6[${PYTHON_USEDEP}]
159 dev-python/posix_ipc[${PYTHON_USEDEP}]
160 swift? (
161 >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
162 )
163 >=dev-python/oslo-vmware-0.6.0[${PYTHON_USEDEP}]
164 dev-python/paste[${PYTHON_USEDEP}]
165 >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
166 <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
167 >=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
168 >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
169 >=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
170 >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
171 >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
172 >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
173 >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
174 !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
175 >=dev-python/retrying-1.2.2[${PYTHON_USEDEP}]
176 !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
177 >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
178 >=dev-python/glance_store-0.1.1[${PYTHON_USEDEP}]"
179
180 PATCHES=(
181 "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch"
182 "${FILESDIR}/0001-To-prevent-client-use-v2-patch-api-to-handle-file-an.patch"
183 "${FILESDIR}/0001-Prevent-file-swift-config-and-filesystem-schemes.patch"
184 "${FILESDIR}/glance-CVE-2014-9623.patch"
185 )
186
187 pkg_setup() {
188 enewgroup glance
189 enewuser glance -1 -1 /var/lib/glance glance
190 }
191
192 python_compile_all() {
193 use doc && "${PYTHON}" setup.py build_sphinx
194 }
195
196 python_test() {
197 # https://bugs.launchpad.net/glance/+bug/1251105
198 # https://bugs.launchpad.net/glance/+bug/1242501
199 nosetests glance/ || die "tests failed under python2.7"
200 }
201
202 python_install() {
203 distutils-r1_python_install
204
205 for svc in api registry scrubber; do
206 newinitd "${FILESDIR}/glance.initd" glance-${svc}
207 done
208
209 diropts -m 0750 -o glance -g glance
210 dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
211 keepdir /etc/glance
212 keepdir /var/log/glance
213 keepdir /var/lib/glance/images
214 keepdir /var/lib/glance/scrubber
215
216 insinto /etc/glance
217 insopts -m 0640 -o glance -g glance
218 doins "etc/glance-api-paste.ini"
219 doins "etc/glance-api.conf"
220 doins "etc/glance-cache.conf"
221 doins "etc/glance-registry-paste.ini"
222 doins "etc/glance-registry.conf"
223 doins "etc/glance-scrubber.conf"
224 doins "etc/logging.cnf.sample"
225 doins "etc/policy.json"
226 doins "etc/schema-image.json"
227 }
228
229 python_install_all() {
230 use doc && local HTML_DOCS=( doc/build/html/. )
231 distutils-r1_python_install_all
232 }