[Python-modules-commits] r31483 - in packages/python-urllib3/trunk/debian (3 files)

[eriol-guest at users.alioth.debian.org]

    Date: Thursday, November 20, 2014 @ 13:28:03
  Author: eriol-guest
Revision: 31483

* debian/patches/06_do-not-make-SSLv3-mandatory.patch
  - Since SSL version 3 is insicure it is supported only if Python
    supports it. (Closes: 770246)

Added:
  packages/python-urllib3/trunk/debian/patches/06_do-not-make-SSLv3-mandatory.patch
Modified:
  packages/python-urllib3/trunk/debian/changelog
  packages/python-urllib3/trunk/debian/patches/series

Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog	2014-11-20 12:54:52 UTC (rev 31482)
+++ packages/python-urllib3/trunk/debian/changelog	2014-11-20 13:28:03 UTC (rev 31483)
@@ -1,12 +1,17 @@
 python-urllib3 (1.9.1-3) UNRELEASED; urgency=medium
 
-  * Team upload.
+  [ Stefano Rivera ]
   * Replace 05_do-not-use-embedded-ssl-match-hostname.patch with
     05_avoid-embedded-ssl-match-hostname.patch. Users may use virtualenv with
     cPython << 2.7.9 (or Debian python2.7 2.7.8-7). (Closes: 755106, 763389)
 
- -- Stefano Rivera <stefanor at debian.org>  Tue, 18 Nov 2014 12:45:49 -0800
+  [ Daniele Tricoli ]
+  * debian/patches/06_do-not-make-SSLv3-mandatory.patch
+    - Since SSL version 3 is insicure it is supported only if Python
+      supports it. (Closes: 770246)
 
+ -- Daniele Tricoli <eriol at mornie.org>  Thu, 20 Nov 2014 13:17:59 +0100
+
 python-urllib3 (1.9.1-2) unstable; urgency=medium
 
   * debian/control

Added: packages/python-urllib3/trunk/debian/patches/06_do-not-make-SSLv3-mandatory.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/06_do-not-make-SSLv3-mandatory.patch	                        (rev 0)
+++ packages/python-urllib3/trunk/debian/patches/06_do-not-make-SSLv3-mandatory.patch	2014-11-20 13:28:03 UTC (rev 31483)
@@ -0,0 +1,25 @@
+Description: Since SSL version 3 is insicure 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 at 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,

Modified: packages/python-urllib3/trunk/debian/patches/series
===================================================================
--- packages/python-urllib3/trunk/debian/patches/series	2014-11-20 12:54:52 UTC (rev 31482)
+++ packages/python-urllib3/trunk/debian/patches/series	2014-11-20 13:28:03 UTC (rev 31483)
@@ -3,3 +3,4 @@
 03_force_setuptools.patch
 04_relax_nosetests_options.patch
 05_avoid-embedded-ssl-match-hostname.patch
+06_do-not-make-SSLv3-mandatory.patch