prometheanfire 14/03/16 19:27:14 Modified: glance-2013.2.9999.ebuild ChangeLog Added: glance-2013.2.2-r1.ebuild Log: fixes for bug 504266 (and fixed the creation of /var/run/glance on install (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Revision Changes Path 1.7 app-admin/glance/glance-2013.2.9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild?r1=1.6&r2=1.7 Index: glance-2013.2.9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- glance-2013.2.9999.ebuild 8 Jan 2014 06:44:09 -0000 1.6 +++ glance-2013.2.9999.ebuild 16 Mar 2014 19:27:13 -0000 1.7 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild,v 1.6 2014/01/08 06:44:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild,v 1.7 2014/03/16 19:27:13 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -106,21 +106,20 @@ python_install() { distutils-r1_python_install - newconfd "${FILESDIR}/glance.confd" glance - newinitd "${FILESDIR}/glance.initd" glance - for function in api registry scrubber; do - dosym /etc/init.d/glance /etc/init.d/glance-${function} + for svc in api registry scrubber; do + newinitd "${FILESDIR}/glance.initd" glance-${svc} done - diropts -m 0750 - dodir /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber + diropts -m 0750 -o glance -g glance + dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber keepdir /etc/glance keepdir /var/log/glance keepdir /var/lib/glance/images keepdir /var/lib/glance/scrubber - insinto /etc/glance + insinto /etc/glance + insopts -m 0640 -o glance -g glance doins "etc/glance-api-paste.ini" doins "etc/glance-api.conf" doins "etc/glance-cache.conf" @@ -130,8 +129,6 @@ doins "etc/logging.cnf.sample" doins "etc/policy.json" doins "etc/schema-image.json" - - fowners glance:glance /var/run/glance /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber /etc/glance } python_install_all() { 1.33 app-admin/glance/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?rev=1.33&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?rev=1.33&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/ChangeLog?r1=1.32&r2=1.33 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- ChangeLog 24 Feb 2014 05:17:33 -0000 1.32 +++ ChangeLog 16 Mar 2014 19:27:13 -0000 1.33 @@ -1,6 +1,12 @@ # ChangeLog for app-admin/glance # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.32 2014/02/24 05:17:33 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.33 2014/03/16 19:27:13 prometheanfire Exp $ + +*glance-2013.2.2-r1 (16 Mar 2014) + + 16 Mar 2014; Matthew Thode <prometheanf...@gentoo.org> + +glance-2013.2.2-r1.ebuild, files/glance.initd, glance-2013.2.9999.ebuild: + fixes for bug 504266 (and fixed the creation of /var/run/glance on install 24 Feb 2014; Ian Delaney <idel...@gentoo.org> -files/havana-1-CVE-2014-1948.patch, -glance-2013.2.1-r1.ebuild: 1.1 app-admin/glance/glance-2013.2.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2013.2.2-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/glance/glance-2013.2.2-r1.ebuild?rev=1.1&content-type=text/plain Index: glance-2013.2.2-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.2-r1.ebuild,v 1.1 2014/03/16 19:27:13 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 user DESCRIPTION="Provides services for discovering, registering, and retrieving virtual machine images with Openstack" HOMEPAGE="https://launchpad.net/glance"; SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"; LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc mysql postgres +sqlite +swift test" REQUIRED_USE="|| ( mysql postgres sqlite )" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pbr[${PYTHON_USEDEP}] test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}] >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-python/nose-exclude[${PYTHON_USEDEP}] >=dev-python/openstack-nose-plugin-0.7[${PYTHON_USEDEP}] >=dev-python/mock-1.0[${PYTHON_USEDEP}] >=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}] >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] >=dev-python/requests-1.1[${PYTHON_USEDEP}] >=dev-python/testtools-0.9.32[${PYTHON_USEDEP}] >=dev-python/psutil-0.6.1[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] dev-python/psycopg[${PYTHON_USEDEP}] >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}] ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}] >=dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}] <dev-python/pyflakes-0.7.4[${PYTHON_USEDEP}] ~dev-python/flake8-2.0[${PYTHON_USEDEP}] >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}] <dev-python/hacking-0.8[${PYTHON_USEDEP}] >=dev-python/Babel-1.3[${PYTHON_USEDEP}] =dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}] dev-python/qpid-python[${PYTHON_USEDEP}] dev-python/oslo-sphinx >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] <dev-python/sphinx-1.2[${PYTHON_USEDEP}] )" #note to self, wsgiref is a python builtin, no need to package it #>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}] RDEPEND=">=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] >=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}] sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}] <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] ) mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}] <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] ) postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}] <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] ) >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] <dev-python/webob-1.3[${PYTHON_USEDEP}] virtual/python-argparse[${PYTHON_USEDEP}] >=dev-python/boto-2.4.0[${PYTHON_USEDEP}] !~dev-python/boto-2.13.0[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}] dev-python/httplib2[${PYTHON_USEDEP}] >=dev-python/kombu-2.4.8[${PYTHON_USEDEP}] >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] >=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}] >=dev-python/oslo-config-1.2.1[${PYTHON_USEDEP}] swift? ( >=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}] <dev-python/python-swiftclient-2[${PYTHON_USEDEP}] ) >=dev-python/lxml-2.3[${PYTHON_USEDEP}] dev-python/paste[${PYTHON_USEDEP}] dev-python/passlib[${PYTHON_USEDEP}] >=dev-python/jsonschema-1.3.0[${PYTHON_USEDEP}] !~dev-python/jsonschema-1.4.0[${PYTHON_USEDEP}] >=dev-python/python-cinderclient-1.0.6[${PYTHON_USEDEP}] >=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] >=dev-python/six-1.4.1[${PYTHON_USEDEP}]" PATCHES=( "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch" ) pkg_setup() { enewgroup glance enewuser glance -1 -1 /var/lib/glance glance } python_compile_all() { use doc && "${PYTHON}" setup.py build_sphinx } python_test() { # https://bugs.launchpad.net/glance/+bug/1251105 # https://bugs.launchpad.net/glance/+bug/1242501 # 2013.2 requires =dev-python/iso8601-0.1.4 nosetests glance/ || die "tests failed under python2.7" } python_install() { distutils-r1_python_install for svc in api registry scrubber; do newinitd "${FILESDIR}/glance.initd" glance-${svc} done diropts -m 0750 -o glance -g glance dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber keepdir /etc/glance keepdir /var/log/glance keepdir /var/lib/glance/images keepdir /var/lib/glance/scrubber insinto /etc/glance insopts -m 0640 -o glance -g glance doins "etc/glance-api-paste.ini" doins "etc/glance-api.conf" doins "etc/glance-cache.conf" doins "etc/glance-registry-paste.ini" doins "etc/glance-registry.conf" doins "etc/glance-scrubber.conf" doins "etc/logging.cnf.sample" doins "etc/policy.json" doins "etc/schema-image.json" } python_install_all() { use doc && local HTML_DOCS=( doc/build/html/. ) distutils-r1_python_install_all }
