update to latest openstack keystone releases 2012.2.4 and 2013.1.1

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

4 files changed, 120 insertions, 22 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 58ee084f4b0f..9057ae3ff554 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.14 2013/05/06 15:57:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.15 2013/05/10 02:47:10 prometheanfire Exp $
+
+*keystone-2012.2.4 (10 May 2013)
+*keystone-2013.1.1 (10 May 2013)
+
+  10 May 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +keystone-2012.2.4.ebuild, +keystone-2013.1.1.ebuild,
+  -keystone-2012.2.3-r2.ebuild:
+  update to latest openstack keystone releases 2012.2.4 and 2013.1.1
 
 *keystone-2013.1-r1 (06 May 2013)
 
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 346bc1df18ad..89e54c4384f9 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -9,27 +9,29 @@ AUX keystone-grizzly-1-CVE-2013-2006.patch 1614 SHA256 b403d024eed366f1cff844d93
 AUX keystone.confd 67 SHA256 8faa32d3354df30b1d1c98cf481be162c27583b84e387f8da57611b689bc2448 SHA512 75b040eda6ef8701e8dac8f34b3dd3c96aedde3b005fac01f20592b3d8afb8bbce57fadc466cda69d7192f96460a5c704d941a16b96d02f3e80f1a3e264c2efe WHIRLPOOL 8e8cb4e8991ca8d8cf1e874bd2286900ca63379c73793bca906ecfc1318ee63a8af6d1f6090e9ef296bfbe5abf018368a5ad6430de1efdea0db626d8c697f3c4
 AUX keystone.initd 1177 SHA256 fcf7e532f2f3fad8413455f67d8e9c4c0522ff99e69bd95d4fff49d2dfa243ac SHA512 a0281f5fdd96963d9479a3463e6b5f1947a2c3c8694e464d4d293ef237392bed796ec7b8431e1add7b73334ed5e11158347f35ab562edda5f7aa7bdb9b05e51e WHIRLPOOL d819103e6f2bdd7ca4d5ab2f645f8ca168cc46567ff7c2d00cb2d536c08319aaa472b06b8f98cf2b6de940089f444e7aa752e4c9deeb849a834108394dfe1862
 AUX keystone_test-requires.patch 1082 SHA256 6c91814d1a6aea942f23767b13a9ad77fb08ae16255887d974abd9db852c563a SHA512 d6fc133b44555e50895b9d82f9240aff284e1668ef35823a3e82900ccf9e6a7e11a448f4998c1d8f0938f5d45ce1506bd27417f576ee99aa7738ae74424ec343 WHIRLPOOL 0689d244f94a5489c7ca4551c5fb7c436f6012a932b4fb0142a759c734d5ce24a1aa813c9c1a5356dc38f4b4b342c85703413656139085155f9c5ab89dd012c5
-DIST keystone-2012.2.3.tar.gz 550860 SHA256 640349c9319e5eacc60ebdb0fd69239d03fbaf52b4749879d12b66d74678afc8 SHA512 77f5b6cedc9c5b5f6224696e152b2ac5bea9409256857a728dec916cdb70672a4d6a25c5b0e34039977f8efd9c34b02ce1fabd6311ef02c2b78264f36ced4fd0 WHIRLPOOL 5d45e3d56dc3196eb1d8432fa263acef7674a42de27ea826b89c0a39a4f9700ce75a02889930c1d160c24a175b17975dbb64b0d94823e4016f18ea1f0744dd0c
+DIST keystone-2012.2.4.tar.gz 555448 SHA256 ab3a9a6c1f8ef9b95a73920883294f888f298db6330b8d4ed43e28354e8ca7af SHA512 481bde4372525c92144059c94d95ddac95dc720e486428f2e7ad1d5e0c6c2b6eb9a17be40f83c5866b522a512a2a3d331a08498c6704b794fea343fc2c0c1d93 WHIRLPOOL 243d9fe82988fd6057ffdae7971b570cb129a168fba3f6a38ea105fadc51e7e9fbfd29d88bb389572fc00cfbe0cc17e9e4c4f4ebf9d61ff589148b1b0c171558
+DIST keystone-2013.1.1.tar.gz 791324 SHA256 a00664dd20adf36e1e78a6b29f49f7947e2f2426c0ae375f8acde01e75bdb579 SHA512 7d4fd0cd649f783214dc3aad48853682db529fa336631e601d55c6b45355dbc670bcabf76f642db6808c5d46aae70062eb8fe5c5e3a20247954beb5a6c4fda7b WHIRLPOOL 96df00049325cc96c1b54ebecbb95cf8d47f0e580703ce8b8942e1e4f75604a98fc33f2972a1b1dffbba2225c502a692d7f84241ffc1f66da27f6a325789e08c
 DIST keystone-2013.1.tar.gz 789365 SHA256 34347a3242a40d93b98c3722e6f3fbc112bc1c9ef20c045c3d40637e459b4574 SHA512 2f9d9ecb3cb0b2f282be31d280e0c202a5e818cdcd057919445bf8899827af59856b6e3e75000f83b1a97aefdf3d9454fa0dc16a2d4819a68e8f899c865c2a20 WHIRLPOOL b306ffafe3345225496e6e1505fa691f312b0ef6cea42cc7d78224da7569c2498997e74efe6c5b82d8bb20d2d2653aaeb8ec8c79703db10f97c72b04046153c7
-EBUILD keystone-2012.2.3-r2.ebuild 2676 SHA256 aaf66e48b344fbdbf301fda32f04442d25641c1c069d98e9cca4c5ef0e2bfc71 SHA512 de55e004b738d3551b2859dcc67db81792675d81a75c5777de888384298f32cf95577ea90d6a779a673cd36dee2ee3f9a31196adb545bdcf30b708bd78780abb WHIRLPOOL b6a5d469e6f03544a2c0592ad7031a25976cf888db8ccad9a6f2d7d4174d38f85d0e5ce4d7c1cf6e68138ccf3b8f6087fc69a811c1b26906361aff5961aa19c0
+EBUILD keystone-2012.2.4.ebuild 2481 SHA256 b458e900d3410c79fe3c4286bebc9bb9315ff1a854e7daf9a5fb062c5ed5b34f SHA512 15f3b57f8b92e0a8d8593e8b0c40813796fa152e9e76d9e61b7e7ac7025b7a1165247353247471bfb057b019bc54c308430e0f6243ea1b7fe4ec13c86c20a88a WHIRLPOOL 670313f15a762a16bcbfba122530cc91f7830ff3f61c81a2322ab323042f3c313865f5a3a3f8e45cbd52890168a010da4eb73da1bb071a2491c7229ba4554544
 EBUILD keystone-2013.1-r1.ebuild 2974 SHA256 2abcfe8de51dcd00267177149abd02bea966c65f4acbf505476d968623e2a4d5 SHA512 549f3c839c037688d1a779fc1e28a234af6e18cdc3c68ac1bf7da254cbb27b4bf79b97aa794c62f42b908995f8e22864791c11550bb63f36097a97d4425c88f8 WHIRLPOOL 2df5d7e440d719b09c805c14e3064947de9f8929d27747a22980eecbc12edef0f0cff89bd284afc9d05f1ce2f4ed3ddd9274c9838998cbc4472466ce2d55316b
+EBUILD keystone-2013.1.1.ebuild 2920 SHA256 e6290cedad04b9c6801ce9c73a1b4e2b25cce8a53b3057c51b8880cabd36d2d3 SHA512 283de4603b1788135cbbe0ff31c26fa9290067cd945941093cbcd844ae37388577775c6e320db6353e8e3b1c664700a06a00c73584396c1a135fc1bf27ab6aed WHIRLPOOL 06fde096d6a034a1d2e2e5dd3ead39c4c6a63faa5bc741b18ef31b7a38809b6696aabc9b7f3cf342f03efe28ca149c8fea8c318e48e42dca0e5e150c7ade113b
 EBUILD keystone-9999.ebuild 2942 SHA256 048862e16792a3de401129f16b01fdfedbbcebc0f126dd1a39fb63c0118cd030 SHA512 767dccb4ce53d3162156f965c97bb4d33ff6d1d7dfd5efaa3a223d66915694f2d946e6e7774b73ac1c4f5a42af6228dafd3f30d3fb57da59bc293bae141a18a7 WHIRLPOOL 944e87af5b6a7f4276d49751d0b578052257c833350a568e7dd031f138b20a1714e38874f4992486fd8ca51d83e01516c055a244c634ec35e931149d120fdbc2
-MISC ChangeLog 2782 SHA256 244ec5de529a01b07e2780ba1f1fa07395d3d793c57b1ba1d185bba603e08dd2 SHA512 ae8ca33939932736668d969757ed70f0c6f0bca41c8ea7f9a1cd0e3670f0194c992ff813a12a125ef6006ab0c0b805c2b67235d2e7a054cd1fe5fa4a7c450ba4 WHIRLPOOL 972c870ef2235c24d61039dfd8d3798a1ccedbbd7b9106f10727029f9acb307d3de3c3c0d99086bcc0e5298d3cbdc3bf16e1e8f30c996bc225892b526f0b0a88
+MISC ChangeLog 3064 SHA256 0eaa8ab87c7f96259f079b29a078577fb074a888805d9bd4d6d59f9cbf4e23d7 SHA512 bad6510e1d53ba9ee035a3ba013c775da79c280dfc79e614330443d4c140a8c4854307bda987a665d881ff45d7db4b9e2323431d42364a823de54deb9c447235 WHIRLPOOL 929c4e5151c7975f9d376e2e0afa50c330f3fcffb882b6fbdc03e37a201002319f6c718ec86ca73ee659c7e55b56ea736df7ea5e7d736f74e2ef306cfde174be
 MISC metadata.xml 399 SHA256 7f8946a43a8187a3901e53e0e3b4293e49bb2a1d1785c472b1d0ffd83e0ba2a8 SHA512 9448005b3be5621b302b4c71d190c621f245163a2c7aa8277a3af8132558543c774e9bb20b39bcb0ad896db5d2feac7649b107d7850f68e437f18214891ab16f WHIRLPOOL b46a5eadc17d5e38d23efed9620772e6d5e2cbd7733e1c0a8d15a506cacc8a31e9b26a354a1b749a7c64bff08722658b2feb651679a6a6054cd3b551839ddb38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRh9M1AAoJECRx6z5ArFrD8dMP/3z1wumoeJom0xMpTHcZgmDB
-+csCYUGG1z/rKLHTXhkNNHFRLt0UgadWDQY7W5HrqzlmcOrug/bBtap0xbAdf1Ye
-I1r1rrey2dCB7/Vw13MI9dpjaQPJl2TCIl8ujHxvybrka3TqRHgSlQ17tFCqv4Fs
-t0ed2aPt15eH2F8JFE3jZ6FYdjmjpOnIpC1SdX1uvS2TFDRFZT3DUSUH9Q8UAr/o
-eqoiBL6EzVHi4iUcdPMTUhJuY7L/COlnfkzhLzz6P/kKBr17KHOzOT6GMO5+MJ3e
-5tYw5WLx6yfgPkev6f8gAOqk8AdC8d49UISjwmZxZIbc4P9YCOwUM0UAYM1+dl+r
-+m/9r8s4lt4/gESuaUlJ9+G48M3Nfvu629vCFFPBt5p2o+y8u4oe7EngYRdZN2yF
-cUjJTmNfih+rMKhi4EvuoPhoFQo0VpMBfND6NFje/Qd6r7EaUG6iWC7d5AKqvrBU
-EiVmRb06mR1qf8xkLPshx0ZiqlMuJK2vA0jxMDT0PmIQ6NDzN850Bn1n6JE1lHkH
-nSLVF0PfjIpaNI3htD5dz8X49ZGVaAxjQOh0O1qRgui2W2VKo+ez1odiD/SYyxTJ
-yarVIpgsPVSyQPoHgKXG2tKwp7r0ABQelcKcdt1GmsHr5c8t+HJuRV6VL0OZTMJP
-5URP/XxoCXtTIuspRBbW
-=zkyE
+iQIcBAEBCAAGBQJRjF/pAAoJECRx6z5ArFrDBGsQAL7Rjn1Lz/g1xD5CRO/iQJJi
+TWUfthEz3+yA7ubGuIyZc6CBVSqkMRkd9mYGFHL5lPs/6dxkb4kx6tuoG+KW/hD1
+m0M2e6rI9x77IK90LGFnZnbVdUpjXZ5dhubVjN0C0ZIblabC4keD/+dWWieHkPMf
+i+j+USlxXwqfk+b2uNKGsuNnfDyGEU4b1UedG8Et4PuiO2xtwBcdBIJQmhB67dyt
+4Pa/5hqnzl/4M4T1VZwRWl6fL32D7qgnR36kNTosfA5OtRT8nvdthMvp4Te8zpvf
+3xGM8UGDx9S+Cugor9LYFQmnJnKe8OSpfCI/CSMjxwMWDZuIsj3hCxrHwqQHh2i6
+lrwgx6fbnuOr2Voqqx+l+Aq82l4DSuNnC7PrpaD6ToiusiE6+Qbr8a5NxdWCnYRi
+D2C6Yh0G3ntSh/oQp2Y17wxIuDCfWAKW1FG6XCHWp26UfNKDj+SSBG3FFEmg2/bz
+gfWAO5EjTYLukN9PYQm8HxK/UCjUcI8fh8Nef4sHWkOBjH99s9qv+Ie3+pD6oJQi
+JfSWMNUAfTfiTz6SY7+0Y7mcw0XtusXp+WgPwUDLrjCWgR5VexMnnG9j8IRc8wsX
+atH6CnhJvs/mpAAgFuWaUUXw/jxAKKG87TUqkklRj2gHlABnFKzlz8TbryEsnALE
+ZbshAd0DphN7mbTUuJcF
+=/650
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/keystone-2012.2.3-r2.ebuild b/sys-auth/keystone/keystone-2012.2.4.ebuild
index 2c2a6eb9c1d7..ccde2c02c823 100644
--- a/sys-auth/keystone/keystone-2012.2.3-r2.ebuild
+++ b/sys-auth/keystone/keystone-2012.2.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-2012.2.3-r2.ebuild,v 1.1 2013/03/20 17:17:08 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2012.2.4.ebuild,v 1.1 2013/05/10 02:47:10 prometheanfire Exp $
 
 EAPI=5
 #test restricted becaues of bad requirements given (old webob for instance)
@@ -69,10 +69,8 @@ RDEPEND="${DEPEND}
 #	"${PYTHON}" setup.py nosetests || die
 #}
 
-PATCHES=( "${FILESDIR}/keystone-CVE-2013-0270.patch"
-		"${FILESDIR}/keystone-CVE-2013-0282.patch"
-		"${FILESDIR}/keystone-CVE-2013-1664_1665.patch"
-		"${FILESDIR}/keystone-folsom-3-CVE-2013-1865.patch" )
+PATCHES=(
+)
 
 python_install() {
 	distutils-r1_python_install
diff --git a/sys-auth/keystone/keystone-2013.1.1.ebuild b/sys-auth/keystone/keystone-2013.1.1.ebuild
new file mode 100644
index 000000000000..1ca41972fcde
--- /dev/null
+++ b/sys-auth/keystone/keystone-2013.1.1.ebuild
@@ -0,0 +1,90 @@
+# 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.1.ebuild,v 1.1 2013/05/10 02:47:10 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}/grizzly/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="folsom"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sqlite mysql postgres ldap"
+#IUSE="+sqlite mysql postgres ldap test"
+REQUIRED_USE="|| ( ldap mysql postgres sqlite )"
+
+#todo, seperate out rdepend via use flags
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	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}]
+	<=dev-python/python-keystoneclient-0.3[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	dev-python/python-daemon
+	>=dev-python/python-pam-0.1.4[${PYTHON_USEDEP}]
+	dev-python/routes[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.7.2
+	=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]
+	sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite]
+	          <=dev-python/sqlalchemy-0.7.9[sqlite] )
+	mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql]
+	         <=dev-python/sqlalchemy-0.7.9[mysql] )
+	postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres]
+	            <=dev-python/sqlalchemy-0.7.9[postgres] )
+	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=(
+)
+#
+#python_test() {
+#	"${PYTHON}" setup.py nosetests || die
+#}
+
+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
+}