fix for upstream bug 1181157 for folsom

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

4 files changed, 70 insertions, 4 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 34a086f1f68f..9af626a4b35b 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2013/07/01 14:37:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.24 2013/07/17 16:30:36 prometheanfire Exp $
+
+*keystone-2012.2.4-r6 (17 Jul 2013)
+
+  17 Jul 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +files/2012.2.4-upstream-1181157.patch, +keystone-2012.2.4-r6.ebuild,
+  -keystone-2012.2.4-r5.ebuild:
+  fix for upstream bug 1181157 for folsom
 
   01 Jul 2013; Matthew Thode <prometheanfire@gentoo.org>
   keystone-2013.1.2-r1.ebuild:
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 2463f0588e2c..2183360fd552 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 2012.2.4-upstream-1181157.patch 1336 SHA256 355c3e49e2c0ea0924bfb7eaf2d6a82120d2eb0f31fc4863ef6bf1b9791c94d4 SHA512 b90d41bcd9b60886af2f37de3cbc33c3583eef65b9ed4a92e2b55e8701f883f3662b8f5e00a4c65d869914b8c9718364b8024604197a5f6cc5403508e3fb8827 WHIRLPOOL 0454536a2c9ed28c6b164c9f64af6c472f8d22b38a509d27d4d0d22a238737f4d51ed17f416c04c7fe3b43790741e0914b09e0435c6dbc8e34c7c1debf75eb19
 AUX keystone-folsom-4-CVE-2013-1977.patch 1114 SHA256 af81df239364cab3f94b14636359a19e6c8474f8282d2c174e3e75208fa508c6 SHA512 e9139487cdf6185d0405fd034a48c451c15ab568ebb6d4e58c2c50160ef8dc6b926a31fd0b31c646ecfccf68f2b667d9577bbe6e169ef28f8abfc06ae9031210 WHIRLPOOL c2ed7858f514f3d4a45303b0a307eb259c3c53373160ad35afcb7012ca63f9360d152f4869745579b678d990ed6f929ef050b1c68683bac656123a0aea394ec0
 AUX keystone-folsom-4-CVE-2013-2030.patch 2318 SHA256 fd824a4000da663568f26dbcfa6de031911ebdca1dea2c0958b3d5398d4d9ba6 SHA512 6b00a6d9062dd418299f9f02891fbfaa86f8f69db394ccfff31367555d1d7dbad1cf0d5a8647b61addeaabd2107b9f75cdc1986df8186de5c428f33533abffab WHIRLPOOL 842c4adb14c4a4501ea84c0082c0f28295027e27fee9957eafea6db9397a26c4955eb355b955d625bf5df818c1178af2267270aedec93bc47da8f17b59eaeca2
 AUX keystone-folsom-4-CVE-2013-2059.patch 2340 SHA256 9c3a1d953abd719c55c77fd13295c0aa5caf730a4656f3a111a1bfc1d92a282c SHA512 c6f50ed21c95c7be256f0a15ef804eaf16f32fec038be53742ce85b9a303f4c613728c95af606aafd779009f298a68517668594a590fa40258dbbb6646c3fbed WHIRLPOOL 723b4d0e5573a2e7473e4613fcfc717d1e0d90ff18a7559baa7fe0a21c6c5fcb84648afcb227ea9231ed87738e0c17cf79153287d2d6b14a65974a67e78dbd2f
@@ -10,8 +14,25 @@ AUX keystone.initd 1177 SHA256 fcf7e532f2f3fad8413455f67d8e9c4c0522ff99e69bd95d4
 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.2.tar.gz 794322 SHA256 9a4fc5d39e9cc64ab032aabf1687106f36ee7a0b3c98b988561e09afa7d121ce SHA512 5b32a1c910103e6ced10c0439af4452466f1f9e0b14382c3e10db5776039b02198f5dfbf9ebea9a05c175b9aad0d7c58e7785c4dbf6f193a1668521f81246b72 WHIRLPOOL cbf7773fab6cd4e13c9e85d851dfd10382dd12e4f984eac9fff170b611457f8aaa5cc964a571e9d7eef0efce12504c2d0c2cc1fae954b90f1925c9837e04544d
-EBUILD keystone-2012.2.4-r5.ebuild 2693 SHA256 4ff82e1e015666463dbd3c81113031bba25d5e5a065bf5f6f9989c72eef34d5e SHA512 16d3d45f3dbc87eff6836fb4cc6119f6bc37dc5c8490adf2bdaebc241b7e869491ba103695433a5998c5c92079318d4f860a50fda3fbbcc9187a5b7601158cc3 WHIRLPOOL 819a114f04b645dd42ba02149e5d12a70c07a9c0058c69a31b0e0ba6bfe83f6f4bb633ecc84c09d91c63ab534d717bb0a2402e4c15c8cfd2cd2375ed5e858df2
+EBUILD keystone-2012.2.4-r6.ebuild 2740 SHA256 12aa067203a588a93f2f1da80d6fbf1bde8518addb32938028735e28235e05ea SHA512 26a7fae98ae28cd749f89f66b76ebe16c1124fcaf78c87354a98b4bce583fa1005a9bb9875d8574239fa1d6ed64ca48035818d50715a344580c6bc576f51c26c WHIRLPOOL 551b2a7f9004d552998881d73e116aa62643bb82a0232da7fe34663874fc75dfe88ac0925ea95a72f639d61b769e7d6a754334431f4785caf9899e595d2fe61a
 EBUILD keystone-2013.1.2-r1.ebuild 2978 SHA256 692c14356f4027dfe0b9725db665c012919598e8dd537949c3735cff9e45b904 SHA512 538e8357df51883c5b5ced68d1f50e63a2387d4123953d0931a3341f99dde0145721a0942cbe57896243ecf148c35939ad5d620416114dcaa0c5b5795d678b70 WHIRLPOOL 67084b0c426fa53004a3fc3379b93f551a7ee870636f6d2e38c44afd673f037114126dfcd028d4361c3023ddfec0d38d8ea144c5abe6858f8aff4dff1a74b31c
 EBUILD keystone-9999.ebuild 2942 SHA256 048862e16792a3de401129f16b01fdfedbbcebc0f126dd1a39fb63c0118cd030 SHA512 767dccb4ce53d3162156f965c97bb4d33ff6d1d7dfd5efaa3a223d66915694f2d946e6e7774b73ac1c4f5a42af6228dafd3f30d3fb57da59bc293bae141a18a7 WHIRLPOOL 944e87af5b6a7f4276d49751d0b578052257c833350a568e7dd031f138b20a1714e38874f4992486fd8ca51d83e01516c055a244c634ec35e931149d120fdbc2
-MISC ChangeLog 5224 SHA256 aab9b6725f2f42f6119e9b235d53e7f947b545f7a10e08ed544345116fede73f SHA512 46d82614c68b903c31c8b8c0d36b88d07df41051d996b9ff2366080f10952a7ca94143e20f8bee8b3156a10f9ba772c3a65554ce0ca4c4fa16469e9547ac709a WHIRLPOOL 644be95f9b56a015836df2448a6d40d7679094847692af17dbc444a97cb9e7c7e1c9446116c44172a7a4b0dc6c2e58dfeaf8f9be51a2f196b2c722c7828a154f
+MISC ChangeLog 5465 SHA256 09b50ba19287f52300261d7ecdf51e5450d30f94c42bd8de07a2543674ff4c57 SHA512 2057683248a0d457a8b5fa605647b415015a07b6c19fb55a69e8efd8665a20cce88eab848f29b67bee1443abb9d507f1d9d053231eaa3cb74c1e9bc8a6013ca0 WHIRLPOOL 77c92c9f1ea5a4dc8f8931a5d44f388eea3ba84f37afe21a9b2f57c88235acf53d5189535ab46c1d317f566d3201cd0333fcaf62a43d8f86a6f7d3167e104886
 MISC metadata.xml 399 SHA256 7f8946a43a8187a3901e53e0e3b4293e49bb2a1d1785c472b1d0ffd83e0ba2a8 SHA512 9448005b3be5621b302b4c71d190c621f245163a2c7aa8277a3af8132558543c774e9bb20b39bcb0ad896db5d2feac7649b107d7850f68e437f18214891ab16f WHIRLPOOL b46a5eadc17d5e38d23efed9620772e6d5e2cbd7733e1c0a8d15a506cacc8a31e9b26a354a1b749a7c64bff08722658b2feb651679a6a6054cd3b551839ddb38
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJR5sbRAAoJECRx6z5ArFrDfNIQAKgIpiwvAsxWTZ0yuoTUmpHC
+vwol+nWwC4rGQCeNYFJrh1u8Y8OkMvbyCjLmDRNZmACx7CK7w+egBRCEQmhBqsl4
+bJybfQgG52/lVrA6SXtZ1lqfSX0+AMON8GtBM2gFrP4RZnzmbXbvHIDuPNbRHG5r
+EgyEoyqaO+Kbd5y7cpjyIp/GH00i8mVBpg94LcVXY+gvGs9zVnGSmLT57hIID37t
+RF5LZ3v9TZAmFI6lY6wtr5d0p5sbyQU31I+cUODPEiiMvhfXHu/hEWZwMQ5T8vPg
+jwOkXP0nwmy1Z4x6ZLXzs+8+H/q6ROdpeydbVaxrVYDUjuy1uE+bkUOurjovwsgf
+niRL3M/Kc/aByt+qmpCneulFgz+C7lEYSxIG8gHLwadvkTuKxe6IPFIb5m9t7F6M
+Txk9Ga49kDIehkI0xWP2vgnD2te0HZYFpL9HM6ZAIbLRD/lCL3WmUhU/WSwiud2q
+Q2iq7rDHMKmOme+WV119ki4uFDhWzQFEI+ctp/PalnxB2m4QSIQ4wJxKhZvan5MP
+VRheEabGl4cvDBjEjL99TfDlzlvbup367KpBQ+ptocpJYeNCzFtn5bdq6hnYMiX2
+JyiasRkZmEGi0y3OQBP+TJlGlyGlPk92zTHa/NClGNO/hv1adwIlnRN4Q3kFtt/m
+3g7zkhVZM7/P+ObGUq5r
+=o5f6
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/files/2012.2.4-upstream-1181157.patch b/sys-auth/keystone/files/2012.2.4-upstream-1181157.patch
new file mode 100644
index 000000000000..f01643d083c5
--- /dev/null
+++ b/sys-auth/keystone/files/2012.2.4-upstream-1181157.patch
@@ -0,0 +1,37 @@
+From edbd3ad9158f96fdc7ed621d7c72cd2e71fa5101 Mon Sep 17 00:00:00 2001
+From: Dolph Mathews <dolph.mathews@gmail.com>
+Date: Tue, 28 May 2013 08:09:49 -0500
+Subject: [PATCH] Default signing_dir to secure temp dir (bug 1181157)
+
+Change-Id: I1a29f50b07a60de3d0519bf40074dbea92fa8656
+---
+ keystone/middleware/auth_token.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py
+index 01e6c58..b1a4d48 100644
+--- a/keystone/middleware/auth_token.py
++++ b/keystone/middleware/auth_token.py
+@@ -99,6 +99,7 @@ import json
+ import logging
+ import os
+ import stat
++import tempfile
+ import time
+ import webob
+ import webob.exc
+@@ -213,10 +214,10 @@ class AuthProtocol(object):
+         self.cert_file = self._conf_get('certfile')
+         self.key_file = self._conf_get('keyfile')
+ 
+-        #signing
++        # signing
+         self.signing_dirname = self._conf_get('signing_dir')
+         if self.signing_dirname is None:
+-            self.signing_dirname = '%s/keystone-signing' % os.environ['HOME']
++            self.signing_dirname = tempfile.mkdtemp(prefix='keystone-signing-')
+         LOG.info('Using %s as cache directory for signing certificate' %
+                  self.signing_dirname)
+         if os.path.exists(self.signing_dirname):
+-- 
+1.8.1.5
diff --git a/sys-auth/keystone/keystone-2012.2.4-r5.ebuild b/sys-auth/keystone/keystone-2012.2.4-r6.ebuild
index d8d7b64cfb88..e8eba2575642 100644
--- a/sys-auth/keystone/keystone-2012.2.4-r5.ebuild
+++ b/sys-auth/keystone/keystone-2012.2.4-r6.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.4-r5.ebuild,v 1.1 2013/06/14 21:57:36 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2012.2.4-r6.ebuild,v 1.1 2013/07/17 16:30:36 prometheanfire Exp $
 
 EAPI=5
 #test restricted becaues of bad requirements given (old webob for instance)
@@ -74,6 +74,7 @@ PATCHES=(
 	"${FILESDIR}/keystone-folsom-4-CVE-2013-1977.patch"
 	"${FILESDIR}/keystone-folsom-4-CVE-2013-2104.patch"
 	"${FILESDIR}/keystone-folsom-4-CVE-2013-2157.patch"
+	"${FILESDIR}/2012.2.4-upstream-1181157.patch"
 )
 
 python_install() {