new keystone packages

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 123 insertions, 22 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index b039f993b131..c3b44e250247 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/keystone
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.41 2013/10/22 18:26:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.42 2013/10/29 05:25:28 prometheanfire Exp $
+
+*keystone-2013.2 (29 Oct 2013)
+*keystone-2013.1.4 (29 Oct 2013)
+
+  29 Oct 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +keystone-2013.1.4.ebuild, +keystone-2013.2.ebuild,
+  -keystone-2013.1.3-r3.ebuild:
+  new keystone packages
 
   22 Oct 2013; Matthew Thode <prometheanfire@gentoo.org>
   keystone-2013.2.9999.ebuild:
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 7ff0dbfdda6f..81a76b4c1596 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -17,28 +17,30 @@ AUX keystone.confd 67 SHA256 8faa32d3354df30b1d1c98cf481be162c27583b84e387f8da57
 AUX keystone.initd 1245 SHA256 16f50903b74dd21ef0641333e013f2c6b661590ee519b6f6c9f2ff8a08e7d3c9 SHA512 e30515232dac188e550e027cb5fed1790ec279344d3249efd5578761ceeb477f85120033b8950bec02d9b2a8b10a669a3de190ada0433ff2fef0c8a0d6d3ecac WHIRLPOOL 7662c75509e34aaa32e4e3ad4a63c0437d6b39f197f9728a23a3d137b8fb78e6334492132d5177dea31c49776eb2b2ec4336e5b27375635d39a7dd144adab2d2
 AUX keystone_test-requires.patch 1082 SHA256 6c91814d1a6aea942f23767b13a9ad77fb08ae16255887d974abd9db852c563a SHA512 d6fc133b44555e50895b9d82f9240aff284e1668ef35823a3e82900ccf9e6a7e11a448f4998c1d8f0938f5d45ce1506bd27417f576ee99aa7738ae74424ec343 WHIRLPOOL 0689d244f94a5489c7ca4551c5fb7c436f6012a932b4fb0142a759c734d5ce24a1aa813c9c1a5356dc38f4b4b342c85703413656139085155f9c5ab89dd012c5
 DIST keystone-2012.2.4.tar.gz 555448 SHA256 ab3a9a6c1f8ef9b95a73920883294f888f298db6330b8d4ed43e28354e8ca7af SHA512 481bde4372525c92144059c94d95ddac95dc720e486428f2e7ad1d5e0c6c2b6eb9a17be40f83c5866b522a512a2a3d331a08498c6704b794fea343fc2c0c1d93 WHIRLPOOL 243d9fe82988fd6057ffdae7971b570cb129a168fba3f6a38ea105fadc51e7e9fbfd29d88bb389572fc00cfbe0cc17e9e4c4f4ebf9d61ff589148b1b0c171558
-DIST keystone-2013.1.3.tar.gz 799651 SHA256 e097170ebb1cf22de50f2d5ab2216a5116ffe0934720dbad8b02d61c370b8261 SHA512 0d0a5f6902f78c5962ee19d29645081380d247a22d4de942a28e7fa28a4f6dca396114d94c6e8188d618b4de12d3b90187a4832575b37394a2b84c5eb9592876 WHIRLPOOL d74459c5e4f64287c3734384c075523ed2b88d4e4d044e5d45345009f2ce9b98d708367dcb3cc968df90b97972d0fd52d49ffb289a1982533370e5f9b075833b
+DIST keystone-2013.1.4.tar.gz 799682 SHA256 3673f5d7c1c19fca7529934308e2d9a6efa55bf7d100d20de1aa85e431d259b2 SHA512 7b1d9d9ae0fc6b1cadef8eb0d85f6a71fcfab754f8908076d38b14c14c3eb46d2d3c6266ec7482a60d7ae8cf54d54ba604c4d903dde65ec1243f862423060c14 WHIRLPOOL dea8adbb504ee9e3cda416f6e5a12cb0e606b88db7c0fe9b83fb8487e6f18e313e7d53041fcdaab408ae4201e355b72324cf35585b113c8769f51daf1c3f4ea4
+DIST keystone-2013.2.tar.gz 1404658 SHA256 f0e037cc6e40cb8a703755eee52bcabb1c61d80e94d8d6ffaef5378cbe256b05 SHA512 4faa49c0e93a4a2285ed22e80e6bc4ef0faeeb1026c2ca22aeb9f17e5d458efd7d08d3b84c570850edefff3801fb96ade5d78f0b2f3cb999f8f07fbe22e68ca1 WHIRLPOOL 73a3e4d150b9894668d28648031f1ea3baf0986d9727a2c9edd96ca46571a171ebc0e689e2bbc62cac1ad28cc25edb14d57d9546a050d2d2450a321c6d5c7d69
 EBUILD keystone-2012.2.4-r9.ebuild 3287 SHA256 281e9b4646def6657ac01b0603de9075719c7352ce60b0023d167c7e16cfea01 SHA512 dcf4d2250399b8886023b3c74a975d280e694af2e337ad043a298d2d0f8a1992f44c5a7a1b8445e83cde61a52fb077b9df642c725ca4b944cf20e6c8b2403de6 WHIRLPOOL c8c7c0468f39c19adff7d3c0cf7dd13305e91abee924a8d1ca693e0593521ab3d4c10ac7d27004c3b97a23dc9067bac5267f4b02ee36c7001ed37a17e928b793
-EBUILD keystone-2013.1.3-r3.ebuild 3209 SHA256 acfd5a5326959cc72be777b0b4717bb3d840cb412109e9d0b612132b66c64945 SHA512 b0a8128a7a7575fa572cbd3918591dd1ec7fee44e78665519561f224c5dd866d23abdc918c26ffaec3055de556c0fa26cac7d1ad1b37758b63194c9a5172f663 WHIRLPOOL dc86f172d2a2df3c69a1fb9d0464a69d1067ef7c62c68cb8ee7214a59d8898606242a164563b3bc66bc76857e97202a4a9b91305d5cd8782effd249c18ed2a18
+EBUILD keystone-2013.1.4.ebuild 3106 SHA256 1735647e384241dfa88c9779100c109d91418ba28707d064bd51399b03e13e4c SHA512 90f904452d6526e76beb50d16927526848078196e12ae8482578ac29496a845f856d1f140788ab16841456658d87e53a7d814845da9fc6dfe89f6869186699ed WHIRLPOOL 529c7dffcddf5544f80675e9b7e627e96a82d85be8201051019b113c7f2eea0278e3f68583a0a00dc1199f50a66b4c06984decf99a84dff49da5bc165752b030
 EBUILD keystone-2013.1.9999.ebuild 3101 SHA256 58a93657711e2bd7fdd7a54f4e641ee87ad29f39211fea04a4bdbcd18fda8807 SHA512 d2ab9ab6aad68f468eb2606a7a439d77f39ea85d9f2e69eb6308439a6824e76845b52ba6eb4df19205635b730a0233998ed3c9a75f28d1c20eb11018f56b22df WHIRLPOOL 5bdadbaca00e25e8b8f595fa23a10bdce18c764d9f960f7ba5bc45d791bfc4567eeee7d65c51e25a6119cb4505316b18f1de8b65d5f4f22bcae3d1b181bd6715
 EBUILD keystone-2013.2.9999.ebuild 3328 SHA256 9a5904b0704e11e81079b8ab761b025ea164d3fdfb912d8490d22a1c137374dc SHA512 c06bddcf73c96205990a8e93b1d89ae7e5b1b82a106022b5d838ea6519fdf530d710963106146b065d26326d27e9039815a16e7d045f6191b4549a52f01e4dec WHIRLPOOL 2da214f1b84f0f51071a498f4355d39d55531f24316edb8cd14f8370d2155f6921025e6871dd47ee27734f8a4d29c88ad648028b11b0f8ba8bb642e7b1b89da4
+EBUILD keystone-2013.2.ebuild 3314 SHA256 8087aca871bf50c770793f2ca51ba560e8135a621f032742dba1f1ba33d0e8c5 SHA512 a9f2ed490454756998ea6c23d9096941f01ee46b8b7596e696feeec4774311e0608e3f43402205384058e5a7803c6bcbb71322709c629d416cb231ba785a551b WHIRLPOOL c8dfa0e88548ba61de28c52453649be8df478c9bc710979437d2fc81c2b4d6c18463e52df1155fff38441c15b48c2a2c50ac00233065d95351b5386b3b159f77
 EBUILD keystone-9999.ebuild 3076 SHA256 a36884f1a0cabbb712cbbf03d756da580d3e8aee5a750470f86f4041d97b31b4 SHA512 f2954cf4808e461e5585853dbbc20fbd2e8e8420e0118e2a8cc07f53885ab77220c5a0c13390b8292fb1ab7c5943b5f1fa02fcb1872b139c43014465a6dcc743 WHIRLPOOL 737dfb051fcb45a1762efd9172fed9dbd2a9bab625595e6157b877def190a41606f4971cc33c85ddfb46b0ee959be20f89b9937eada74fe104953a5e5a838fb0
-MISC ChangeLog 8844 SHA256 20f7ec9b1393869bcde3df512f5dcbe08a9b65477a39c24a621252b0e543e74b SHA512 94f88e153ed0e310a7e1cfb31850580b1beef0c96afa0944c564d579a0faa8938fc033f21fefca7279e3c5f29553a5ba8416eb8b72d9ec4c99890c1f6cc44066 WHIRLPOOL 2f6df2b286c7a9fa19ed6bfd358cb6e277efb543a1e250bab0ca154ca8696ffa37108ffd6c7188e3c6f412d7b24ef493f8604b6dfe72a6870696a6014c85e336
+MISC ChangeLog 9077 SHA256 2dc2aa354bb38ba31caa36a235436b8adac94c94aa9fc594a66ddcab639a4aab SHA512 474f9f278afdd2ee147f247b7fdf8b8b05635b5d70bac93ea246c11ac88188dfe28e9f355741f3ff8c362f3376ea0a79f8cb61592734423c602cb79e3f9114f3 WHIRLPOOL 9b070d99fff2cbd7c537be5b8d89e731935fdc98c4fd798ef9c51877228f4ffcc517fe8b14a13b379f1f05d69beaf027b0c2b327899b08428335112563275a69
 MISC metadata.xml 424 SHA256 c89c0232e90df5d811d17941c1594e4c4c45db48c2b6240a3c62b232caad4e84 SHA512 9d7fcca89a6f35a93f1a57790103249cdc25424cbdb374bf26b691e81b27182dc3380a8ff67b77e7aabf4ce944e4a813d619838d4bc97086b4208e5312d76f11 WHIRLPOOL 4ec9d4c5ff5c484c341b06fe77fcac8e6fdd0e0b651dbd58b6f2d5aecd05db5bf70218b94733eb749ced7436f9df5ba5c93496bae06c0ff9a62b91ecb53ab77a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSZsP1AAoJECRx6z5ArFrD6pYQANXAo4k8TtsNKm1KsIJqH7Et
-02UhQ3rw+v5m6ECRstCFmXzzn6Tpn92atatZ1At5H6+xRUwnsjFKzeVqwWm+UccG
-46ouC/8vlLj9l4FD0C7yEAduHzQnasi9MgQ8VybgY03i5KCTYFxzMv7f4v65TtEF
-8JuLNtXdaV/Y/1XGzaftXFyEPUrJc6JR2sUgpJBJ/UZPwqc/HxaATC259YBqHbId
-/ieButhjtDHVxdqfDBerjTnud2xCN+B+4XbwI8k7svQN6RJvkOrhTcnbf28OYKUb
-4VQpTnsiNWutkIgVA1ryy7o2BMP32LmwDTWUZ5ql53A0K/mJRpLW4fpPu/YdMblD
-k7QZUmdB+MQPV8RLTW911QH8venOMUUH1+usWQZgiB5VmcqeFmGmwE9pcegGUnHx
-ZaypE5bemMXoGBg5H6v+xKyB4jstsdottw1QeQitWp90SPhjRQlPwpeYFvhASvGS
-Zc+1qlt71m55WRH4ZxG5pfIv4IioiYkhemxCxsXtQu59zld0Yj2ATxPzYIlTUxej
-7HK2bUbBpF+pJRJqzCoYWI+posUOB6aPE8qdT/PZmxAxfKQ38g4Bvt9jTL34Bo7i
-aujPqz4KVV3UJiQku5FdlebenEMA0okE1WOlWxK4JCWOTzmwHyDRJrn7BbnHE2Bj
-gKB+IAEFWdRGddgvpThf
-=AnwN
+iQIcBAEBCAAGBQJSb0dLAAoJECRx6z5ArFrDWwwP/3al2rwbBV474TR2chXqsDDr
+zrYUFFNFzYMf3Af+3zIb30ZT1S+Ho62Vs3m5SjmaRb49Biv3JUUr0WR4knwK0eG4
+SW3lcLA+TnYXBOFjSEft9MoGY69ffTsPzSInnxtk+kQZe2O7YU047P1qBpJ+tilV
+pglaPtiNkLlWTWPKe6+NRD6hjm2RuTnF7ttpiOqDxhCITegiYI4x4ZSojKyN4udZ
+crPdIW0rn1u7r5MHJWyhZ8OP9w8rpqSgJUwtSRXWqHp7w8R0BW2Tf400CsoqEuv+
+tucf0F3ZRFXKK87vq/C54TZGB0gz4IdYY+dPLG3H8wCE0Z5bR31mTz0MjCNS6MDa
+TQv4VXJTH7VGLMFbk50zVNwidps4Ght2sVYsl/3cEJ85Y/+u3iquI0PdawOqAzro
+yGZyPHhjtj3MaygUAcWWOCqhQMofsnnlFbV5BnPCsDKDVKeOr019TaPsIDLLl8JB
+iOnS2q5oei1PyMFp3QlO04mbWmuK3+bAOqhtK5Jx9XDOIw05tYdf0DgakQ3eX586
+gzFBd2bGYezz8LJBfQ1M+lADcouJxJ6ndjOMd6f6Z2KahSYMdYTA6O1of2I4C0W5
+7Swm7X/FsZtjwFj9Iv7esm2zGdn253RSUVDDi8guvAidfpyZ38UL6TlIBaxvYQ9f
+i+i6YVUPwckI6e5YzzIs
+=stMQ
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/keystone-2013.1.3-r3.ebuild b/sys-auth/keystone/keystone-2013.1.4.ebuild
index 22e7d68759aa..6f8fc1c62cbe 100644
--- a/sys-auth/keystone/keystone-2013.1.3-r3.ebuild
+++ b/sys-auth/keystone/keystone-2013.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.3-r3.ebuild,v 1.6 2013/10/19 08:12:03 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.4.ebuild,v 1.1 2013/10/29 05:25:28 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -42,8 +42,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 			dev-python/webtest
 			dev-python/python-memcached
 			)"
-RDEPEND="${DEPEND}
-	dev-python/eventlet[${PYTHON_USEDEP}]
+RDEPEND="dev-python/eventlet[${PYTHON_USEDEP}]
 	dev-python/greenlet[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-0.2.1[${PYTHON_USEDEP}]
@@ -68,8 +67,6 @@ RDEPEND="${DEPEND}
 	            <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
 	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
 PATCHES=(
-	"${FILESDIR}/2013.1.3-CVE-2013-4222.patch"
-	"${FILESDIR}/keystone-cve-2013-4294-grizzly.patch"
 )
 #	"${FILESDIR}/keystone-grizzly-2-CVE-2013-2157.patch"
 #
diff --git a/sys-auth/keystone/keystone-2013.2.ebuild b/sys-auth/keystone/keystone-2013.2.ebuild
new file mode 100644
index 000000000000..f2e0ef669c89
--- /dev/null
+++ b/sys-auth/keystone/keystone-2013.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.ebuild,v 1.1 2013/10/29 05:25:28 prometheanfire Exp $
+
+EAPI=5
+#test restricted becaues of bad requirements given (old webob for instance)
+RESTRICT="test"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Keystone is the Openstack authentication, authorization, and
+service catalog written in Python."
+HOMEPAGE="https://launchpad.net/keystone"
+SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="grizzly"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sqlite mysql postgres ldap"
+#IUSE="+sqlite mysql postgres ldap test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#todo, seperate out rdepend via use flags
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=dev-python/python-pam-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	<dev-python/webob-1.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${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/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
+	dev-python/oauth2[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.5.0[${PYTHON_USEDEP}]
+	dev-python/python-daemon[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
+#	test? ( dev-python/Babel
+#			dev-python/decorator
+#			dev-python/eventlet
+#			dev-python/greenlet
+#			dev-python/httplib2
+#			dev-python/iso8601
+#			dev-python/lxml
+#			dev-python/netifaces
+#			dev-python/nose
+#			dev-python/nosexcover
+#			dev-python/passlib
+#			dev-python/paste
+#			dev-python/pastedeploy
+#			dev-python/python-pam
+#			dev-python/repoze-lru
+#			dev-python/routes
+#			dev-python/sphinx
+#			>=dev-python/sqlalchemy-migrate-0.7
+#			dev-python/tempita
+#			>=dev-python/webob-1.0.8
+#			dev-python/webtest
+#			)
+
+#PATCHES=(
+#	"${FILESDIR}/2013.1.3-CVE-2013-4222.patch"
+#)
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/keystone.confd" keystone
+	newinitd "${FILESDIR}/keystone.initd" keystone
+
+	diropts -m 0750
+	dodir /var/run/keystone /var/log/keystone /etc/keystone
+	keepdir /etc/keystone
+	insinto /etc/keystone
+	doins etc/keystone.conf.sample etc/logging.conf.sample
+	doins etc/default_catalog.templates etc/policy.json
+}