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

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)

3 files changed, 10 insertions, 87 deletions

diff --git a/dev-python/python-keystoneclient/ChangeLog b/dev-python/python-keystoneclient/ChangeLog
index a69b40db53cc..5bc66c5c54ce 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-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/files/cve-2015-1852-master-keystoneclient.patch b/dev-python/python-keystoneclient/files/cve-2015-1852-master-keystoneclient.patch
deleted file mode 100644
index 82897fe4ca69..000000000000
--- 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
index ce9455329e87..2442ae1cfe3e 100644
--- 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() {