commit: 1ec1cd1feb7813fd095aabe2f2693a110b686242
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 22:54:12 2019 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 22:54:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec1cd1f
sys-auth/keystone: 14.1.0 stable amd64/x86 with cleanup
Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --force
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
sys-auth/keystone/Manifest | 3 -
sys-auth/keystone/keystone-14.0.1.ebuild | 181 ---------------------
...one-14.1.0.ebuild => keystone-14.1.0-r1.ebuild} | 7 +-
3 files changed, 3 insertions(+), 188 deletions(-)
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 2cfe9a60908..89319f3562f 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,12 +1,9 @@
-DIST keystone-14.0.1.tar.gz 1526741 BLAKE2B
5ae1a6f0e7a7ce737b3a0fdbd2900e8cb1541ec3b1e08228d4abf58d8021a06a6c9db654ef71c22636436f2601bd49d4934f24650e2a44c101c9610ed7b011af
SHA512
87065a16ca70dc9115d331f1e0f3669ac9661f5172f9e8afbecef48e7dd9a4726438b4d757fa54bbd6095a5543427dc913f90a765e83ffb30284b1f8dbfbb8e7
DIST keystone-14.1.0.tar.gz 1467270 BLAKE2B
ed4bd8a109fe80577d210a09ddb1e49d61cee329f52ded02dfa36d7996089b62b7570bdea3d4afd69d51e91183f6011b6ab69842d4b0463efc22e5140be7e02b
SHA512
ab2462f7d4bec19b37e0a482f19fd6cac3559d3fcb2422488646f18590a955bf324c260ca69f34c192508833378bba56c5ef21ee44c653dec50e3dc6e7b65425
DIST keystone-15.0.0.tar.gz 1620138 BLAKE2B
35a8800bb25e40f01837624058d62bf829e50eefe20953785dbbb9afc646c0178031b3d8b7a02e6f9b2b273294f1acdb7ac2c17e8200929cf8dbaac5dbf284ed
SHA512
b88f4ca95167a8cf0d1ed5891d692de43d43e95706b6efe8317ecc7356ee69eef85580d6f37dc9a31279c2127db946528fcd2b3612b43ccf6b952f88be097b01
-DIST keystone.conf.sample-14.0.1 119794 BLAKE2B
3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d
SHA512
5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
DIST keystone.conf.sample-14.1.0 119794 BLAKE2B
3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d
SHA512
5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
DIST keystone.conf.sample-15.0.0 109344 BLAKE2B
72542b4d42594bb86ba0afa4179705059c10f4d6978ae7081ba45762a4725c9340f8096099e0db6f6afc84e2b1d328b257f2f08cf25285f41032289458dfb92f
SHA512
b73c232e7a58f1bdaf7c50fb6fa6e75edc14742c7e74f70a44fe8be55ac673ae851015ed24c31891647bbddfd9a6c67b57bba4ce2dc368c5cee63e9ab72c8ce9
DIST keystone.conf.sample-2018.2.9999 119794 BLAKE2B
3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d
SHA512
5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
DIST keystone.conf.sample-2019.1.9999 109344 BLAKE2B
72542b4d42594bb86ba0afa4179705059c10f4d6978ae7081ba45762a4725c9340f8096099e0db6f6afc84e2b1d328b257f2f08cf25285f41032289458dfb92f
SHA512
b73c232e7a58f1bdaf7c50fb6fa6e75edc14742c7e74f70a44fe8be55ac673ae851015ed24c31891647bbddfd9a6c67b57bba4ce2dc368c5cee63e9ab72c8ce9
-DIST keystone.policy.yaml.sample-14.0.1 38318 BLAKE2B
a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4
SHA512
95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
DIST keystone.policy.yaml.sample-14.1.0 38318 BLAKE2B
a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4
SHA512
95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
DIST keystone.policy.yaml.sample-15.0.0 6644 BLAKE2B
f983189bc8e855db0b1ae92b1066840f3dd13545a1ce8af22be877df1630816fa8fae36217a828d483385e199ede73066b14beb421fe57316ae82a83e851e0f9
SHA512
e358661d4ec363ab11d7d78f6324bbe42c3382b02a1a8579de79686f7c91fe1a09b612ea81138bfcef73f0391262c9fceb3af14e8a8728839b203d281a989c4f
DIST keystone.policy.yaml.sample-2018.2.9999 38318 BLAKE2B
a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4
SHA512
95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
diff --git a/sys-auth/keystone/keystone-14.0.1.ebuild
b/sys-auth/keystone/keystone-14.0.1.ebuild
deleted file mode 100644
index d559bbf28df..00000000000
--- a/sys-auth/keystone/keystone-14.0.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone";
-if [[ ${PV} == *9999 ]];then
- inherit git-r3
-
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample
-> keystone.conf.sample-${PV}
-
https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample
-> keystone.policy.yaml.sample-${PV}"
- EGIT_REPO_URI="https://github.com/openstack/keystone.git";
- EGIT_BRANCH="stable/rocky"
-else
-
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample
-> keystone.conf.sample-${PV}
-
https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample
-> keystone.policy.yaml.sample-${PV}
- https://tarballs.openstack.org/${PN}/${P}.tar.gz";
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+sqlite ldap memcached mongo mysql postgres test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
- >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
- >=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- sqlite? (
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.8[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.5[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
- )
- postgres? (
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
- )
- >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
- >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
- >=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
- >=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
- >=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.6.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}]
- >=dev-python/pytz-2013.6[${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
- # allow useage of renamed msgpack
- sed -i '/^msgpack/d' requirements.txt || 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
- newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
- newins "${DISTDIR}/keystone.policy.yaml.sample-${PV}"
keystone.policy.yaml.sample
- doins etc/logging.conf.sample
- doins etc/default_catalog.templates
- doins etc/policy.v3cloudsample.json
- doins 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-14.1.0.ebuild
b/sys-auth/keystone/keystone-14.1.0-r1.ebuild
similarity index 98%
rename from sys-auth/keystone/keystone-14.1.0.ebuild
rename to sys-auth/keystone/keystone-14.1.0-r1.ebuild
index 428ffc5ea13..cde60987d69 100644
--- a/sys-auth/keystone/keystone-14.1.0.ebuild
+++ b/sys-auth/keystone/keystone-14.1.0-r1.ebuild
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 user
@@ -19,7 +18,7 @@ else
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample
-> keystone.conf.sample-${PV}
https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample
-> keystone.policy.yaml.sample-${PV}
https://tarballs.openstack.org/${PN}/${P}.tar.gz";
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
fi
LICENSE="Apache-2.0"
@@ -104,8 +103,8 @@ RDEPEND="
!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
)
ldap? (
- >=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
- >=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-ldap-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
)
|| (
www-servers/uwsgi[python,${PYTHON_USEDEP}]
