Hello community, here is the log from the commit of package python-httplib2 for openSUSE:Factory checked in at 2013-05-02 15:30:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-httplib2 (Old) and /work/SRC/openSUSE:Factory/.python-httplib2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-httplib2" Changes: -------- --- /work/SRC/openSUSE:Factory/python-httplib2/python-httplib2.changes 2013-03-30 15:00:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-httplib2.new/python-httplib2.changes 2013-05-02 15:30:43.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 2 10:23:29 UTC 2013 - [email protected] + +- Add httplib2-bnc-818100.patch (bnc#818100): Fix for subsequent + request SSL certificate validation + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-httplib2/python3-httplib2.changes 2013-02-25 20:40:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-httplib2.new/python3-httplib2.changes 2013-05-02 15:30:43.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 2 10:23:36 UTC 2013 - [email protected] + +- Add httplib2-bnc-818100.patch (bnc#818100): Fix for subsequent + request SSL certificate validation + +------------------------------------------------------------------- New: ---- httplib2-bnc-818100.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-httplib2.spec ++++++ --- /var/tmp/diff_new_pack.WizFUB/_old 2013-05-02 15:30:44.000000000 +0200 +++ /var/tmp/diff_new_pack.WizFUB/_new 2013-05-02 15:30:44.000000000 +0200 @@ -26,6 +26,8 @@ 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: [email protected] -- 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 @@ %prep %setup -q -n httplib2-%{version} %patch0 -p1 +%patch1 -p1 %build python setup.py build ++++++ python3-httplib2.spec ++++++ --- /var/tmp/diff_new_pack.WizFUB/_old 2013-05-02 15:30:44.000000000 +0200 +++ /var/tmp/diff_new_pack.WizFUB/_new 2013-05-02 15:30:44.000000000 +0200 @@ -26,6 +26,8 @@ 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: [email protected] -- 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 @@ %prep %setup -q -n httplib2-%{version} %patch0 -p1 +%patch1 -p1 %build python3 setup.py build ++++++ httplib2-bnc-818100.patch ++++++ 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
