diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2014-05-24 22:26:42 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2014-05-24 22:26:42 +0000 |
| commit | b6564b803240a6f543f55153b47a50475b7ff3b2 (patch) | |
| tree | d904e6d88c5096ac09e420fc81f7a880ba92aece | |
| parent | 12283202d3dda201ae753c6e671f7b492bc24d63 (diff) | |
| download | python-urllib3-b6564b803240a6f543f55153b47a50475b7ff3b2.tar python-urllib3-b6564b803240a6f543f55153b47a50475b7ff3b2.tar.gz | |
Do not use embedded copy of ssl.match_hostname
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch | 45 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 49 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 0164f98..d425682 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,10 @@ python-urllib3 (1.8.2-1) UNRELEASED; urgency=medium * debian/patches/03_force-setuptools.patch - Renamed from setuptools.patch - Added description + * debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch + - Do not use embedded copy of ssl.match_hostname - -- Daniele Tricoli <eriol@mornie.org> Sat, 24 May 2014 20:18:12 +0200 + -- Daniele Tricoli <eriol@mornie.org> Sun, 25 May 2014 00:22:12 +0200 python-urllib3 (1.8-2) unstable; urgency=medium diff --git a/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch b/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch new file mode 100644 index 0000000..e536e69 --- /dev/null +++ b/debian/patches/05_do-not-use-embedded-ssl-match-hostname.patch @@ -0,0 +1,45 @@ +Description: Do not use embedded copy of ssl.match_hostname. +Author: Daniele Tricoli <eriol@mornie.org> +Forwarded: not-needed +Last-Update: 2014-05-25 + +--- a/test/test_connectionpool.py ++++ b/test/test_connectionpool.py +@@ -6,7 +6,7 @@ + HTTPConnectionPool, + ) + from urllib3.util import Timeout +-from urllib3.packages.ssl_match_hostname import CertificateError ++from ssl import CertificateError + from urllib3.exceptions import ( + ClosedPoolError, + EmptyPoolError, +--- a/urllib3/connection.py ++++ b/urllib3/connection.py +@@ -38,7 +38,7 @@ + from .exceptions import ( + ConnectTimeoutError, + ) +-from .packages.ssl_match_hostname import match_hostname ++from ssl import match_hostname + import six + from .util import ( + assert_fingerprint, +--- a/urllib3/connectionpool.py ++++ b/urllib3/connectionpool.py +@@ -31,7 +31,7 @@ + ReadTimeoutError, + ProxyError, + ) +-from .packages.ssl_match_hostname import CertificateError ++from ssl import CertificateError + import six + from .connection import ( + port_by_scheme, +--- a/urllib3/packages/__init__.py ++++ b/urllib3/packages/__init__.py +@@ -1,4 +1,3 @@ + from __future__ import absolute_import + +-from . import ssl_match_hostname + diff --git a/debian/patches/series b/debian/patches/series index 8570821..cddf757 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 02_require-cert-verification.patch 03_force_setuptools.patch 04_relax_nosetests_options.patch +05_do-not-use-embedded-ssl-match-hostname.patch |