[python-httplib2/el6] Upstream update to 0.7.4; Applied patch suggested in issue 208

[Ding-Yi Chen]

commit 5c28c21bacadaa841921a4b91b1d6b21144eded6
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri May 4 12:09:01 2012 +1000

    Upstream update to 0.7.4; Applied patch suggested in issue 208
    
    Include the

 .gitignore                        |    1 +
 python-httplib2.getCertHost.patch |   21 +++++++++++++++++++++
 python-httplib2.spec              |   18 +++++++++++-------
 sources                           |    2 +-
 4 files changed, 34 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5df1e1..a3de500 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 httplib2-0.4.0.tar.gz
 /httplib2-0.7.2.tar.gz
+/httplib2-0.7.4.tar.gz
diff --git a/python-httplib2.getCertHost.patch b/python-httplib2.getCertHost.patch
new file mode 100644
index 0000000..08abe69
--- /dev/null
+++ b/python-httplib2.getCertHost.patch
@@ -0,0 +1,21 @@
+diff -up ./python2/httplib2/__init__.py.orig ./python2/httplib2/__init__.py
+--- ./python2/httplib2/__init__.py.orig	2012-05-03 17:09:12.836155079 +1000
++++ ./python2/httplib2/__init__.py	2012-05-03 17:10:02.149780584 +1000
+@@ -942,11 +942,12 @@ class HTTPSConnectionWithTimeout(httplib
+           list: A list of valid host globs.
+         """
+         if 'subjectAltName' in cert:
+-            return [x[1] for x in cert['subjectAltName']
+-                    if x[0].lower() == 'dns']
+-        else:
+-            return [x[0][1] for x in cert['subject']
+-                    if x[0][0].lower() == 'commonname']
++            for x in cert['subjectAltName']:
++               if x[0].lower() == 'dns':
++                   return x[1]
++
++        return [x[0][1] for x in cert['subject']
++            if x[0][0].lower() == 'commonname']
+ 
+     def _ValidateCertificateHostname(self, cert, hostname):
+         """Validates that a given hostname is valid for an SSL certificate.
diff --git a/python-httplib2.spec b/python-httplib2.spec
index 6fad37d..20b0cd5 100644
--- a/python-httplib2.spec
+++ b/python-httplib2.spec
@@ -1,6 +1,6 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           python-httplib2
-Version:        0.7.2
+Version:        0.7.4
 Release:        1%{?dist}
 Summary:        A comprehensive HTTP client library
 
@@ -9,7 +9,8 @@ License:        MIT
 URL:            http://code.google.com/p/httplib2/
 Source0:        http://httplib2.googlecode.com/files/httplib2-%{version}.tar.gz
 #Patch0:         httplib_py26.diff
-Patch1:         python-httplib2.certfile.patch
+Patch1:         %{name}.certfile.patch
+Patch2:         %{name}.getCertHost.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-setuptools-devel
@@ -24,6 +25,7 @@ other HTTP libraries.
 %setup -q -n httplib2-%{version}
 #%patch0 -p0 -b .issue39
 %patch1 -p0 -b .certfile
+%patch2 -p0 -b .getCertHost
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -42,13 +44,17 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Thu May 03 2012 Ding-Yi Chen <dchen at redhat.com> - 0.7.4-1
+- Upstream update to 0.7.4
+- Applied patch suggested in issue 208
+
 * Fri Feb 24 2012 Ding-Yi Chen <dchen at redhat.com> - 0.7.2-1
 - Upstream update to 0.7.2
   Which may fixed http://code.google.com/p/httplib2/issues/detail?id=62
   Note this version uses fedora's cert file bundle instead of httplib2
   default.
 
-* Fri Jul 29 2011 Ding-Yi Chen <dchen at redhat.com>  - 0.4.0-5
+* Fri Jul 29 2011 Ding-Yi Chen <dchen at redhat.com>  - 0.4.0-5.el6
 - Apply that address python-httplib2 (GoogleCode Hosted) issue 39
   http://code.google.com/p/httplib2/issues/detail?id=39
 
@@ -66,8 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 - minor spec cleanups
 - enable python3 support
 
-* Fri Apr 02 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 0.6.0-1
+* Fri Apr 02 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.6.0-1
 - version upgrade (#566721)
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-4
@@ -79,6 +84,5 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.4.0-2
 - Rebuild for Python 2.6
 
-* Thu Dec 27 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 0.4.0-1
+* Thu Dec 27 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.4.0-1
 - initial version
diff --git a/sources b/sources
index 4ce7f3b..92bfeb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea90d192a4ac8f727e1331ec41ea12d5  httplib2-0.7.2.tar.gz
+9501be67448bf8f673ad3f68e6d3cd22  httplib2-0.7.4.tar.gz