From 837ed63b70b5764279f46b34046b42ded9fbde53 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 27 Mar 2016 09:51:30 +0200 Subject: [PATCH] Revert "python-tornado: update to 4.3." This reverts commit e5529b8dbebd3988d81d336e2eb2adcf1e735c32. This commit is dedicated to committers who just update packages for the sake of it and clearly don't know what they're doing. Often packages are out-of-date for a reason. If don't know the reason, please do *not* touch them. Also, this commit is wrong on so many levels and thus the package broken. Good job! --- .../01_use-system-ca-certificates.patch | 35 ++++++++++++++++--- .../02_no-backports.ssl-match-hostname.patch | 19 +++++----- srcpkgs/python-tornado/template | 4 +-- 3 files changed, 43 insertions(+), 15 deletions(-) diff --git a/srcpkgs/python-tornado/patches/01_use-system-ca-certificates.patch b/srcpkgs/python-tornado/patches/01_use-system-ca-certificates.patch index c68e50caae9..36a816a8468 100644 --- a/srcpkgs/python-tornado/patches/01_use-system-ca-certificates.patch +++ b/srcpkgs/python-tornado/patches/01_use-system-ca-certificates.patch @@ -1,11 +1,36 @@ ---- setup.py.orig 2016-03-27 00:51:03.561989163 -0400 -+++ setup.py 2016-03-27 00:56:28.082046356 -0400 -@@ -132,7 +132,7 @@ +diff --git setup.py setup.py +index f09169f..d42c486 100644 +--- setup.py ++++ setup.py +@@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and # Certifi is also optional on 2.7.9+, although making our dependencies # conditional on micro version numbers seems like a bad idea # until we have more declarative metadata. - install_requires.append('certifi') + pass - if sys.version_info < (3, 5): - install_requires.append('backports_abc>=0.4') kwargs['install_requires'] = install_requires + + setup( +diff --git tornado/simple_httpclient.py tornado/simple_httpclient.py +index f0f73fa..ffe3e40 100644 +--- tornado/simple_httpclient.py ++++ tornado/simple_httpclient.py +@@ -33,17 +33,9 @@ except ImportError: + # ssl is not available on Google App Engine. + ssl = None + +-try: +- import certifi +-except ImportError: +- certifi = None +- + + def _default_ca_certs(): +- if certifi is None: +- raise Exception("The 'certifi' package is required to use https " +- "in simple_httpclient") +- return certifi.where() ++ return "/etc/ssl/certs/ca-certificates.crt" + + + class SimpleAsyncHTTPClient(AsyncHTTPClient): diff --git a/srcpkgs/python-tornado/patches/02_no-backports.ssl-match-hostname.patch b/srcpkgs/python-tornado/patches/02_no-backports.ssl-match-hostname.patch index bfb59fef93a..c985a3cc3ac 100644 --- a/srcpkgs/python-tornado/patches/02_no-backports.ssl-match-hostname.patch +++ b/srcpkgs/python-tornado/patches/02_no-backports.ssl-match-hostname.patch @@ -1,11 +1,14 @@ ---- setup.py.orig 2016-03-27 00:58:07.039283532 -0400 -+++ setup.py 2016-03-27 01:00:27.437038804 -0400 -@@ -125,7 +125,7 @@ - if sys.version_info < (2, 7): - # Only needed indirectly, for singledispatch. - install_requires.append('ordereddict') +diff --git setup.py setup.py +index f09169f..f795807 100644 +--- setup.py ++++ setup.py +@@ -121,7 +121,7 @@ def build_extension(self, ext): + if setuptools is not None: + # If setuptools is not available, you're on your own for dependencies. + install_requires = [] - if sys.version_info < (3, 2): + if sys.version_info < (2, 7, 9) or (3, 0) <= sys.version_info < (3, 2): install_requires.append('backports.ssl_match_hostname') - if sys.version_info < (3, 4): - install_requires.append('singledispatch') + kwargs['install_requires'] = install_requires + + diff --git a/srcpkgs/python-tornado/template b/srcpkgs/python-tornado/template index 9f66c65a1aa..bd95c13e9e7 100644 --- a/srcpkgs/python-tornado/template +++ b/srcpkgs/python-tornado/template @@ -1,6 +1,6 @@ # Template file for 'python-tornado' pkgname=python-tornado -version=4.3 +version=4.2.1 revision=1 wrksrc="tornado-${version}" build_style=python-module @@ -14,7 +14,7 @@ maintainer="Alessio Sergi " homepage="http://www.tornadoweb.org/" license="Apache-2.0" distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz" -checksum=c9c2d32593d16eedf2cec1b6a41893626a2649b40b21ca9c4cac4243bde2efbf +checksum=a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969 pre_build() { # remove shebang