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

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

    Date: Monday, March 31, 2014 @ 16:27:26
  Author: eriol-guest
Revision: 28402

Refreshed 02_require-cert-verification.patch

Modified:
  packages/python-urllib3/trunk/debian/changelog
  packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch

Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog	2014-03-31 16:24:26 UTC (rev 28401)
+++ packages/python-urllib3/trunk/debian/changelog	2014-03-31 16:27:26 UTC (rev 28402)
@@ -3,8 +3,10 @@
   * New upstream release
   * debian/patches/01_do-not-use-embedded-python-six.patch
     - Refreshed
+  * debian/patches/02_require-cert-verification.patch
+    - Refreshed
 
- -- Daniele Tricoli <eriol at mornie.org>  Mon, 31 Mar 2014 17:50:10 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Mon, 31 Mar 2014 18:26:22 +0200
 
 python-urllib3 (1.7.1-1) unstable; urgency=low
 

Modified: packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch	2014-03-31 16:24:26 UTC (rev 28401)
+++ packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch	2014-03-31 16:27:26 UTC (rev 28402)
@@ -3,28 +3,20 @@
  CERT_REQUIRED and using the system /etc/ssl/certs/ca-certificates.crt
 Bug-Ubuntu: https://launchpad.net/bugs/1047054
 Bug-Debian: http://bugs.debian.org/686872
-Last-Update: 2013-10-16
+Last-Update: 2014-03-31
 
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -87,12 +87,13 @@
-     Based on httplib.HTTPSConnection but wraps the socket with
-     SSL certification.
+@@ -583,6 +583,8 @@
+     ``ssl_version`` are only used if :mod:`ssl` is available and are fed into
+     :meth:`urllib3.util.ssl_wrap_socket` to upgrade the connection socket
+     into an SSL socket.
++
++    On Debian, SSL certificate validation is required by default
      """
--    cert_reqs = None
--    ca_certs = None
-+    # On Debian, SSL certificate validation is required by default
-+    cert_reqs = 'CERT_REQUIRED'
-+    ca_certs = '/etc/ssl/certs/ca-certificates.crt'
-     ssl_version = None
  
-     def set_cert(self, key_file=None, cert_file=None,
--                 cert_reqs=None, ca_certs=None,
-+                 cert_reqs='CERT_REQUIRED', ca_certs='/etc/ssl/certs/ca-certificates.crt',
-                  assert_hostname=None, assert_fingerprint=None):
- 
-         self.key_file = key_file
-@@ -644,8 +645,8 @@
+     scheme = 'https'
+@@ -592,8 +594,8 @@
                   strict=False, timeout=None, maxsize=1,
                   block=False, headers=None,
                   _proxy=None, _proxy_headers=None,