[Python-modules-commits] r19651 - in packages/python-httplib2/trunk/debian (5 files)

[dktrkranz at users.alioth.debian.org]

    Date: Sunday, December 18, 2011 @ 15:03:05
  Author: dktrkranz
Revision: 19651

* debian/patches/use_system_cacerts.patch:
  - Use system ca certificates, not the bundled ones, to always use    
    the most recent ones, thanks to Marc Deslauriers (Closes: #652105).
* debian/control:
  - Depend on ca-certificates.

Added:
  packages/python-httplib2/trunk/debian/patches/
  packages/python-httplib2/trunk/debian/patches/series
  packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch
Modified:
  packages/python-httplib2/trunk/debian/changelog
  packages/python-httplib2/trunk/debian/control

Modified: packages/python-httplib2/trunk/debian/changelog
===================================================================
--- packages/python-httplib2/trunk/debian/changelog	2011-12-18 13:21:57 UTC (rev 19650)
+++ packages/python-httplib2/trunk/debian/changelog	2011-12-18 15:03:05 UTC (rev 19651)
@@ -1,3 +1,13 @@
+python-httplib2 (0.7.2-2) UNRELEASED; urgency=low
+
+  * debian/patches/use_system_cacerts.patch:
+    - Use system ca certificates, not the bundled ones, to always use
+      the most recent ones, thanks to Marc Deslauriers (Closes: #652105).
+  * debian/control:
+    - Depend on ca-certificates.
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 18 Dec 2011 16:02:21 +0100
+
 python-httplib2 (0.7.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/python-httplib2/trunk/debian/control
===================================================================
--- packages/python-httplib2/trunk/debian/control	2011-12-18 13:21:57 UTC (rev 19650)
+++ packages/python-httplib2/trunk/debian/control	2011-12-18 15:03:05 UTC (rev 19651)
@@ -12,7 +12,7 @@
 
 Package: python-httplib2
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ca-certificates
 Description: comprehensive HTTP client library written for Python
  httplib2.py supports many features left out of other HTTP libraries.
   * HTTP and HTTPS
@@ -29,7 +29,7 @@
 
 Package: python3-httplib2
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}, ca-certificates
 Description: comprehensive HTTP client library written for Python3
  httplib2.py supports many features left out of other HTTP libraries.
   * HTTP and HTTPS

Added: packages/python-httplib2/trunk/debian/patches/series
===================================================================
--- packages/python-httplib2/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-httplib2/trunk/debian/patches/series	2011-12-18 15:03:05 UTC (rev 19651)
@@ -0,0 +1 @@
+use_system_cacerts.patch

Added: packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch
===================================================================
--- packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch	                        (rev 0)
+++ packages/python-httplib2/trunk/debian/patches/use_system_cacerts.patch	2011-12-18 15:03:05 UTC (rev 19651)
@@ -0,0 +1,37 @@
+Description: Use system ca certificates, not the bundled ones
+Author: Marc Deslauriers <marc.deslauriers at canonical.com>
+Forwarded: No, distro-specific
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-httplib2/+bug/882027
+
+Index: python-httplib2-0.7.2/python2/httplib2/__init__.py
+===================================================================
+--- python-httplib2-0.7.2.orig/python2/httplib2/__init__.py	2011-11-14 12:37:38.000000000 -0500
++++ python-httplib2-0.7.2/python2/httplib2/__init__.py	2011-12-15 14:21:42.061709438 -0500
+@@ -176,9 +176,8 @@
+ # requesting that URI again.
+ DEFAULT_MAX_REDIRECTS = 5
+ 
+-# Default CA certificates file bundled with httplib2.
+-CA_CERTS = os.path.join(
+-        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
++# Use system CA certificates
++CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+ 
+ # Which headers are hop-by-hop headers by default
+ HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
+Index: python-httplib2-0.7.2/python3/httplib2/__init__.py
+===================================================================
+--- python-httplib2-0.7.2.orig/python3/httplib2/__init__.py	2011-11-14 12:37:38.000000000 -0500
++++ python-httplib2-0.7.2/python3/httplib2/__init__.py	2011-12-15 14:22:02.937709977 -0500
+@@ -119,9 +119,8 @@
+ # Which headers are hop-by-hop headers by default
+ HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
+ 
+-# Default CA certificates file bundled with httplib2.
+-CA_CERTS = os.path.join(
+-        os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
++# Use system CA certificates
++CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
+ 
+ def _get_end2end_headers(response):
+     hopbyhop = list(HOP_BY_HOP)