commit: 3f361a9d9e4644b8a7b36896daa14919eb916711 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Wed Aug 23 21:02:41 2017 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Wed Aug 23 21:10:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f361a9d
sys-auth/keystone: 10.0.3 and 11.0.3 stable with cleanup Package-Manager: Portage-2.3.6, Repoman-2.3.3 sys-auth/keystone/Manifest | 2 - sys-auth/keystone/keystone-10.0.2.ebuild | 164 ------------------------------- sys-auth/keystone/keystone-10.0.3.ebuild | 2 +- sys-auth/keystone/keystone-11.0.2.ebuild | 158 ----------------------------- sys-auth/keystone/keystone-11.0.3.ebuild | 2 +- 5 files changed, 2 insertions(+), 326 deletions(-) diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest index 64cc9f83a13..2e63bedeb24 100644 --- a/sys-auth/keystone/Manifest +++ b/sys-auth/keystone/Manifest @@ -1,4 +1,2 @@ -DIST keystone-10.0.2.tar.gz 1359183 SHA256 275e3c73033657a98e17cb59370b6d549cf945f41871db5a94b4a464a43d49a7 SHA512 9bb85559cbf28987b8c743bf1fc81e8bce167ae46a8761fdd47582f591ca227a22e2fac49da8b5f906249d7f6b99657dec7abe64f5ffbe0cb95a8c21b02e9d19 WHIRLPOOL c70e54719a881e7b1927083e66fac25de6b8b41da2685ff39947c6a7258d9a77560e40cd68f5c02073313ec8ad7b3c1d6980cf952ce86208d3e39664981b2b17 DIST keystone-10.0.3.tar.gz 1363347 SHA256 db2d29cd4b0e4b7672779ff3355093bbeda61620c58e3e7a4f0424a6f7e67513 SHA512 a6173cdcf0cbedefc2965e8f7b6a5924b45ada2d6ae18715e28071ab9c785fce3b4538acb6361a5e3ea89c5eb7bf01cf87591719d44469049602920254d47db4 WHIRLPOOL 25333195801923a999187dbe85cb2729f077efc71decd6d89556f10a5afbc7435cfac82e4be3ffbaae3b0aea0ba96ebe275918d4ba6a13a5ad0dd98e79b5d9f3 -DIST keystone-11.0.2.tar.gz 1370396 SHA256 cf25068272dba6c6487477e3d620ae449770d73d3e3382d37d2b88cf80fe9ef1 SHA512 d2ec2c6e01df524f5dbec12960ffb54bb2a5400fff61027d6e632b1d775223e5e7ca97962db70acfbcd61e6c13ce9f5e392fc44249836055228ba4547e4ae4e6 WHIRLPOOL 7c9eff71b588632b125ca22824477116e387d4cfbf46b724510806b24a5d1d7694e3566da43ea8f0646a2c7059b8e6eb58343d6df4abec0427a4197f2a64354d DIST keystone-11.0.3.tar.gz 1373880 SHA256 552dcca96d93ef06e28ced0f86cc142e2bb0f8b237297816b670b9b21aba7c85 SHA512 0468a834b1a44b27f4747aeb580f17f68b7dce0ee0cbc3693355d66e9c46383b7ad3a769b3ffa0146fac9b45a75c8a2c95aad0df4825d2be33cadb2cf6b1a659 WHIRLPOOL 1cb4c1de756b57b27142e613381dd7e9e50c10cdff16bb0c2734b67d5b43ca443e7233cd60324231d45dadeab1cc5693aa80d2c23c3fc40680acca13c82b9b3e diff --git a/sys-auth/keystone/keystone-10.0.2.ebuild b/sys-auth/keystone/keystone-10.0.2.ebuild deleted file mode 100644 index 5c34d47bc72..00000000000 --- a/sys-auth/keystone/keystone-10.0.2.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_4 ) - -inherit distutils-r1 user - -DESCRIPTION="The Openstack authentication, authorization, and service catalog" -HOMEPAGE="https://launchpad.net/keystone"; -SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="+sqlite ldap memcached mongo mysql postgres test" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" -RDEPEND=" - ${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}] - >=dev-python/passlib-1.6[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}] - !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}] - !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}] - !~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}] - !~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}] - !~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}] - >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}] - >=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}] - <dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}] - >=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] - !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] - >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}] - !~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - memcached? ( - >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}] - ) - mongo? ( - >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] - !~dev-python/pymongo-3.1[${PYTHON_USEDEP}] - ) - ldap? ( - >=dev-python/pyldap-2.4[${PYTHON_USEDEP}] - >=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}] - ) - || ( - www-servers/uwsgi[python,${PYTHON_USEDEP}] - www-apache/mod_wsgi[${PYTHON_USEDEP}] - www-servers/gunicorn[${PYTHON_USEDEP}] - )" - -PATCHES=( -) - -pkg_setup() { - enewgroup keystone - enewuser keystone -1 -1 /var/lib/keystone keystone -} - -python_prepare_all() { - # it's in git, but not in the tarball..... - sed -i '/^hacking/d' test-requirements.txt || die - mkdir -p ${PN}/tests/tmp/ || die - cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die - sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die - sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die - distutils-r1_python_prepare_all -} - -# Ignore (naughty) test_.py files & 1 test that connect to the network -#-I 'test_keystoneclient*' \ -python_test() { - nosetests -I 'test_keystoneclient*' \ - -e test_static_translated_string_is_Message \ - -e test_get_token_id_error_handling \ - -e test_provider_token_expiration_validation \ - -e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7" -} - -python_install() { - distutils-r1_python_install - - diropts -m 0750 - keepdir /etc/keystone /var/log/keystone - insinto /etc/keystone - insopts -m0640 -okeystone -gkeystone - doins etc/keystone.conf.sample etc/logging.conf.sample - doins etc/default_catalog.templates etc/policy.json - doins etc/policy.v3cloudsample.json etc/keystone-paste.ini - insinto /etc/keystone/httpd - doins httpd/* - - fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone -} - -pkg_postinst() { - elog "You might want to run:" - elog "emerge --config =${CATEGORY}/${PF}" - elog "if this is a new install." - elog "If you have not already configured your openssl installation" - elog "please do it by modifying /etc/ssl/openssl.cnf" - elog "BEFORE issuing the configuration command." - elog "Otherwise default values will be used." -} - -pkg_config() { - if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then - einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..." - read - "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone - else - einfo "keystone PKI certificates directory already present, skipping configuration" - fi -} diff --git a/sys-auth/keystone/keystone-10.0.3.ebuild b/sys-auth/keystone/keystone-10.0.3.ebuild index 1809d928283..5c34d47bc72 100644 --- a/sys-auth/keystone/keystone-10.0.3.ebuild +++ b/sys-auth/keystone/keystone-10.0.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"; LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="+sqlite ldap memcached mongo mysql postgres test" REQUIRED_USE="|| ( mysql postgres sqlite )" diff --git a/sys-auth/keystone/keystone-11.0.2.ebuild b/sys-auth/keystone/keystone-11.0.2.ebuild deleted file mode 100644 index 2b715799771..00000000000 --- a/sys-auth/keystone/keystone-11.0.2.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 user - -DESCRIPTION="The Openstack authentication, authorization, and service catalog" -HOMEPAGE="https://launchpad.net/keystone"; -SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="+sqlite ldap memcached mongo mysql postgres test" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" -RDEPEND=" - ${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] - !~dev-python/routes-2.3.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-1.0[${PYTHON_USEDEP}] - !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] - ) - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] - >=dev-python/passlib-1.7.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] - >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}] - >=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}] - <dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}] - >=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] - !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] - >=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}] - !~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - memcached? ( - >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}] - ) - mongo? ( - >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] - !~dev-python/pymongo-3.1[${PYTHON_USEDEP}] - ) - ldap? ( - >=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}] - >=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}] - ) - || ( - www-servers/uwsgi[python,${PYTHON_USEDEP}] - www-apache/mod_wsgi[${PYTHON_USEDEP}] - www-servers/gunicorn[${PYTHON_USEDEP}] - )" - -PATCHES=( -) - -pkg_setup() { - enewgroup keystone - enewuser keystone -1 -1 /var/lib/keystone keystone -} - -python_prepare_all() { - # it's in git, but not in the tarball..... - sed -i '/^hacking/d' test-requirements.txt || die - mkdir -p ${PN}/tests/tmp/ || die - cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die - sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die - sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die - distutils-r1_python_prepare_all -} - -python_test() { - nosetests -I 'test_keystoneclient*' \ - -e test_static_translated_string_is_Message \ - -e test_get_token_id_error_handling \ - -e test_provider_token_expiration_validation \ - -e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7" -} - -python_install_all() { - distutils-r1_python_install_all - - diropts -m 0750 - keepdir /etc/keystone /var/log/keystone - insinto /etc/keystone - insopts -m0640 -okeystone -gkeystone - doins etc/keystone.conf.sample etc/logging.conf.sample - doins etc/default_catalog.templates etc/policy.json - doins etc/policy.v3cloudsample.json etc/keystone-paste.ini - insinto /etc/keystone/httpd - doins httpd/* - - fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone -} - -pkg_postinst() { - elog "You might want to run:" - elog "emerge --config =${CATEGORY}/${PF}" - elog "if this is a new install." - elog "If you have not already configured your openssl installation" - elog "please do it by modifying /etc/ssl/openssl.cnf" - elog "BEFORE issuing the configuration command." - elog "Otherwise default values will be used." -} - -pkg_config() { - if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then - einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..." - read - "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone - else - einfo "keystone PKI certificates directory already present, skipping configuration" - fi -} diff --git a/sys-auth/keystone/keystone-11.0.3.ebuild b/sys-auth/keystone/keystone-11.0.3.ebuild index 79ef8b9835a..2b715799771 100644 --- a/sys-auth/keystone/keystone-11.0.3.ebuild +++ b/sys-auth/keystone/keystone-11.0.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"; LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="+sqlite ldap memcached mongo mysql postgres test" REQUIRED_USE="|| ( mysql postgres sqlite )"
