aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/06_do-not-make-SSLv3-mandatory.patch25
-rw-r--r--debian/patches/series1
3 files changed, 3 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog
index 3b7043e..b26b20b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ python-urllib3 (1.10-1) UNRELEASED; urgency=medium
* New upstream release.
* debian/patches/01_do-not-use-embedded-python-six.patch
- Refresh.
+ * debian/patches/06_do-not-make-SSLv3-mandatory.patch
+ - Remove since it was merged upstream.
- -- Daniele Tricoli <eriol@mornie.org> Wed, 31 Dec 2014 18:24:49 +0100
+ -- Daniele Tricoli <eriol@mornie.org> Thu, 15 Jan 2015 22:58:53 +0100
python-urllib3 (1.9.1-3) unstable; urgency=medium
diff --git a/debian/patches/06_do-not-make-SSLv3-mandatory.patch b/debian/patches/06_do-not-make-SSLv3-mandatory.patch
deleted file mode 100644
index c072d60..0000000
--- a/debian/patches/06_do-not-make-SSLv3-mandatory.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Since SSL version 3 is insecure it is supported only if Python
- supports it. In Debian SSL version 3 is disabled in system Python since
- 2.7.8-12.
-Author: Daniele Tricoli <eriol@mornie.org>
-Forwarded: https://github.com/shazow/urllib3/issues/487#issuecomment-63805742
-Last/Update: 2014-11-20
-
---- a/urllib3/contrib/pyopenssl.py
-+++ b/urllib3/contrib/pyopenssl.py
-@@ -70,9 +70,14 @@
- # Map from urllib3 to PyOpenSSL compatible parameter-values.
- _openssl_versions = {
- ssl.PROTOCOL_SSLv23: OpenSSL.SSL.SSLv23_METHOD,
-- ssl.PROTOCOL_SSLv3: OpenSSL.SSL.SSLv3_METHOD,
- ssl.PROTOCOL_TLSv1: OpenSSL.SSL.TLSv1_METHOD,
- }
-+
-+try:
-+ _openssl_versions.update({ssl.PROTOCOL_SSLv3: OpenSSL.SSL.SSLv3_METHOD})
-+except AttributeError:
-+ pass
-+
- _openssl_verify = {
- ssl.CERT_NONE: OpenSSL.SSL.VERIFY_NONE,
- ssl.CERT_OPTIONAL: OpenSSL.SSL.VERIFY_PEER,
diff --git a/debian/patches/series b/debian/patches/series
index 30602ad..b77d657 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
03_force_setuptools.patch
04_relax_nosetests_options.patch
05_avoid-embedded-ssl-match-hostname.patch
-06_do-not-make-SSLv3-mandatory.patch