[python-httplib2] 0.31.0-1: new upstream version

Author: eweos-helper[bot]

use-system-certificates.patch renamed to 0001-certs-use-system-certificates.patch

@@ -1,18 +1,7 @@
---- a/python2/httplib2/certs.py
-+++ b/python2/httplib2/certs.py
-@@ -19,9 +19,7 @@ except ImportError:
-     pass
- 
- 
--BUILTIN_CA_CERTS = os.path.join(
--    os.path.dirname(os.path.abspath(__file__)), "cacerts.txt"
--)
-+BUILTIN_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
- 
- 
- def where():
---- a/python3/httplib2/certs.py
-+++ b/python3/httplib2/certs.py
+diff --git a/httplib2/certs.py b/httplib2/certs.py
+index 59d1ffc70273..05339ccc6449 100644
+--- a/httplib2/certs.py
++++ b/httplib2/certs.py
 @@ -19,9 +19,7 @@ except ImportError:
      pass
 
@@ -24,15 +13,16 @@
 
 
  def where():
+diff --git a/tests/test_cacerts_from_env.py b/tests/test_cacerts_from_env.py
+index f04ba0e5d090..79d4bd905ffb 100644
 --- a/tests/test_cacerts_from_env.py
 +++ b/tests/test_cacerts_from_env.py
 @@ -9,7 +9,7 @@ import tempfile
  import httplib2
 
 
 -CA_CERTS_BUILTIN = os.path.join(os.path.dirname(httplib2.__file__), "cacerts.txt")
-+CA_CERTS_BUILTIN = "/etc/ssl/certs/ca-certificates.crt"
++CA_CERTS_BUILTIN = "/etc/ssl/certs/ca-ceriticates.crt"
  CERTIFI_CERTS_FILE = "unittest_certifi_file"
  CUSTOM_CA_CERTS = "unittest_custom_ca_certs"
 
-

PKGBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Yukari Chiba <[email protected]>
 
 pkgname=python-httplib2
-pkgver=0.22.0
-pkgrel=2
+pkgver=0.31.0
+pkgrel=1
 pkgdesc='Comprehensive HTTP client library, supporting many features'
 arch=('any')
 url='https://github.com/httplib2/httplib2'
@@ -30,19 +30,21 @@ makedepends=(
 #  'python-cryptography'
 #  'python-six'
 #)
+# 0001: Downstream, use system certificates instead of the vendored one as
+#	fallback
 source=(
   "$pkgname::git+$url#tag=v$pkgver"
-  'use-system-certificates.patch'
+  0001-certs-use-system-certificates.patch
 )
-sha512sums=('19c5ad43141c9e042cf81ee84ac5c6ee8f57a89656042708e86f8b098456df1752bdcddf0830b3514871cf9a488ebd374d3742cc21621169f1ea15c881b2a4ad'
-            '012c74d59e3138b88824abe0bb62ad1b6b9a9b98e001913c2be8a36eaa9191213f768635a9165b2a8eb76726dcbc6c6bae0f18dccb969ff29364e16304a22ed5')
+sha512sums=('3e97ca970b231388c7b29edd1aec7edde4b36266cec1f14c08ab84d6049a075d5cdabccddfc101075c75892db0a042936b298e02f3f8f28079d8a2a28a838f15'
+            'b8cc1d5c9677bd2385ddd98f03fde37eadcff50405c745a444829652595c2593e4f05ee069e8ba1180a9143999890f34cd3f93b66e0d24b2c643b7d33e6ff1b4')
 
 prepare() {
-  cd "$pkgname"
+  _patch_ "$pkgname"
 
-  # use system ca certificates
-  patch -p1 -i "$srcdir/use-system-certificates.patch"
-  rm -vf python{2,3}/httplib2/cacerts.txt
+  cd "$pkgname"
+  # Remove vendored certificates
+  rm -vf httplib2/cacerts.txt
 
   # patch requirements to allow newer versions of checkdepends
   sed -e 's/==/>=/' -i requirements-test.txt