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

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

    Date: Thursday, January 15, 2015 @ 21:59:15
  Author: eriol-guest
Revision: 31665

Remove 06_do-not-make-SSLv3-mandatory.patch since it was merged upstream

Modified:
  packages/python-urllib3/trunk/debian/changelog
  packages/python-urllib3/trunk/debian/patches/series
Deleted:
  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/changelog	2015-01-15 11:38:46 UTC (rev 31664)
+++ packages/python-urllib3/trunk/debian/changelog	2015-01-15 21:59:15 UTC (rev 31665)
@@ -3,8 +3,10 @@
   * 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 at mornie.org>  Wed, 31 Dec 2014 18:24:49 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Thu, 15 Jan 2015 22:58:53 +0100
 
 python-urllib3 (1.9.1-3) unstable; urgency=medium
 

Deleted: 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	2015-01-15 11:38:46 UTC (rev 31664)
+++ packages/python-urllib3/trunk/debian/patches/06_do-not-make-SSLv3-mandatory.patch	2015-01-15 21:59:15 UTC (rev 31665)
@@ -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 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	2015-01-15 11:38:46 UTC (rev 31664)
+++ packages/python-urllib3/trunk/debian/patches/series	2015-01-15 21:59:15 UTC (rev 31665)
@@ -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