an actual release with the cve fix now instead of just a patch

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

diff --git a/dev-python/python-keystoneclient/ChangeLog b/dev-python/python-keystoneclient/ChangeLog
index a69b40db53cc996bd3257f3e24c262396a08e530..5bc66c5c54ce7c6824701995a2560afdf2c683dd 100644 (file)
--- a/dev-python/python-keystoneclient/ChangeLog
+++ b/dev-python/python-keystoneclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/python-keystoneclient
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.54 2015/04/28 00:55:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.55 2015/04/28 16:28:47 prometheanfire Exp $
+
+*python-keystoneclient-1.3.1 (28 Apr 2015)
+
+  28 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +python-keystoneclient-1.3.1.ebuild,
+  -files/cve-2015-1852-master-keystoneclient.patch,
+  -python-keystoneclient-1.3.0-r2.ebuild:
+  an actual release with the cve fix now instead of just a patch
 
   28 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
   python-keystoneclient-1.4.0.ebuild:

diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index bf1d42972ec68435a565e260de355e6e5d21523d..515a47894368b003d9b9e1def842b6b9486ac6ad 100644 (file)
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,30 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cve-2015-1852-master-keystoneclient.patch 3303 SHA256 e1f742aff5e763f0061672c1329f699cc9120c9a03467b40658f3c3460c25a0a SHA512 ff65dd7d9da92e4d58a158177a370c9c8c2d60c9e54bc78184d1587667f4609325bf0185e3f1ea137ef9084f98c3cbd379b7def215eb4f70d72be65424d13a27 WHIRLPOOL 4631705c1fb320dfe337dd8eeed95818b8926564da148fb4a4773912574f7a4a23f083ea20f066e2369ce2158848d9e181d9c366290febbcecb8d6803c82e781
 AUX keystoneclient-1.0.0-cve-2015-1852.patch 2648 SHA256 957022dc28449852a9ef40d93d276b1450bdc6c87ca23dfe1d162d2e11a01f20 SHA512 0af0e143cddfb4d44f9a26dccf3963963ffc836bcf74bb9200d6d841efb8a48f322b2e3e2282791c15205e552530f793790fecc812256ed6dc195aa61e62c911 WHIRLPOOL 0b48200f8d2c5f327aaf5f3f5f7e0a23f39569b989694582180611d52fd4d0b2bb2dd44824418acd80a02d6e0a82f9d536170c0f8942921430a907c17e53919b
 DIST python-keystoneclient-1.0.0.tar.gz 314308 SHA256 6d960d2196efc7a181519a77f757a27ceeeac71f41f624318ae7f1088d2e6db4 SHA512 331d1f634c06f142628c6c641e49a75ca721eb6a37e11827b12db293eeef3e39e9565b38db27d9e39464ef80f5a6d1da2b4e0365dc2eba2b22f63abe0b2992fc WHIRLPOOL abd1173e4caf31ffdef01e7a5f13869dcea4d8c053805ec995b675a46350f2c2a8d5c6d692127a048690b018c3785dc005d6c752df86277dc04873a4daa19525
-DIST python-keystoneclient-1.3.0.tar.gz 338528 SHA256 c009445d9a36fa788a14b093f67501091b246fefccb30fb63925e6e4fbeaac04 SHA512 51fd09419479ed00a9bd1785c0bf08cd7ee5393cb2eabba02558cf9828cbd9070f671377d759ff3dda0b675846f22dc8bb7419443e0b850c26f3263cd3b9b533 WHIRLPOOL 4f134aaefe9353382ab78a74109c139df55f9275cc2d932eae5cd8764e74f3b608fcf5bcfb659ac14504d87e944494b6a0221051dcf82a21bec109ddefeda7bf
+DIST python-keystoneclient-1.3.1.tar.gz 338187 SHA256 8a421dbdf01251119164bf6baa0ef78b261e5dd4d3508748e47b77d7652e7e92 SHA512 d11825b717d0aeec67d4dfb0382173ee834fe3dea2097b8ff9505b86bb08a5579d6fe87509d65022d4436a3a1b4d20f2a877ece3160b53979999495b77df0f08 WHIRLPOOL 9aa0af722f56eb4d98d7efb8a35b1db95207970fba0b32496a9ae4593a16471f976efe1e9bb3690106ec0f5a76b5a744e9177cc7c03d9ffe9ed54111e3bb138c
 DIST python-keystoneclient-1.4.0.tar.gz 347743 SHA256 f525fc2431dc3eb863490d4d026d4dfb24e3b5a57496557cb6b5e7ebe9a7f9b0 SHA512 0a044235b5c9da2c9854e5e612ce1ae1c859119f661c226d8da53879b52d3e484d481a57e5daa6b1cf3e4f65ac1d47a4c24d720fe450b791f5752a44906d53d5 WHIRLPOOL bdc7c07fbc625c15baf12278d00c75ee40b3d240e62833d818fa9085a960d75d62a681b5e8965d5c968b0d1ed4bb21eddb29c141cf7100f2af86cae9d2e9834e
 EBUILD python-keystoneclient-1.0.0-r1.ebuild 3191 SHA256 9b4e7b93295c403b125332856daeba281ef15f3af408ba19e04fc0f02a58891c SHA512 c100a3ef9f7291ae714520d34a3825c5daf7008104e0aef8f0b8018b59b05a6e46dc60954b35bcdd1a02bedd7a5fdbd1a0f60e75ca2ec0b860c60105960f85fe WHIRLPOOL ddedada3ec2b4866fc03db152825edfae194a7264d7a5d1a4ec1a6d00481bd98dae6dec34ee42969b9928e59c82ebf3888e9cf59ca713bab372ef6f303e192cb
-EBUILD python-keystoneclient-1.3.0-r2.ebuild 3130 SHA256 81ae36d6bb1f5771d16f91a80999c0de63c3776316f2cfdd0cc32b58f49fc30c SHA512 36f6c0e18f14c2231085c63cd94f695767089a2a510d2e79c9017cbf8da93cd3ee82f94bdd6eda5e8c8bef6207db8aabb2663c1c2436c676648ff491959aedb1 WHIRLPOOL c6ba85116c8b6b4b8ec9ac6b704eb968559be8edb847c46365ae7ccc5ad1159281446d5a066dbdadf3d1014f299c323138f8bf64534c33d9056eeadf68ea8a12
+EBUILD python-keystoneclient-1.3.1.ebuild 3071 SHA256 86aa2c8823ac15b7b3682666f431d3fb43efbe4aa47a1a0a118e2762d359b397 SHA512 9a690ee8ee88b2c8c880fcc7afe06ac93ce2e773bbde927de71c541857f88320b725a711e0ee948f25c38e14453f19c4078868da6e4b2b2b708512c282655842 WHIRLPOOL a0530a86d455c70275fb7454f9e441dbe31a6dfcd73b82155846a9a404aa14e8c9be66ed0fab24b0d57ffacdade5d0c3e3e227f400dbbfc8324d88698455b569
 EBUILD python-keystoneclient-1.4.0.ebuild 3117 SHA256 e4706886d4a6ec292899e59c6dfdfc82895b5f40a4e6292df303872001c35a7f SHA512 b9e6d2bd60e5b44444d738c4395ae186e43ed7b14639693524f07bd710a0fb3af67373249af2619549dc36633e2ee256f6bea3018cec0e127de8667e57dba035 WHIRLPOOL 42eec63efe889914faa65e8b3e2a365990ad728bea34ed53fe1d7c5cc187d4667d9ef438a8e997dd139e684dd4647c884193c4ca8db178cc1d312acf0c2c2c13
-MISC ChangeLog 11376 SHA256 c9ee85a4bdb104eb43b604359ecc255550a2bdffc1149f9e2ca2b5a03623bc25 SHA512 bc8f01de7d263f0d983f7d41b9b7f1fe535454122fb26065ba9dad8361ff7d163eb8f3ee33ff1db334edb689ac33b2099a63fab273d8888891dfc3f33e85cf08 WHIRLPOOL 57214fbf016dff1f6ea46626aecbea25b80532790a3be5262b6d1ed66038a56e289f4db1fedde9ec8a1b3fface01d4fcbde70afe11b73411ab6ae670d6aef39a
+MISC ChangeLog 11676 SHA256 1bb80261f9cacb0b06b911b447f0100b3295ae581ac1d320f7171e561976a2ef SHA512 7e8ffdf685ea3d5ca231e1800b153145ea946dd0ca388b868df22196fc2de3dc3b5a918ba78ea7e5f36c4d9b8edf17868284a6b6413bc6a14b708662e4b999d6 WHIRLPOOL 9fe01e13b89b9193bdf5959c8975a5f11cbd92d809de387ca8a50bb9f58cf2d8e46a665940ef03c6f73fe2a02d07cdd29cf1db63e76b62152c992a440b467c8f
 MISC metadata.xml 368 SHA256 a91cef59b9f9006441eae6ac81afcf9efd4382762bcb6300f16046ba2851ce8d SHA512 6035564d5afb3100400c97ba1671a2ca65387a1fd67a77145ed3968c2ccadaa28eec54afa03b9ae67b1e69843275adbe92646dad8ffb9995d2270c85f94ca679 WHIRLPOOL 858f1f68eb57ac301bfa5bcf8db0f01853c5c1a612570f2e45a867fd16fddf84da77bff85441dec22df18634c56018874675d056f200e8336da9709d49d0ad48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVPtp9AAoJEGSje+quGaTor9cP/RzBGRm6/hoEQzamzC35mtoG
-g3aZbh5feLnP1PPN6XV4YB255X/IsmdzerA+Z2OAHYGOEx0JrYWi3Ein2j/f19KR
-WXqx/MA/XXNWM5+fAkfykec1ODrB6nR8djUAe4olWeFq033R4hqn93WFNiGFykHD
-a6eQBfC+XWvjrBGq36ACpk+1F9Af9tbK1auKYfOVI/OrlJTEDbHuliwYSkwZVMrK
-a3s12lc35Vy9JZ5hxNmB7VmnDcmAC5GjSkFFM0Zr2cqyNVOy3MseKjWKsVmo7tJs
-5jbiNvB9C02pOP3XISbLYObH9tLibDAssb/b3Lpw7TqlNJPtS5000t4I6nBAgv8u
-cQboTNS8lALWSKgONqCnS1PZEYgWhZiut6BpfbaxtIcsSOGYxnLrHTceHbYjhNZ/
-wXFh/IVYoTgRqigjZSlDSpxAK0LiLoqda2jK+cw12zbX5rZrS2cGIBjNGhHTtuva
-RP5cOdJEQh7FJmCut2nN+ia4wDFXRa6J61yWuCMTr/mLAk9SMoJRmA5q3vqPDsk7
-F0rh5lU1qwq/SEFgIEaXU6dq0b+mVgcDDAJmS5a0tuxkIi+xXjBoMAQpv1Vyc95z
-3jfzDFXQxV7mUs8Irh/PQVFT2qaKo4ZyOVpbIqn985iWaBv3KgeTUt5RdbvtMJA0
-YIbesH1IVyMicGZKkOD2
-=+hKI
+iQIcBAEBCAAGBQJVP7VWAAoJEGSje+quGaTo/nUQAJ9bvKrIwMED4eIHnvLpa7rB
+ZYqKDBlGR1kF5iCgjg/UYOgcn0GF5ahkaQzuuIyqFFng6nHv8dEIi+05ZwBhVRD9
+go0zb3cL9InGJVgEm2DsI18SrAhtv+nDx1Y1TkwM+E3JRdtkjOW1ZomZtLzEmJQG
+YsTpFzotrsoiwYrSV6nzZSWbIrt7IibLPS5C4ysI53UGm6tHhEajuZ8U/oaPY9Gc
+g0ff6WMozVkHqLjMGaSfbZhLKtZ1cOuY6sEHCY7+eje2n7Q/VCG+Aw5dYobqn27Z
+ZdWmhRrNhXJHjKfIKINOIBTvnjvTQmobXipChq7IwHxPJEQnbnOziKD1FrzvKdSV
+D/ubklcB6KeQ4zQnBmTBX163IcMRc/Vgl9xqwY5BO7Jy/fw3E2j7BuymJyDDrTiN
+brV2l1T1OeoRklQN2XuiuXDKZs+hG2l+SW9FXYUdLyOfVqfxY01fTrkSJMG2Gftf
+R280f+ATDZ1oil5E4N8FtZq8nrFsgMkE1j2RIJVTAzV+6wprAZUjOTDzHIwbFe5M
+LvFxa6kJykiDMrQc8aosS8lF50Wvsin8XWSodX0B1vvgzwKzUypvRk3KyLaYPq81
+wDzCB8GVaSaCyndGeICvlJywzTkw7kBnHZK6rSnFggpo6213NdAXeisNKV/gj4x1
+AEw4U3cv1GSfbiyI7smF
+=Ae9w
 -----END PGP SIGNATURE-----

diff --git a/dev-python/python-keystoneclient/files/cve-2015-1852-master-keystoneclient.patch b/dev-python/python-keystoneclient/files/cve-2015-1852-master-keystoneclient.patch
deleted file mode 100644 (file)
index 82897fe..0000000
--- a/dev-python/python-keystoneclient/files/cve-2015-1852-master-keystoneclient.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 46f8d86c197376b0cdd9589310f2e66ef7af027a Mon Sep 17 00:00:00 2001
-From: Brant Knudson <bknudson@us.ibm.com>
-Date: Tue, 7 Apr 2015 19:38:29 +0000
-Subject: [PATCH] Fix s3_token middleware parsing insecure option
-
-The "insecure" option was being treated as a bool when it was
-actually provided as a string. The fix is to parse the string to
-a bool.
-
-Closes-Bug: 1411063
-Change-Id: I508dae8d7bedfc903e476cdefac43d05cbd7fbe1
----
- keystoneclient/middleware/s3_token.py              |  3 ++-
- .../tests/unit/test_s3_token_middleware.py         | 24 +++++++++++++++++++++-
- 2 files changed, 25 insertions(+), 2 deletions(-)
-
-diff --git a/keystoneclient/middleware/s3_token.py b/keystoneclient/middleware/s3_token.py
-index 7552893..f8d1ce0 100644
---- a/keystoneclient/middleware/s3_token.py
-+++ b/keystoneclient/middleware/s3_token.py
-@@ -34,6 +34,7 @@ This WSGI component:
- import logging
- 
- from oslo_serialization import jsonutils
-+from oslo_utils import strutils
- import requests
- import six
- from six.moves import urllib
-@@ -116,7 +117,7 @@ class S3Token(object):
-         self.request_uri = '%s://%s:%s' % (auth_protocol, auth_host, auth_port)
- 
-         # SSL
--        insecure = conf.get('insecure', False)
-+        insecure = strutils.bool_from_string(conf.get('insecure', False))
-         cert_file = conf.get('certfile')
-         key_file = conf.get('keyfile')
- 
-diff --git a/keystoneclient/tests/unit/test_s3_token_middleware.py b/keystoneclient/tests/unit/test_s3_token_middleware.py
-index d5a62e8..dfb4406 100644
---- a/keystoneclient/tests/unit/test_s3_token_middleware.py
-+++ b/keystoneclient/tests/unit/test_s3_token_middleware.py
-@@ -124,7 +124,7 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
-     @mock.patch.object(requests, 'post')
-     def test_insecure(self, MOCK_REQUEST):
-         self.middleware = (
--            s3_token.filter_factory({'insecure': True})(FakeApp()))
-+            s3_token.filter_factory({'insecure': 'True'})(FakeApp()))
- 
-         text_return_value = jsonutils.dumps(GOOD_RESPONSE)
-         if six.PY3:
-@@ -142,6 +142,28 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase):
-         mock_args, mock_kwargs = MOCK_REQUEST.call_args
-         self.assertIs(mock_kwargs['verify'], False)
- 
-+    def test_insecure_option(self):
-+        # insecure is passed as a string.
-+
-+        # Some non-secure values.
-+        true_values = ['true', 'True', '1', 'yes']
-+        for val in true_values:
-+            config = {'insecure': val, 'certfile': 'false_ind'}
-+            middleware = s3_token.filter_factory(config)(FakeApp())
-+            self.assertIs(False, middleware.verify)
-+
-+        # Some "secure" values, including unexpected value.
-+        false_values = ['false', 'False', '0', 'no', 'someweirdvalue']
-+        for val in false_values:
-+            config = {'insecure': val, 'certfile': 'false_ind'}
-+            middleware = s3_token.filter_factory(config)(FakeApp())
-+            self.assertEqual('false_ind', middleware.verify)
-+
-+        # Default is secure.
-+        config = {'certfile': 'false_ind'}
-+        middleware = s3_token.filter_factory(config)(FakeApp())
-+        self.assertIs('false_ind', middleware.verify)
-+
- 
- class S3TokenMiddlewareTestBad(S3TokenMiddlewareTestBase):
-     def setUp(self):
--- 
-1.9.1
-
-
-

diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.3.1.ebuild
similarity index 95%
rename from dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.ebuild
rename to dev-python/python-keystoneclient/python-keystoneclient-1.3.1.ebuild
index ce9455329e8739ec50095553b91213d7fca7f1c9..2442ae1cfe3efd51d191798b0d4137383be9c9c7 100644 (file)
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.3.0-r2.ebuild,v 1.1 2015/04/14 16:17:32 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-1.3.1.ebuild,v 1.1 2015/04/28 16:28:47 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -71,7 +71,6 @@ RDEPEND="
        >=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
 "
 PATCHES=(
-"${FILESDIR}/cve-2015-1852-master-keystoneclient.patch"
 )
 
 python_prepare_all() {