aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
diff options
context:
space:
mode:
authorSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 13:19:52 -0700
committerSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 13:19:52 -0700
commitc81f55d5ea254affbb6d8e87d03098d244ffe468 (patch)
tree80ac480f9e113bc246f8b43edf702caba1b141e3 /debian/patches/05_avoid-embedded-ssl-match-hostname.patch
parente233bfa0d673601895c3dccb91dba9f6adff8ef1 (diff)
parent6037bb76fda33e09811e44f56bf3dcc73daeebc4 (diff)
downloadpython-urllib3-c81f55d5ea254affbb6d8e87d03098d244ffe468.tar
python-urllib3-c81f55d5ea254affbb6d8e87d03098d244ffe468.tar.gz
Initialize git-dpm
Diffstat (limited to 'debian/patches/05_avoid-embedded-ssl-match-hostname.patch')
-rw-r--r--debian/patches/05_avoid-embedded-ssl-match-hostname.patch14
1 files changed, 12 insertions, 2 deletions
diff --git a/debian/patches/05_avoid-embedded-ssl-match-hostname.patch b/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
index 36d65e0..b440988 100644
--- a/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
+++ b/debian/patches/05_avoid-embedded-ssl-match-hostname.patch
@@ -1,11 +1,21 @@
-Description: Do not use embedded copy of ssl.match_hostname, when possible
+From 7b1a10be6a3f7b3d3765abce6da5e37bace9a80d Mon Sep 17 00:00:00 2001
+From: Stefano Rivera <stefanor@debian.org>
+Date: Thu, 8 Oct 2015 13:19:51 -0700
+Subject: Do not use embedded copy of ssl.match_hostname, when possible
+
The system python has the necessary features backported, since 2.7.8-7 (and
221a1f9155e2, releasing in 2.7.9, upstream). However, alternative python
implementations don't, yet, and urllib3 is used by pip in virtualenvs.
-Author: Stefano Rivera <stefanor@debian.org>
Forwarded: not-needed
Last-Update: 2014-11-18
+Patch-Name: 05_avoid-embedded-ssl-match-hostname.patch
+---
+ urllib3/packages/__init__.py | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/urllib3/packages/__init__.py b/urllib3/packages/__init__.py
+index 37e8351..10a3aa8 100644
--- a/urllib3/packages/__init__.py
+++ b/urllib3/packages/__init__.py
@@ -1,4 +1,9 @@