[arch-commits] Commit in python-httplib2/repos/community-any (6 files)
Felix Yan
fyan at archlinux.org
Sun Apr 12 04:44:08 UTC 2015
Date: Sunday, April 12, 2015 @ 06:44:07
Author: fyan
Revision: 131218
archrelease: copy trunk to community-any
Added:
python-httplib2/repos/community-any/PKGBUILD
(from rev 131217, python-httplib2/trunk/PKGBUILD)
python-httplib2/repos/community-any/cert.patch
(from rev 131217, python-httplib2/trunk/cert.patch)
python-httplib2/repos/community-any/ssl_hostname.patch
(from rev 131217, python-httplib2/trunk/ssl_hostname.patch)
Deleted:
python-httplib2/repos/community-any/PKGBUILD
python-httplib2/repos/community-any/cert.patch
python-httplib2/repos/community-any/ssl_hostname.patch
--------------------+
PKGBUILD | 123 +++++++++++++++++++++++++--------------------------
cert.patch | 60 ++++++++++++------------
ssl_hostname.patch | 42 ++++++++---------
3 files changed, 112 insertions(+), 113 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-04-12 04:43:45 UTC (rev 131217)
+++ PKGBUILD 2015-04-12 04:44:07 UTC (rev 131218)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Giorgio Lando <patroclo7 at gmail.com>
-# Contributor: Nicolas Quienot <niQo at aur>
-# Contributor: Jesse Young <jesse.young at gmail.com>
-# Contributor: Anton Eliasson <devel at antoneliasson.se>
-
-pkgbase=python-httplib2
-pkgname=(python-httplib2 python2-httplib2)
-pkgver=0.9
-pkgrel=3
-pkgdesc='Comprehensive HTTP client library, supporting many features'
-url='https://github.com/jcgregorio/httplib2'
-license=('MIT')
-arch=('any')
-makedepends=('python-setuptools' 'python2-setuptools' 'git')
-depends=('ca-certificates')
-provides=('httplib2')
-replaces=('httplib2')
-#source=("git://github.com/jcgregorio/httplib2.git#tag=v$pkgver"
-source=("git://github.com/jcgregorio/httplib2.git#commit=7d1b88a3cf"
- '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 -O1 --root="$pkgdir"
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_python2-httplib2() {
- depends=('python2')
-
- cd "$pkgname"
- python2 setup.py install -O1 --root="$pkgdir"
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: python-httplib2/repos/community-any/PKGBUILD (from rev 131217, python-httplib2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-04-12 04:44:07 UTC (rev 131218)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Giorgio Lando <patroclo7 at gmail.com>
+# Contributor: Nicolas Quienot <niQo at aur>
+# Contributor: Jesse Young <jesse.young at gmail.com>
+# Contributor: Anton Eliasson <devel at antoneliasson.se>
+
+pkgbase=python-httplib2
+pkgname=(python-httplib2 python2-httplib2)
+pkgver=0.9.1
+pkgrel=1
+pkgdesc='Comprehensive HTTP client library, supporting many features'
+url='https://github.com/jcgregorio/httplib2'
+license=('MIT')
+arch=('any')
+makedepends=('python-setuptools' 'python2-setuptools' '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 -O1 --root="$pkgdir"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_python2-httplib2() {
+ depends=('python2')
+
+ cd "$pkgname"
+ python2 setup.py install -O1 --root="$pkgdir"
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: cert.patch
===================================================================
--- cert.patch 2015-04-12 04:43:45 UTC (rev 131217)
+++ cert.patch 2015-04-12 04:44:07 UTC (rev 131218)
@@ -1,30 +0,0 @@
-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/cert.patch (from rev 131217, python-httplib2/trunk/cert.patch)
===================================================================
--- cert.patch (rev 0)
+++ cert.patch 2015-04-12 04:44:07 UTC (rev 131218)
@@ -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)
Deleted: ssl_hostname.patch
===================================================================
--- ssl_hostname.patch 2015-04-12 04:43:45 UTC (rev 131217)
+++ ssl_hostname.patch 2015-04-12 04:44:07 UTC (rev 131218)
@@ -1,21 +0,0 @@
-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
Copied: python-httplib2/repos/community-any/ssl_hostname.patch (from rev 131217, python-httplib2/trunk/ssl_hostname.patch)
===================================================================
--- ssl_hostname.patch (rev 0)
+++ ssl_hostname.patch 2015-04-12 04:44:07 UTC (rev 131218)
@@ -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
More information about the arch-commits
mailing list