commit: d36d7fcf8d7df517ef6fc11a31a63052aae3a707 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Mon Jan 11 10:16:52 2016 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Jan 11 10:16:52 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d36d7fcf
www-servers/tornado: Drop versions vulnerable to CVE-2014-9720 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=549898 obsoletes Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=482494 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=487292 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=511514 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=535794 Package-Manager: portage-2.2.26 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> www-servers/tornado/Manifest | 2 -- .../files/tornado-3.1.1-py2_6-tests-fix.patch | 31 ---------------- .../files/unittest2-import-issue-1005.patch | 41 ---------------------- www-servers/tornado/tornado-3.1.1-r1.ebuild | 40 --------------------- www-servers/tornado/tornado-4.0.1.ebuild | 34 ------------------ 5 files changed, 148 deletions(-) diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest index aa8d149..6eabc15 100644 --- a/www-servers/tornado/Manifest +++ b/www-servers/tornado/Manifest @@ -1,4 +1,2 @@ -DIST tornado-3.1.1.tar.gz 374086 SHA256 345904bfe4a0ce5d687203f783986a73cfd7dc3a9957ee3342cd43d4e310fdc6 SHA512 13f17166153a89ecf1a16a08f0d15cd342f5de7ad964e669e015c2226e2c18297306f47ffc560164ec9f8080489a5fb81cbf6b41f89f12fe1745b0cd73524207 WHIRLPOOL 689f4ba4dc4d98ac7b7de33b15288aa90683bc529364b02c0d5d1c9090b47c5178ef520cdcc93ae94e8886278cc4a16100c167e33a05f406c9431f4a0888087b -DIST tornado-4.0.1.tar.gz 314852 SHA256 ae058668b276b1ec7383cfc911323e6d27b3b47e38a12d3d3eaf6b6577b99901 SHA512 a4e0231e77ebbc2885bab648b292b842cb15c84d66a1972de18cb00fcc611eae2794b872f070ab7d5af32dd0c6c1773527fe1332bd382c1821e1f2d5d76808fb WHIRLPOOL eafd8c3cf60c2aacdbdc495f21d4e677cf77ce5ad5ce17d8e13b66b79bb1e416f9837d1b2dfbbe6d24b6447507b71270f1abe533e260e4a960477f974623045a DIST tornado-4.2.1.tar.gz 434304 SHA256 a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969 SHA512 5bb391b05c8574c8ae5e315b7617e1259ab80e993f1230db611c5beef8058517cc588daf75fac2e0f7969668715470b06ed183c9832b22081be265beb6967e30 WHIRLPOOL 5230055b1d10c32968c1f400e3d1fffbde1cbf9b4578ec42835cb202234d24daf6d4e621622a2fc884d3db8e5b3f64d6e62d17841bb9d71ab8ab91928cd0dfe3 DIST tornado-4.3.tar.gz 450916 SHA256 c9c2d32593d16eedf2cec1b6a41893626a2649b40b21ca9c4cac4243bde2efbf SHA512 4220ae67eb8bfbe112edead47f37308eca9a272df24f073a7e5d1a0d0e90fb9f8c74b48db0d78fd995463591924800ab5268d32bcacc497ba204f164bce438bc WHIRLPOOL 13dec91628a7941623d0e8d381aa893ec6e4f1a480171bb29263c85cb11449d650488f459705c0b5d7b2d37044628caec6f14fa13762e67fce2688da6706fc78 diff --git a/www-servers/tornado/files/tornado-3.1.1-py2_6-tests-fix.patch b/www-servers/tornado/files/tornado-3.1.1-py2_6-tests-fix.patch deleted file mode 100644 index ea18df2..0000000 --- a/www-servers/tornado/files/tornado-3.1.1-py2_6-tests-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py -index b8d9c6f..998282c 100644 ---- a/tornado/test/twisted_test.py -+++ b/tornado/test/twisted_test.py -@@ -22,6 +22,7 @@ from __future__ import absolute_import, division, print_function, with_statement - import os - import shutil - import signal -+import sys - import tempfile - import threading - -@@ -477,8 +478,6 @@ if have_twisted: - 'twisted.internet.test.test_fdset.ReactorFDSetTestsBuilder': [ - "test_lostFileDescriptor", # incompatible with epoll and kqueue - ], -- 'twisted.internet.test.test_process.ProcessTestsBuilder': [ -- ], - # Process tests appear to work on OSX 10.7, but not 10.6 - #'twisted.internet.test.test_process.PTYProcessTestsBuilder': [ - # 'test_systemCallUninterruptedByChildExit', -@@ -519,6 +518,9 @@ if have_twisted: - ], - 'twisted.internet.test.test_unix.UNIXPortTestsBuilder': [], - } -+ if sys.version_info >= (2,7): -+ twisted_tests['twisted.internet.test.test_process.ProcessTestsBuilder'] = [] -+ - for test_name, blacklist in twisted_tests.items(): - try: - test_class = import_object(test_name) diff --git a/www-servers/tornado/files/unittest2-import-issue-1005.patch b/www-servers/tornado/files/unittest2-import-issue-1005.patch deleted file mode 100644 index 3ad5b91..0000000 --- a/www-servers/tornado/files/unittest2-import-issue-1005.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 79e29c62ce095984d0e9da5b7c5072eb9aa6e131 -Author: yac <y...@gentoo.org> -Date: Sat Mar 8 00:32:09 2014 +0100 - - fixes #1005 - -diff --git a/tornado/test/util.py b/tornado/test/util.py -index 3604310..e4e37f0 100644 ---- a/tornado/test/util.py -+++ b/tornado/test/util.py -@@ -3,6 +3,10 @@ from __future__ import absolute_import, division, print_function, with_statement - import os - import sys - -+# Tornado's own test suite requires the updated unittest module -+# (either py27+ or unittest2) so tornado.test.util enforces -+# this requirement, but for other users of tornado.testing we want -+# to allow the older version if unitest2 is not available. - # Encapsulate the choice of unittest or unittest2 here. - # To be used as 'from tornado.test.util import unittest'. - if sys.version_info >= (2, 7): -diff --git a/tornado/testing.py b/tornado/testing.py -index 96fdd32..cd811d4 100644 ---- a/tornado/testing.py -+++ b/tornado/testing.py -@@ -45,14 +45,7 @@ try: - except ImportError: - from io import StringIO # py3 - --# Tornado's own test suite requires the updated unittest module --# (either py27+ or unittest2) so tornado.test.util enforces --# this requirement, but for other users of tornado.testing we want --# to allow the older version if unitest2 is not available. --try: -- import unittest2 as unittest --except ImportError: -- import unittest -+from tornado.test.util import unittest - - _next_port = 10000 - diff --git a/www-servers/tornado/tornado-3.1.1-r1.ebuild b/www-servers/tornado/tornado-3.1.1-r1.ebuild deleted file mode 100644 index 8a56639..0000000 --- a/www-servers/tornado/tornado-3.1.1-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Python web framework and asynchronous networking library" -HOMEPAGE="http://www.tornadoweb.org/ https://pypi.python.org/pypi/tornado"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="curl test" - -RDEPEND="curl? ( dev-python/pycurl[$(python_gen_usedep python2_7)] )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/mock[${PYTHON_USEDEP}] - python_targets_python2_7? ( dev-python/twisted-names[python_targets_python2_7] ) - ) -" - -REQUIRED_USE="curl? ( || ( $(python_gen_useflags python2_7) ) )" - -PATCHES=( - "${FILESDIR}/unittest2-import-issue-1005.patch" - "${FILESDIR}/${P}-py2_6-tests-fix.patch" -) - -python_test() { - cd "${TMPDIR}" || die - "${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}" -} diff --git a/www-servers/tornado/tornado-4.0.1.ebuild b/www-servers/tornado/tornado-4.0.1.ebuild deleted file mode 100644 index f522bb5..0000000 --- a/www-servers/tornado/tornado-4.0.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Python web framework and asynchronous networking library" -HOMEPAGE="http://www.tornadoweb.org/ https://pypi.python.org/pypi/tornado"; -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="curl test" - -RDEPEND=" - curl? ( $(python_gen_cond_dep 'dev-python/pycurl[${PYTHON_USEDEP}]' python2_7) ) - dev-python/certifi[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( ${RDEPEND} - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) - $(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' python2_7) - dev-python/service_identity[${PYTHON_USEDEP}] - )" - -python_test() { - "${PYTHON}" -m tornado.test.runtests || die "Tests fail with ${EPYTHON}" -}
