keystoneclient fix for upstream bug https://bugs.launchpad.net/opensuse/+bug/1181157

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

4 files changed, 77 insertions, 18 deletions

diff --git a/dev-python/python-keystoneclient/ChangeLog b/dev-python/python-keystoneclient/ChangeLog
index 25646b47c5cf..6de6bfe16134 100644
--- a/dev-python/python-keystoneclient/ChangeLog
+++ b/dev-python/python-keystoneclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/python-keystoneclient
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.7 2013/05/24 14:26:58 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.8 2013/05/24 14:46:37 prometheanfire Exp $
+
+*python-keystoneclient-0.2.3-r1 (24 May 2013)
+
+  24 May 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +files/0.2.3-upstream-1181157.patch, +python-keystoneclient-0.2.3-r1.ebuild,
+  -python-keystoneclient-0.2.3.ebuild:
+  keystoneclient fix for upstream bug
+  https://bugs.launchpad.net/opensuse/+bug/1181157
 
 *python-keystoneclient-0.2.3 (24 May 2013)
 
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 975ae15a0232..ac79663037fb 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -2,25 +2,26 @@
 Hash: SHA256
 
 AUX 0.2.3-CVE-2013-2013.patch 2927 SHA256 19a61c7453d1231bf2b90be2a95f3fe1c8fc65e381f52dc2c031a292bd9acf8e SHA512 573164b9d74e68c09052f4caf6b992c50b2410227ed299bc4248fb57acd4eb3086fe2c84c54d4739532ebb7a45567a50c9a43a414c0c4968494a76c77a1afed0 WHIRLPOOL ea78428bc2617492f00da08a0c9d5983f45534ad758f2d30e12c1530406866485dd4d880561980cfe9d6b80dda70eef7435f915cd1f65eab13a8f75968ad56a6
+AUX 0.2.3-upstream-1181157.patch 1732 SHA256 641d410662ae3259f8ed2772f39c29666f564eb7091f39b7d22522d42ce69c50 SHA512 d2f1bbfd96fec0542e8b1fea87f16288033de117df2ae45e2f19d1be7afe808f174ce527854ff1936f963e54895c5bc3e735e260c0acff7d3e8d61f471295ede WHIRLPOOL bc2e2eccb81dcbe542ea892bfa2a0ae84736d5e07f2a6f265c284799ee5eee3993c168e2e45e06563ac6c78abed1d41c9a19707676fe92943d6a745a81d84a71
 DIST python-keystoneclient-0.2.3.tar.gz 196250 SHA256 10b98946aaa98e97f032ca44848a5d84bc61d6f0b4186c635704087e72c08818 SHA512 d8a9dea1da767caf19c37fdc93c80959a83e78e8b0954b54edcffeebc4ca0bd60cc2ef716e3e4f173782d2a9bd1001825c8adab801e9dba6d3eb90c5f24f77ee WHIRLPOOL 68a5d6c640ad214924fbbad36d16cd613fe576be77d52a2a9d69346f7c9a2d7449437c53d992562233b2fda6c3c4b4c453611f7edf86c4808fbbafd02ba12e2c
-EBUILD python-keystoneclient-0.2.3.ebuild 1686 SHA256 e1923eaa07320ddca32142be1b02d60bcb41ea79efe8ed6147cafb79ec0733e0 SHA512 29f41c9c6934ed8871769e59c22c6f26546c98e34d3f152b8d6fd81a769835d435cee0c03c367bfdddc584aeb48a8166172e40a0c374a98ce61c5bdea2c7ac37 WHIRLPOOL 892e255ea0c3dde7ced729f5eb14cae4994bc2a41f544f06889f78e3ec99c1627627a85140af889c8266f546f1bec0fa17bbe181ce650a98c76cecb049a91f2d
+EBUILD python-keystoneclient-0.2.3-r1.ebuild 1735 SHA256 4c08cbddfa6f88cf7812fe3dfba86c7fe8bdea4554dc48f2dc1ab1220d485a8c SHA512 96988b31e57ea6e8b8dff75c0ffb378fdc7dc16ee31441d94c0609141954295a67b9ecd0a36880907225dae036d60caa5704a82462f8c56c1434cbe64167978c WHIRLPOOL e8a242d9a9d6cf234924ed7822cb5989a3980a9c969250d4b25cea18c0f969946c7ddf875992c86f9bc5e9dd36beaabecdcac74f9c3ffec90d2db5930c471bed
 EBUILD python-keystoneclient-9999.ebuild 1597 SHA256 0062df58f82beaaa54dd279e7a95ae8540c51cc1a2bb32e4621ae96cf2508216 SHA512 6de16b203f9cdf88cad8c8c19c99bfd1f243de807971ca2292437074b147f02476d526974cab64b8f881afb6e2c8f19938966f5322eed50b95c5a95de25461e0 WHIRLPOOL 8d26907ba7ac0e570a3fa245b8d2e04d5285c4ff02c2ecafd7fa9cf9cd4b3a6b938abfe9efb925e02b5733320a4cb05b2fb1aca005ca5ffd0f19ab4d19db58a4
-MISC ChangeLog 1992 SHA256 74b84feb42c88124743c3cc44cfef085a51629088ebc1383872188adeca54dbc SHA512 0188f755fa81810411e2a6fa712c9d9dca74c26c75e72570e57a488d7dbc20fef1719ac6781955456ea511e8b992c32c89888255d80e4f354d77bd8c9ddf2022 WHIRLPOOL 1135d7112d2c9d5999e677ed1d2236879823e76192a31b16e9837b7000e8757b55fe8dfd280dd5052c2e96bbbb679c78da5433768b0f4cbf548946579f96c90d
+MISC ChangeLog 2304 SHA256 003d1f47dd3b6aa3972e3b28c53ff4a2d61ad14e21ef0fe06e0c7a26dc2dbdfa SHA512 ea626c34d08a9527093d0db2eda7db0ee3ec0f16e0e16072b1fe246558de5c2d6cb5c748e7773cb4a648038d3ede69c9b4d012ee1e7375eeff29b45211c9a47e WHIRLPOOL 606af12bebbc81389394e2c23ad895f9b984e4fc325cd9d88418a59899c836fceebbaf480492b4cfb308515441a1fe117ef7d2427cde0d276ade6b39bd88a03d
 MISC metadata.xml 343 SHA256 716e96a66916d216f80e7ce0283db63bd6d18a95e2365d9d1a35964b2ef461f9 SHA512 fd28e5434f725af6a835205ae8cfae1354983f8e68f6c25f9a4f56ec17041ac9bb1a460ff8e82d0e165ab19c5b0f26e0f0c8c5124dfcc37723c786e12cd4d3bf WHIRLPOOL b486328b67aa7f6e4b68adc757bf5d3983077a894d7ded68be7723fe5655805324a73e5914fda0f81ae334e75db9557e2675a43e9437df633311590758466c5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRn3j6AAoJECRx6z5ArFrDaAAQALY2jTFv5klbR+mh3nm3TUjh
-vZ0+NPfvpm46+slqay/tzlgorkQDolseEjISBmt7ec0rwuuNmA/wr8xwwwaQEvuj
-4usx9wcKhLlW0tfr2VdzM2d9Kk9Vw4UJgFNg7CKFlPEB2jVK7NTLSntCS8R5f0R6
-W0IPe5ES/eSD189iFMoUpN0HFm7THOnBx01lDT8xU0WXJZJrFCJ8bsEw0DOfDYd2
-4BKbY1mrMEq9nv7qqDW2LOib7iYd/bG7wy4joAD4pClQ7BCM82quckKHegiAIKd4
-nEK9GzfEuAM20UY58di+QLTEMaIt3vnmxzC2ZNy4f6oTGIsyKyguxMg17Zn71fdS
-XMsOZJUrhsMjoCAo6z8eCxDH5mDImpdNVbB9QKnTsxhlnbNK2ZYF12eOHZE7wIQv
-PlJDZnm0LX/87HuGJalPWKFdTfgdh3Y+Jgfh/tNgUkIaL4HQLeROn0AYNfCq+FvY
-1sf4gcb9lJJ2kNb1xKvpGEQIsFt85/SHBshdCdwuKUrcG/ygGWU4faPqPiS3O8qK
-b6i2pJkBrKLZ6ujwZX4JjeuFaqV3kG8GM07WqQDkLtNNHN2ALcYSeBIqhLpg/OJ3
-mEVxq7S0H1Sw11RmEAKLW2MyLnmMv7aJFuzlwtX4xKBVOt5i4pcbbFuD6kEx5Uxl
-Pq0c5UsFPD03xdcxVCqD
-=zmhK
+iQIcBAEBCAAGBQJRn32bAAoJECRx6z5ArFrDQMYQAKVnrY0TkbRRV8G7RmwflONj
+67eC9ycGudkaZoWA1DT0YDQD0BfjWdohZl73jUWNwGiLZVgwHhGPGGB2bDO2D5IF
+oK9Zr+4H9tuGXqwuHT6Iy/Zzz/KoiD9ql3Wk/rSQtxym/HAMEBnUvsJzaRaSdKgi
+9zXDcwe59eRa6BDJtMMoMoQkVtAQTJL4xLrIiA3NWr+PNYKvbAx88tqDQgeFlg/e
+0UpIdurRi/9kPwfDTb9xqLFCBHX8WMHUjw6Eh+8/7VoBXHJ2O2w9bzRB2VC/djGv
+Ws2/t/0jdLOyjusXcMXr4IIsBjszI5AQihdCp44kJYDmDvp2JOak9JsbQgpoCajC
+rKwO5ag0YlpA2PJvodVVGH1UMjkYEnID9M7yHoa9UadGsuuvF1rovpPLClgbfZkY
+8Tya8JGWiPn924wwvYg6lB4QNYZFM67EzOj2KzovNPuufyxTCAcQ4zuqmXuPoz7t
+r2KKw+UfA2nCGrw0i8rxWpjZP49Nv7mI/i4CVNL2QT9GNbMc0or9bB4dCiI1Owaq
+9zSH+7wGUMYNu/6SZ4/vo218WPqC1HhkpQPWdCUMH3Em3SsPZlb6rxcYu9bESSGo
+8SJWtwbHUPDQ6y3c+wsxTbS76/i3/W0y5IEXb2jKLGsV3j3nMsI0ZMAhX8ND/FSF
+6Qk/giR44Jz06sebEHvW
+=MtwE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-keystoneclient/files/0.2.3-upstream-1181157.patch b/dev-python/python-keystoneclient/files/0.2.3-upstream-1181157.patch
new file mode 100644
index 000000000000..a94a88a9d174
--- /dev/null
+++ b/dev-python/python-keystoneclient/files/0.2.3-upstream-1181157.patch
@@ -0,0 +1,47 @@
+From 03012e641d6c2a98fbfe3780102e28a65d11a887 Mon Sep 17 00:00:00 2001
+From: Dolph Mathews <dolph.mathews@gmail.com>
+Date: Fri, 17 May 2013 10:38:25 -0500
+Subject: [PATCH] Default signing_dir to secure temp dir (bug 1181157)
+
+Change-Id: I1a29f50b07a60de3d0519bf40074dbea92fa8656
+---
+ keystoneclient/middleware/auth_token.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py
+index e6cf99f..befa79e 100644
+--- a/keystoneclient/middleware/auth_token.py
++++ b/keystoneclient/middleware/auth_token.py
+@@ -150,6 +150,7 @@ import json
+ import logging
+ import os
+ import stat
++import tempfile
+ import time
+ import urllib
+ import webob.exc
+@@ -211,8 +212,7 @@ opts = [
+     cfg.StrOpt('cache', default=None),   # env key for the swift cache
+     cfg.StrOpt('certfile'),
+     cfg.StrOpt('keyfile'),
+-    cfg.StrOpt('signing_dir',
+-               default=os.path.expanduser('~/keystone-signing')),
++    cfg.StrOpt('signing_dir'),
+     cfg.ListOpt('memcache_servers'),
+     cfg.IntOpt('token_cache_time', default=300),
+     cfg.IntOpt('revocation_cache_time', default=1),
+@@ -292,8 +292,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 = tempfile.mkdtemp(prefix='keystone-signing-')
+         self.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/dev-python/python-keystoneclient/python-keystoneclient-0.2.3.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.2.3-r1.ebuild
index 355ae1006f80..5675829a4e45 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.2.3.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-0.2.3-r1.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/dev-python/python-keystoneclient/python-keystoneclient-0.2.3.ebuild,v 1.1 2013/05/24 14:26:58 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.2.3-r1.ebuild,v 1.1 2013/05/24 14:46:37 prometheanfire Exp $
 
 EAPI=5
 #restricted due to packages missing and bad depends in the test ==webob-1.0.8
@@ -42,7 +42,10 @@ RDEPEND="dev-python/iso8601[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/0.2.3-CVE-2013-2013.patch" )
+PATCHES=(
+	"${FILESDIR}/0.2.3-CVE-2013-2013.patch"
+	"${FILESDIR}/0.2.3-upstream-1181157.patch"
+	)
 
 python_test() {
 	${PYTHON} setup.py nosetests || die