[arch-commits] Commit in python-httplib2/trunk (PKGBUILD ssl_hostname.patch)
Felix Yan
felixonmars at archlinux.org
Mon Feb 6 06:42:14 UTC 2017
Date: Monday, February 6, 2017 @ 06:42:14
Author: felixonmars
Revision: 210289
upgpkg: python-httplib2 0.10.2-1
Modified:
python-httplib2/trunk/PKGBUILD
Deleted:
python-httplib2/trunk/ssl_hostname.patch
--------------------+
PKGBUILD | 13 ++++---------
ssl_hostname.patch | 21 ---------------------
2 files changed, 4 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-06 06:41:54 UTC (rev 210288)
+++ PKGBUILD 2017-02-06 06:42:14 UTC (rev 210289)
@@ -9,10 +9,10 @@
pkgbase=python-httplib2
pkgname=(python-httplib2 python2-httplib2)
-pkgver=0.9.2
-pkgrel=2
+pkgver=0.10.2
+pkgrel=1
pkgdesc='Comprehensive HTTP client library, supporting many features'
-url='https://github.com/jcgregorio/httplib2'
+url='https://github.com/httplib2/httplib2'
license=('MIT')
arch=('any')
makedepends=('python-setuptools' 'python2-setuptools' 'git')
@@ -19,19 +19,14 @@
depends=('ca-certificates')
provides=('httplib2')
replaces=('httplib2')
-source=("git://github.com/jcgregorio/httplib2.git#tag=$pkgver"
- 'ssl_hostname.patch'
+source=("git+https://github.com/httplib2/httplib2.git#tag=v$pkgver"
'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"
Deleted: ssl_hostname.patch
===================================================================
--- ssl_hostname.patch 2017-02-06 06:41:54 UTC (rev 210288)
+++ ssl_hostname.patch 2017-02-06 06:42:14 UTC (rev 210289)
@@ -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
More information about the arch-commits
mailing list