From 1512ea4fcdeb9c7fe5b7b3b8fdf95ad052052cbe Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Wed, 25 Jan 2017 23:53:45 +0100 Subject: [PATCH] python-requests: update to 2.13.0 --- .../patches/use-system-cacerts.patch | 14 -------------- srcpkgs/python-requests/template | 12 +++++------- 2 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/python-requests/patches/use-system-cacerts.patch diff --git a/srcpkgs/python-requests/patches/use-system-cacerts.patch b/srcpkgs/python-requests/patches/use-system-cacerts.patch deleted file mode 100644 index 5b5f50d032..0000000000 --- a/srcpkgs/python-requests/patches/use-system-cacerts.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git requests/certs.py requests/certs.py -index 07e6475..2f2d79b 100644 ---- requests/certs.py -+++ requests/certs.py -@@ -18,8 +18,7 @@ try: - except ImportError: - def where(): - """Return the preferred certificate bundle.""" -- # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return '/etc/ssl/certs/ca-certificates.crt' - - if __name__ == '__main__': - print(where()) diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template index f6fa7fb7ad..aed86124b2 100644 --- a/srcpkgs/python-requests/template +++ b/srcpkgs/python-requests/template @@ -1,6 +1,6 @@ # Template file for 'python-requests' pkgname=python-requests -version=2.12.5 +version=2.13.0 revision=1 noarch=yes wrksrc="requests-${version}" @@ -13,19 +13,17 @@ maintainer="Alessio Sergi " homepage="http://python-requests.org/" license="Apache-2.0" distfiles="${PYPI_SITE}/r/requests/requests-${version}.tar.gz" -checksum=d902a54f08d086a7cc6e58c20e2bb225b1ae82c19c35e5925269ee94fb9fce00 +checksum=5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8 -pre_build() { - # remove bundled cacerts - rm -f requests/cacert.pem -} post_install() { - # replace bundled copy of chardet, urllib3, and idna + # replace bundled copy of cacert, chardet, urllib3, and idna for py_sitelib in $py2_sitelib $py3_sitelib; do + rm -rf ${DESTDIR}/${py_sitelib}/requests/cacert.pem rm -rf ${DESTDIR}/${py_sitelib}/requests/packages/{chardet,urllib3,idna} ln -sf ../../chardet ${DESTDIR}/${py_sitelib}/requests/packages/chardet ln -sf ../../urllib3 ${DESTDIR}/${py_sitelib}/requests/packages/urllib3 ln -sf ../../idna ${DESTDIR}/${py_sitelib}/requests/packages/idna + ln -sf /etc/ssl/cert.pem ${DESTDIR}/${py_sitelib}/requests/cacert.pem done }