Date: Saturday, May 3, 2014 @ 12:16:18 Author: arodseth Revision: 110551
archrelease: copy trunk to community-any Added: python-httplib2/repos/community-any/PKGBUILD (from rev 110550, python-httplib2/trunk/PKGBUILD) python-httplib2/repos/community-any/cert.patch (from rev 110550, python-httplib2/trunk/cert.patch) python-httplib2/repos/community-any/ssl_hostname.patch (from rev 110550, python-httplib2/trunk/ssl_hostname.patch) --------------------+ PKGBUILD | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ cert.patch | 30 ++++++++++++++++++++++++ ssl_hostname.patch | 21 +++++++++++++++++ 3 files changed, 114 insertions(+) Copied: python-httplib2/repos/community-any/PKGBUILD (from rev 110550, python-httplib2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-05-03 10:16:18 UTC (rev 110551) @@ -0,0 +1,63 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Jan de Groot <j...@archlinux.org> +# Contributor: Giorgio Lando <patroc...@gmail.com> +# Contributor: Nicolas Quienot <niQo@aur> +# Contributor: Jesse Young <jesse.yo...@gmail.com> +# Contributor: Anton Eliasson <de...@antoneliasson.se> + +pkgbase=python-httplib2 +pkgname=(python-httplib2 python2-httplib2) +pkgver=0.9 +pkgrel=1 +pkgdesc='Comprehensive HTTP client library, supporting many features' +url='http://code.google.com/p/httplib2/' +license=('MIT') +arch=('any') +makedepends=('python' 'python2' 'git') +depends=('ca-certificates') +provides=('httplib2') +replaces=('httplib2') +source=("git://github.com/jcgregorio/httplib2.git#tag=v$pkgver" + 'ssl_hostname.patch' + 'cert.patch') +sha256sums=('SKIP' + 'd29fa108291a24f0708f04867f0479247ecbdd1fcf1617588b6650038d95554a' + 'ba05f491fd07afec6abc6bccb08369906f8e6f1a808d94a54fe4e7be7d9771d9') + +prepare() { + pushd "${pkgbase/python-}" + # Patch, ref FS#36839 + patch -p1 -i "$srcdir/ssl_hostname.patch" + # Patch, ref FS#40179 + patch -p1 -i "$srcdir/cert.patch" + popd + + # Prepare one build directory for each package + cp -a "${pkgbase/python-}" "${pkgname[0]}" + cp -a "${pkgbase/python-}" "${pkgname[1]}" +} + +package_python-httplib2() { + depends=('python') + + cd "$pkgname" + python setup.py install --root="$pkgdir" + + # The MIT license file is missing. Opened an issue at + # https://github.com/jcgregorio/httplib2/issues/268 + #install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-httplib2() { + depends=('python2') + + cd "$pkgname" + python2 setup.py install --root="$pkgdir" + + # The MIT license file is missing. Opened an issue at + # https://github.com/jcgregorio/httplib2/issues/268 + #install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: Copied: python-httplib2/repos/community-any/cert.patch (from rev 110550, python-httplib2/trunk/cert.patch) =================================================================== --- cert.patch (rev 0) +++ cert.patch 2014-05-03 10:16:18 UTC (rev 110551) @@ -0,0 +1,30 @@ +diff -ur httplib2-0.8.orig/python2/httplib2/__init__.py httplib2-0.8/python2/httplib2/__init__.py +--- httplib2-0.8.orig/python2/httplib2/__init__.py 2014-05-01 23:25:52.459852279 +0200 ++++ httplib2-0.8/python2/httplib2/__init__.py 2014-05-01 23:28:08.822391994 +0200 +@@ -190,9 +190,8 @@ + import ca_certs_locater + CA_CERTS = ca_certs_locater.get() + except ImportError: +- # 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'] +diff -ur httplib2-0.8.orig/python3/httplib2/__init__.py httplib2-0.8/python3/httplib2/__init__.py +--- httplib2-0.8.orig/python3/httplib2/__init__.py 2013-03-06 21:40:54.000000000 +0100 ++++ httplib2-0.8/python3/httplib2/__init__.py 2014-05-01 23:28:36.822913468 +0200 +@@ -123,9 +123,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) Copied: python-httplib2/repos/community-any/ssl_hostname.patch (from rev 110550, python-httplib2/trunk/ssl_hostname.patch) =================================================================== --- ssl_hostname.patch (rev 0) +++ ssl_hostname.patch 2014-05-03 10:16:18 UTC (rev 110551) @@ -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