- Add httplib2-bnc-818100.patch (bnc#818100): Fix for subsequent

request SSL certificate validation

- Add httplib2-bnc-818100.patch (bnc#818100): Fix for subsequent
  request SSL certificate validation

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-httplib2?expand=0&rev=34
This commit is contained in:
Sascha Peilicke 2013-05-02 10:24:13 +00:00 committed by Git OBS Bridge
parent 4f4c6e432e
commit bfa6628a9f
5 changed files with 39 additions and 0 deletions

21
httplib2-bnc-818100.patch Normal file
View File

@ -0,0 +1,21 @@
diff -r 93291649202b python2/httplib2/__init__.py
--- a/python2/httplib2/__init__.py Tue Mar 26 14:17:48 2013 -0400
+++ b/python2/httplib2/__init__.py Tue Apr 23 10:32:15 2013 +0300
@@ -1030,7 +1030,7 @@
raise CertificateHostnameMismatch(
'Server presented certificate that does not match '
'host %s: %s' % (hostname, cert), hostname, cert)
- except ssl_SSLError, e:
+ except (ssl_SSLError, CertificateHostnameMismatch), e:
if sock:
sock.close()
if self.sock:
@@ -1040,7 +1040,7 @@
# to get at more detailed error information, in particular
# whether the error is due to certificate validation or
# something else (such as SSL protocol mismatch).
- if e.errno == ssl.SSL_ERROR_SSL:
+ if hasattr(e, 'errno') and e.errno == ssl.SSL_ERROR_SSL:
raise SSLHandshakeError(e)
else:
raise

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 2 10:23:29 UTC 2013 - speilicke@suse.com
- Add httplib2-bnc-818100.patch (bnc#818100): Fix for subsequent
request SSL certificate validation
-------------------------------------------------------------------
Fri Mar 22 13:30:17 UTC 2013 - speilicke@suse.com

View File

@ -26,6 +26,8 @@ Group: Development/Libraries/Python
Source: http://pypi.python.org/packages/source/h/httplib2/httplib2-%{version}.tar.gz
# PATCH-FIX-OPENSUSE: Don't ship private copy of Mozilla NSS certs, use system certs instead (bnc#761162)
Patch0: httplib2-use-system-certs.patch
# PATCH-FIX-UPSTREAM: speilicke@suse.com -- SSL certificate hostname mismatch is checked only once
Patch1: httplib2-bnc-818100.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel
# Test requirements (for ssl module):
@ -48,6 +50,7 @@ left out of other HTTP libraries.
%prep
%setup -q -n httplib2-%{version}
%patch0 -p1
%patch1 -p1
%build
python setup.py build

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 2 10:23:36 UTC 2013 - speilicke@suse.com
- Add httplib2-bnc-818100.patch (bnc#818100): Fix for subsequent
request SSL certificate validation
-------------------------------------------------------------------
Fri Jan 11 19:51:38 UTC 2013 - p.drouand@gmail.com

View File

@ -26,6 +26,8 @@ Group: Development/Libraries/Python
Source: http://pypi.python.org/packages/source/h/httplib2/httplib2-%{version}.tar.gz
# PATCH-FIX-OPENSUSE: Don't ship private copy of Mozilla NSS certs, use system certs instead (bnc#761162)
Patch0: httplib2-use-system-certs.patch
# PATCH-FIX-UPSTREAM: speilicke@suse.com -- SSL certificate hostname mismatch is checked only once
Patch1: httplib2-bnc-818100.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python3-devel
# Test requirements (for ssl module):
@ -44,6 +46,7 @@ left out of other HTTP libraries.
%prep
%setup -q -n httplib2-%{version}
%patch0 -p1
%patch1 -p1
%build
python3 setup.py build