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

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

    Date: Wednesday, October 16, 2013 @ 14:54:10
  Author: eriol-guest
Revision: 26170

* debian/patches/02_require-cert-verification.patch
  - Refreshed

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	2013-10-16 14:51:31 UTC (rev 26169)
+++ packages/python-urllib3/trunk/debian/changelog	2013-10-16 14:54:10 UTC (rev 26170)
@@ -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>  Wed, 16 Oct 2013 11:30:49 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Wed, 16 Oct 2013 16:51:08 +0200
 
 python-urllib3 (1.6-2) unstable; urgency=high
 

Modified: packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch	2013-10-16 14:51:31 UTC (rev 26169)
+++ packages/python-urllib3/trunk/debian/patches/02_require-cert-verification.patch	2013-10-16 14:54:10 UTC (rev 26170)
@@ -3,18 +3,35 @@
  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-05-07
+Last-Update: 2013-10-16
 
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -523,8 +523,8 @@
-     def __init__(self, host, port=None,
+@@ -87,12 +87,13 @@
+     Based on httplib.HTTPSConnection but wraps the socket with
+     SSL certification.
+     """
+-    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 @@
                   strict=False, timeout=None, maxsize=1,
                   block=False, headers=None,
+                  _proxy=None, _proxy_headers=None,
 -                 key_file=None, cert_file=None, cert_reqs=None,
 -                 ca_certs=None, ssl_version=None,
 +                 key_file=None, cert_file=None, cert_reqs='CERT_REQUIRED',
 +                 ca_certs='/etc/ssl/certs/ca-certificates.crt', ssl_version=None,
                   assert_hostname=None, assert_fingerprint=None):
-
-         HTTPConnectionPool.__init__(self, host, port,
+ 
+         HTTPConnectionPool.__init__(self, host, port, strict, timeout, maxsize,