diff options
Diffstat (limited to 'www-servers/gunicorn')
| -rw-r--r-- | www-servers/gunicorn/Manifest | 3 | ||||
| -rw-r--r-- | www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch | 31 | ||||
| -rw-r--r-- | www-servers/gunicorn/gunicorn-20.1.0.ebuild | 3 |
3 files changed, 35 insertions, 2 deletions
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest index f2f616357768..2ab6263c3945 100644 --- a/www-servers/gunicorn/Manifest +++ b/www-servers/gunicorn/Manifest @@ -1,4 +1,5 @@ +AUX gunicorn-20.1.0-new-eventlet.patch 1103 BLAKE2B 3329864c05238c3b2a6e38727991f7273bb0fe5aa8e3e4c09cd2f7132b5d47fb9ee02fde171abbfc64d84ab0bf11b6712101e8510935d284175ea46771bc8f5b SHA512 cf404efa930c1e6948a8d2508107315d380bbd55a54df1e2a2e8472bbf392383a8505cc7dc15077f1d182f7be9ece558676470a6dbedbfcb0d873438b82fa9b8 AUX gunicorn-20.1.0-tests_optional_modules.patch 622 BLAKE2B 27efd7afd2c69e65622091f9fbc59e5db1efbd519015c51cc607735cb6c709b2234e3ee5fce045f3d2c3eb67099b68ae5295d7000df893775e3a28c050b5b0ce SHA512 42ef99e0ae1b125e379cd2d6ef3dd917de640db96411495eaa04c09eae88254fa7930f00de72571aca3320454eef2fdd54d16c97bb09b45abd7232965e4fb861 DIST gunicorn-20.1.0.tar.gz 354960 BLAKE2B bae414a8da7a4dbdf79e0b46f517138534521a1a8544f4ea2e1e27e6778d2f6ad8d6a8af02590fedad47d305acdea53f1cdbc4deeda3619fc4a5ffef0932bea1 SHA512 4fd905f62adc30e044cf2a56a1a77e14bc633258267d6bfbd4f6a68494f93f377e9fb9ed94fab7f11f9d7813857a680974a88c4b6bf97d4f1b74792a81810111 -EBUILD gunicorn-20.1.0.ebuild 1431 BLAKE2B 8ffaf7b47cc8d9ae0c0b0ce568195f0f8b14a5d19d3c7b350630dfb17319e5b3f71da98b285cc9cd1ccc7fbb385be457af027ea823cd494654825088e905f494 SHA512 133f4328830d900890d34fb2bfb100786b65e9b131c3d5c9cd3b60a3d5696f34ab79844569084d3f486d1ad7d7a3be3c948db87ccff3f421624bd761cf7d94df +EBUILD gunicorn-20.1.0.ebuild 1471 BLAKE2B 5cbcf5ae0de263945a67b67adb8f4f0bc7f918cd83033da7240ac85c1406c2ecd78e14941fe272fa04256cd25f320f7956db5f61a54185cd8ad73a4bc406eb58 SHA512 fd71234fd75286148c97e95247f7124926a04e1d9ea556efe7edea56326c8821096a5261a76e62ee481f7495faf4835784dffe39392853490f8f3df2784f9a83 MISC metadata.xml 820 BLAKE2B d0d69bf646aea74e6b85daee66e739857ff027050bf3085c6f56eadaaca90297825234477d0b4b9540646edf92d7b5daabe523336545e756b5d1a9d17e34c95c SHA512 fc0e570d92321b0255fecb3511fa313a3caa8686f7956438e18ccaff802b0ea0edccc9a196f356fd9d24370100edfae0470d0afdeafa6a7398330829d8a95644 diff --git a/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch b/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch new file mode 100644 index 000000000000..0ba4faffe639 --- /dev/null +++ b/www-servers/gunicorn/files/gunicorn-20.1.0-new-eventlet.patch @@ -0,0 +1,31 @@ +From a244b149b15c4417b4f0a4b4a57a1f8c296e968e Mon Sep 17 00:00:00 2001 +From: Daniel Bibik <55541040+Boring-Mind@users.noreply.github.com> +Date: Mon, 10 May 2021 12:31:29 +0300 +Subject: [PATCH] Fix compatibility with latest eventlet + +Fix issue with import error while using latest eventlet (>=0.30.3). + +Changes made in eventlet: https://github.com/benoitc/gunicorn/pull/2581 +--- + gunicorn/workers/geventlet.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py +index ffdb206c0..06477e74d 100644 +--- a/gunicorn/workers/geventlet.py ++++ b/gunicorn/workers/geventlet.py +@@ -17,7 +17,13 @@ + + from eventlet import hubs, greenthread + from eventlet.greenio import GreenSocket +-from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED ++ ++try: ++ from eventlet.wsgi import ALREADY_HANDLED as EVENTLET_ALREADY_HANDLED ++except ImportError: ++ # Since eventlet 0.30.3 ++ from eventlet.wsgi import WSGI_LOCAL as EVENTLET_ALREADY_HANDLED ++ + import greenlet + + from gunicorn.workers.base_async import AsyncWorker diff --git a/www-servers/gunicorn/gunicorn-20.1.0.ebuild b/www-servers/gunicorn/gunicorn-20.1.0.ebuild index 937224d87db1..462bfab82950 100644 --- a/www-servers/gunicorn/gunicorn-20.1.0.ebuild +++ b/www-servers/gunicorn/gunicorn-20.1.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( pypy3 python3_{7..9} ) +PYTHON_COMPAT=( pypy3 python3_{8..10} ) inherit distutils-r1 optfeature @@ -22,6 +22,7 @@ RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]" PATCHES=( "${FILESDIR}"/${PN}-20.1.0-tests_optional_modules.patch + "${FILESDIR}"/${P}-new-eventlet.patch ) DOCS=( README.rst ) |