diff options
author | 2015-08-05 02:39:41 +0000 | |
---|---|---|
committer | 2015-08-05 02:39:41 +0000 | |
commit | e2d6e291b666901fe196924e9f6872a8fce8cee8 (patch) | |
tree | 8047839a9a06ef695b12f51f406ba670cb5535d0 /sys-auth | |
parent | removing the old and jankey (diff) | |
download | gentoo-2-e2d6e291b666901fe196924e9f6872a8fce8cee8.tar.gz gentoo-2-e2d6e291b666901fe196924e9f6872a8fce8cee8.tar.bz2 gentoo-2-e2d6e291b666901fe196924e9f6872a8fce8cee8.zip |
removing the old and jankey
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Diffstat (limited to 'sys-auth')
-rw-r--r-- | sys-auth/keystone/ChangeLog | 7 | ||||
-rw-r--r-- | sys-auth/keystone/files/CVE-2015-3646-2014.2.3.patch | 29 | ||||
-rw-r--r-- | sys-auth/keystone/files/no_admin_token_auth-paste.ini | 88 | ||||
-rw-r--r-- | sys-auth/keystone/keystone-2014.2.9999.ebuild | 193 |
4 files changed, 6 insertions, 311 deletions
diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog index 2163c9e6e6d3..ce43ccb700dc 100644 --- a/sys-auth/keystone/ChangeLog +++ b/sys-auth/keystone/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-auth/keystone # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.102 2015/07/29 23:28:49 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.103 2015/08/05 02:39:41 prometheanfire Exp $ + + 05 Aug 2015; Matthew Thode <prometheanfire@gentoo.org> + -files/CVE-2015-3646-2014.2.3.patch, -files/no_admin_token_auth-paste.ini, + -keystone-2014.2.9999.ebuild: + removing the old and jankey 29 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> keystone-2015.1.9999.ebuild: diff --git a/sys-auth/keystone/files/CVE-2015-3646-2014.2.3.patch b/sys-auth/keystone/files/CVE-2015-3646-2014.2.3.patch deleted file mode 100644 index 411ee2a78753..000000000000 --- a/sys-auth/keystone/files/CVE-2015-3646-2014.2.3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 695153a523faa9310e2e20d0333c33a47334208a Mon Sep 17 00:00:00 2001 -From: Eric Brown <browne@vmware.com> -Date: Mon, 13 Apr 2015 11:37:53 -0700 -Subject: [PATCH] backend_argument should be marked secret - -Since the backend_argument can potentially contain a password, -it should be marked secret to avoid leakage into the logs. - -Closes-Bug: #1443598 - -Change-Id: I55663db4cf2df84a66de8f64fba4b4f129ae827d -(cherry picked from commit f9db1a65bd4d83d12c572ba4d5807845996ef410) ---- - keystone/common/config.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/keystone/common/config.py b/keystone/common/config.py -index d7f9dd8..d953e49 100644 ---- a/keystone/common/config.py -+++ b/keystone/common/config.py -@@ -313,7 +313,7 @@ - 'deployments. Small workloads (single process) ' - 'like devstack can use the dogpile.cache.memory ' - 'backend.'), -- cfg.MultiStrOpt('backend_argument', default=[], -+ cfg.MultiStrOpt('backend_argument', default=[], secret=True, - help='Arguments supplied to the backend module. ' - 'Specify this option once per argument to be ' - 'passed to the dogpile.cache backend. Example ' diff --git a/sys-auth/keystone/files/no_admin_token_auth-paste.ini b/sys-auth/keystone/files/no_admin_token_auth-paste.ini deleted file mode 100644 index 1c2fafd2ab2e..000000000000 --- a/sys-auth/keystone/files/no_admin_token_auth-paste.ini +++ /dev/null @@ -1,88 +0,0 @@ -# Keystone PasteDeploy configuration file. - -[filter:debug] -paste.filter_factory = keystone.common.wsgi:Debug.factory - -[filter:token_auth] -paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory - -[filter:admin_token_auth] -paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory - -[filter:xml_body] -paste.filter_factory = keystone.middleware:XmlBodyMiddleware.factory - -[filter:json_body] -paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory - -[filter:user_crud_extension] -paste.filter_factory = keystone.contrib.user_crud:CrudExtension.factory - -[filter:crud_extension] -paste.filter_factory = keystone.contrib.admin_crud:CrudExtension.factory - -[filter:ec2_extension] -paste.filter_factory = keystone.contrib.ec2:Ec2Extension.factory - -[filter:s3_extension] -paste.filter_factory = keystone.contrib.s3:S3Extension.factory - -[filter:url_normalize] -paste.filter_factory = keystone.middleware:NormalizingFilter.factory - -[filter:sizelimit] -paste.filter_factory = keystone.middleware:RequestBodySizeLimiter.factory - -[filter:stats_monitoring] -paste.filter_factory = keystone.contrib.stats:StatsMiddleware.factory - -[filter:stats_reporting] -paste.filter_factory = keystone.contrib.stats:StatsExtension.factory - -[filter:access_log] -paste.filter_factory = keystone.contrib.access:AccessLogMiddleware.factory - -[app:public_service] -paste.app_factory = keystone.service:public_app_factory - -[app:service_v3] -paste.app_factory = keystone.service:v3_app_factory - -[app:admin_service] -paste.app_factory = keystone.service:admin_app_factory - -[pipeline:public_api] -pipeline = access_log sizelimit url_normalize token_auth admin_token_auth xml_body json_body -ec2_extension user_crud_extension public_service - -[pipeline:admin_api] -pipeline = access_log sizelimit url_normalize token_auth admin_token_auth xml_body json_body -ec2_extension s3_extension crud_extension admin_service - -[pipeline:api_v3] -pipeline = access_log sizelimit url_normalize token_auth admin_token_auth xml_body json_body -ec2_extension s3_extension service_v3 - -[app:public_version_service] -paste.app_factory = keystone.service:public_version_app_factory - -[app:admin_version_service] -paste.app_factory = keystone.service:admin_version_app_factory - -[pipeline:public_version_api] -pipeline = access_log sizelimit url_normalize xml_body public_version_service - -[pipeline:admin_version_api] -pipeline = access_log sizelimit url_normalize xml_body admin_version_service - -[composite:main] -use = egg:Paste#urlmap -/v2.0 = public_api -/v3 = api_v3 -/ = public_version_api - -[composite:admin] -use = egg:Paste#urlmap -/v2.0 = admin_api -/v3 = api_v3 -/ = admin_version_api diff --git a/sys-auth/keystone/keystone-2014.2.9999.ebuild b/sys-auth/keystone/keystone-2014.2.9999.ebuild deleted file mode 100644 index ba917ce29c32..000000000000 --- a/sys-auth/keystone/keystone-2014.2.9999.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.7 2015/04/14 16:10:06 prometheanfire Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 git-2 user - -DESCRIPTION="The Openstack authentication, authorization, and service catalog" -HOMEPAGE="https://launchpad.net/keystone" -EGIT_REPO_URI="https://github.com/openstack/keystone.git" -EGIT_BRANCH="stable/juno" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="+sqlite mysql postgres ldap test" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-0.8[${PYTHON_USEDEP}] - <dev-python/pbr-1.0[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}] - <dev-python/hacking-0.10[${PYTHON_USEDEP}] - >=dev-python/bashate-0.2[${PYTHON_USEDEP}] - dev-lang/python[sqlite] - >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}] - >=dev-python/pymongo-2.5[${PYTHON_USEDEP}] - <dev-python/pymongo-3.0[${PYTHON_USEDEP}] - ldap? ( - dev-python/python-ldap[${PYTHON_USEDEP}] - >=dev-python/ldappool-1.0[${PYTHON_USEDEP}] - ) - dev-python/pysaml2[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - <dev-python/coverage-3.7.2[${PYTHON_USEDEP}] - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] - <dev-python/fixtures-1.0.1[${PYTHON_USEDEP}] - >=dev-python/lxml-2.3[${PYTHON_USEDEP}] - <dev-python/lxml-3.5[${PYTHON_USEDEP}] - >=dev-python/mock-1.0[${PYTHON_USEDEP}] - <dev-python/mock-1.0.2[${PYTHON_USEDEP}] - >=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}] - <dev-python/oslotest-1.4.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - <dev-python/sphinx-1.3[${PYTHON_USEDEP}] - >=dev-python/webtest-2.0[${PYTHON_USEDEP}] - <dev-python/webtest-2.0.19[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - <dev-python/subunit-1.0.1[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - <dev-python/testrepository-0.0.21[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] - !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - <dev-python/testtools-1.5.1[${PYTHON_USEDEP}] - ~dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/requests-2.1.0[${PYTHON_USEDEP}] - !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] - >=dev-python/keyring-2.1[${PYTHON_USEDEP}] - !~dev-python/keyring-3.3[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] - <dev-python/oslo-sphinx-2.5.1[${PYTHON_USEDEP}] - >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}] - <dev-python/kombu-3.0.24[${PYTHON_USEDEP}] - <dev-python/lockfile-0.10[${PYTHON_USEDEP}] - <dev-python/stevedore-1.2.1[${PYTHON_USEDEP}] - )" -RDEPEND=" - >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] - <dev-python/webob-1.5[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}] - <dev-python/eventlet-0.15.3[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - <dev-python/greenlet-0.4.3[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] - <dev-python/netaddr-0.7.14[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - <dev-python/pastedeploy-1.5.3[${PYTHON_USEDEP}] - <dev-python/paste-1.7.5.2[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - <dev-python/routes-2.2[${PYTHON_USEDEP}] - >=dev-python/six-1.7.0[${PYTHON_USEDEP}] - <dev-python/six-1.9.1[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - dev-python/mysql-python - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - postgres? ( - dev-python/psycopg:2 - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - ~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}] - <dev-python/passlib-1.6.3[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] - <dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}] - <dev-python/oslo-config-1.6.1[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}] - <dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}] - <dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}] - <dev-python/oslo-i18n-1.3.2[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}] - <dev-python/oslo-serialization-1.2.1[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}] - <dev-python/oslo-utils-1.2.2[${PYTHON_USEDEP}] - ~dev-python/Babel-1.3[${PYTHON_USEDEP}] - >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}] - <dev-python/oauthlib-0.7.3[${PYTHON_USEDEP}] - >=dev-python/dogpile-cache-0.5.3[${PYTHON_USEDEP}] - <dev-python/dogpile-cache-0.5.7[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] - <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] - >=dev-python/pycadf-0.6.0[${PYTHON_USEDEP}] - <dev-python/pycadf-0.7.0[${PYTHON_USEDEP}] - <dev-python/posix_ipc-0.9.10[${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..... - mkdir -p ${PN}/tests/tmp/ || die - cp etc/keystone-paste.ini ${PN}/tests/tmp/ || 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 - newconfd "${FILESDIR}/keystone.confd" keystone - newinitd "${FILESDIR}/keystone.initd" keystone - - diropts -m 0750 - keepdir /etc/keystone /var/log/keystone - insinto /etc/keystone - 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 - - fowners keystone:keystone /etc/keystone /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 -} |