From dee2e3026884725fed1344f63f4d4daa5d589ad7 Mon Sep 17 00:00:00 2001
From: shadchin <shadchin@openbsd.org>
Date: Sat, 11 Apr 2015 16:38:54 +0000
Subject: [PATCH] Update to py-requests 2.6.0.

---
 www/py-requests/Makefile                         |  5 ++---
 www/py-requests/distinfo                         |  4 ++--
 .../patches/patch-requests_sessions_py           | 16 ----------------
 3 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 www/py-requests/patches/patch-requests_sessions_py

diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile
index 3fba1b47191..34081a6b1f8 100644
--- a/www/py-requests/Makefile
+++ b/www/py-requests/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2015/04/02 14:21:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2015/04/11 16:38:54 shadchin Exp $
 
 COMMENT=	elegant and simple HTTP library for Python
 
-MODPY_EGG_VERSION=2.5.1
+MODPY_EGG_VERSION=2.6.0
 DISTNAME=	requests-${MODPY_EGG_VERSION}
-REVISION=	0
 PKGNAME=	py-requests-${MODPY_EGG_VERSION}
 
 CATEGORIES=	www
diff --git a/www/py-requests/distinfo b/www/py-requests/distinfo
index cc640f7fcf2..9f8ed432410 100644
--- a/www/py-requests/distinfo
+++ b/www/py-requests/distinfo
@@ -1,2 +1,2 @@
-SHA256 (requests-2.5.1.tar.gz) = e3c179Ox4jI9yfzvBgs4DQX18YvQ8kf16edKYoJ53mY=
-SIZE (requests-2.5.1.tar.gz) = 443633
+SHA256 (requests-2.6.0.tar.gz) = HNvtHw4jbzXvVOkZmCx6M45P6jeGMQkz06eIegS3TXU=
+SIZE (requests-2.6.0.tar.gz) = 450389
diff --git a/www/py-requests/patches/patch-requests_sessions_py b/www/py-requests/patches/patch-requests_sessions_py
deleted file mode 100644
index 042cf82661a..00000000000
--- a/www/py-requests/patches/patch-requests_sessions_py
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-requests_sessions_py,v 1.1 2015/03/23 15:26:19 jasper Exp $
-
-Security fix for CVE-2015-2296 python-requests: session fixation and cookie stealing vulnerability
-http://www.openwall.com/lists/oss-security/2015/03/14/4
-
---- requests/sessions.py.orig	Mon Mar 23 15:41:06 2015
-+++ requests/sessions.py	Mon Mar 23 15:41:42 2015
-@@ -171,7 +171,7 @@ class SessionRedirectMixin(object):
-             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)
-