From ced4b9fe1c8222eddc6f2e7916f19ed054484e1c Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Apr 22 2015 14:20:31 +0000
Subject: 2.6.0


---

diff --git a/.gitignore b/.gitignore
index cf66402..925063d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /requests-2.5.0.tar.gz
 /requests-2.5.1.tar.gz
 /requests-2.5.3.tar.gz
+/requests-2.6.0.tar.gz
diff --git a/python-requests-dont-ascribe-cookies.patch b/python-requests-dont-ascribe-cookies.patch
deleted file mode 100644
index dcabc25..0000000
--- a/python-requests-dont-ascribe-cookies.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3bd8afbff29e50b38f889b2f688785a669b9aafc Mon Sep 17 00:00:00 2001
-From: Cory Benfield <lukasaoz@gmail.com>
-Date: Sat, 14 Mar 2015 08:49:55 +0000
-Subject: [PATCH] Don't ascribe cookies to the target domain.
-
----
- requests/sessions.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requests/sessions.py b/requests/sessions.py
-index 4f30696..9d5498c 100644
---- a/requests/sessions.py
-+++ b/requests/sessions.py
-@@ -171,7 +171,7 @@ def resolve_redirects(self, resp, req, stream=False, timeout=None,
-             except KeyError:
-                 pass
- 
--            extract_cookies_to_jar(prepared_request._cookies, prepared_request, resp.raw)
-+            extract_cookies_to_jar(prepared_request._cookies, req, resp.raw)
-             prepared_request._cookies.update(self.cookies)
-             prepared_request.prepare_cookies(prepared_request._cookies)
- 
diff --git a/python-requests.spec b/python-requests.spec
index b5c2d9d..1324a14 100644
--- a/python-requests.spec
+++ b/python-requests.spec
@@ -5,8 +5,8 @@
 %endif
 
 Name:           python-requests
-Version:        2.5.3
-Release:        2%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 Summary:        HTTP library, written in Python, for human beings
 
 License:        ASL 2.0
@@ -19,10 +19,6 @@ Patch0:         python-requests-system-cert-bundle.patch
 # Remove an unnecessary reference to a bundled compat lib in urllib3
 Patch1:         python-requests-remove-nested-bundling-dep.patch
 
-# Backport fix for CVE-2015-2296
-# https://github.com/kennethreitz/requests/commit/3bd8afbff29e50b38f889b2f688785a669b9aafc
-Patch2:         python-requests-dont-ascribe-cookies.patch
-
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-chardet
@@ -65,8 +61,6 @@ designed to make HTTP requests easy for developers.
 %patch0 -p1
 %patch1 -p1
 
-%patch2 -p1
-
 # Unbundle the certificate bundle from mozilla.
 rm -rf requests/cacert.pem
 
@@ -147,6 +141,10 @@ popd
 %endif
 
 %changelog
+* Wed Apr 22 2015 Ralph Bean <rbean@redhat.com> - 2.6.0-1
+- new version
+- Remove patch for CVE-2015-2296, now included in the upstream release.
+
 * Mon Mar 16 2015 Ralph Bean <rbean@redhat.com> - 2.5.3-2
 - Backport fix for CVE-2015-2296.
 
diff --git a/sources b/sources
index 916e91d..07f3c4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23bf4fcc89ea8d353eb5353bb4a475b1  requests-2.5.3.tar.gz
+25287278fa3ea106207461112bb37050  requests-2.6.0.tar.gz