diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /www-servers/uwsgi/files | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'www-servers/uwsgi/files')
3 files changed, 182 insertions, 0 deletions
diff --git a/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch new file mode 100644 index 000000000000..d175a99c65fb --- /dev/null +++ b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch @@ -0,0 +1,23 @@ +https://github.com/unbit/uwsgi/commit/94b28b156c26d5b0b4ba93fedb057e9aebf59545.patch + +From 94b28b156c26d5b0b4ba93fedb057e9aebf59545 Mon Sep 17 00:00:00 2001 +From: Thea Flowers <me@thea.codes> +Date: Tue, 2 Nov 2021 16:29:36 -0400 +Subject: [PATCH] Add PY_SSIZE_T_CLEAN define for Python 3.10 support + +--- + plugins/python/uwsgi_python.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/python/uwsgi_python.h b/plugins/python/uwsgi_python.h +index aca1f83b7..ec64ad80c 100644 +--- a/plugins/python/uwsgi_python.h ++++ b/plugins/python/uwsgi_python.h +@@ -1,4 +1,6 @@ + #include <uwsgi.h> ++/* See https://docs.python.org/3.10/whatsnew/3.10.html#id2 */ ++#define PY_SSIZE_T_CLEAN + #include <Python.h> + + #include <frameobject.h> + diff --git a/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix.patch b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix.patch new file mode 100644 index 000000000000..8fe64d1b3d3b --- /dev/null +++ b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix.patch @@ -0,0 +1,36 @@ +https://github.com/unbit/uwsgi/commit/c8c4bd1b5439217f2cb2f146caf162de69638bc1 + +From c8c4bd1b5439217f2cb2f146caf162de69638bc1 Mon Sep 17 00:00:00 2001 +From: Cyrille Pontvieux <cyrille@enialis.net> +Date: Thu, 1 Jul 2021 12:45:29 +0200 +Subject: [PATCH] Allow to compile on Python versions with more that two digits + (Python 3.10) + +--- + plugins/python/pyloader.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plugins/python/pyloader.c b/plugins/python/pyloader.c +index d8ab6fe35..3a1465d67 100644 +--- a/plugins/python/pyloader.c ++++ b/plugins/python/pyloader.c +@@ -22,7 +22,7 @@ PyMethodDef uwsgi_eventfd_write_method[] = { {"uwsgi_eventfd_write", py_eventfd_ + void set_dyn_pyhome(char *home, uint16_t pyhome_len) { + + +- char venv_version[15]; ++ char venv_version[30]; + PyObject *site_module; + + PyObject *pysys_dict = get_uwsgi_pydict("sys"); +@@ -45,8 +45,8 @@ void set_dyn_pyhome(char *home, uint16_t pyhome_len) { + PyDict_SetItemString(pysys_dict, "prefix", venv_path); + PyDict_SetItemString(pysys_dict, "exec_prefix", venv_path); + +- venv_version[14] = 0; +- if (snprintf(venv_version, 15, "/lib/python%d.%d", PY_MAJOR_VERSION, PY_MINOR_VERSION) == -1) { ++ bzero(venv_version, 30); ++ if (snprintf(venv_version, 30, "/lib/python%d.%d", PY_MAJOR_VERSION, PY_MINOR_VERSION) == -1) { + return; + } + diff --git a/www-servers/uwsgi/files/uwsgi-2.0.19.1-pynode-compile.patch b/www-servers/uwsgi/files/uwsgi-2.0.19.1-pynode-compile.patch new file mode 100644 index 000000000000..6bcf04ae2bc3 --- /dev/null +++ b/www-servers/uwsgi/files/uwsgi-2.0.19.1-pynode-compile.patch @@ -0,0 +1,123 @@ +https://github.com/unbit/uwsgi/commit/8c890c84604a0477b46a66eab8a620733f596cc8 + +From 8c890c84604a0477b46a66eab8a620733f596cc8 Mon Sep 17 00:00:00 2001 +From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> +Date: Sun, 22 Nov 2020 18:20:19 +0100 +Subject: [PATCH] plugins/python: use Py_CompileString + +Instead of the deprecated PyParser_SimpleParseString, PyParser_SimpleParseFile +and PyNode_Compile. +While at it fixup a possible null pointer dereference when uwsgi_open_and_read +returns an empty string. + +See https://bugs.python.org/issue40939 +--- + plugins/python/pyloader.c | 12 +----------- + plugins/python/python_plugin.c | 36 ++++++++++++++-------------------- + 2 files changed, 16 insertions(+), 32 deletions(-) + +diff --git a/plugins/python/pyloader.c b/plugins/python/pyloader.c +index a63c375b5..d8ab6fe35 100644 +--- a/plugins/python/pyloader.c ++++ b/plugins/python/pyloader.c +@@ -757,25 +757,15 @@ PyObject *uwsgi_eval_loader(void *arg1) { + + PyObject *wsgi_eval_module, *wsgi_eval_callable = NULL; + +- struct _node *wsgi_eval_node = NULL; + PyObject *wsgi_compiled_node; + +- wsgi_eval_node = PyParser_SimpleParseString(code, Py_file_input); +- if (!wsgi_eval_node) { +- PyErr_Print(); +- uwsgi_log( "failed to parse <eval> code\n"); +- exit(UWSGI_FAILED_APP_CODE); +- } +- +- wsgi_compiled_node = (PyObject *) PyNode_Compile(wsgi_eval_node, "uwsgi_eval_config"); +- ++ wsgi_compiled_node = Py_CompileString(code, "uwsgi_eval_config", Py_file_input); + if (!wsgi_compiled_node) { + PyErr_Print(); + uwsgi_log( "failed to compile eval code\n"); + exit(UWSGI_FAILED_APP_CODE); + } + +- + wsgi_eval_module = PyImport_ExecCodeModule("uwsgi_eval_config", wsgi_compiled_node); + if (!wsgi_eval_module) { + PyErr_Print(); +diff --git a/plugins/python/python_plugin.c b/plugins/python/python_plugin.c +index 37d0b7bbf..79f29d43c 100644 +--- a/plugins/python/python_plugin.c ++++ b/plugins/python/python_plugin.c +@@ -473,8 +473,7 @@ UWSGI_RELEASE_GIL + + PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) { + +- FILE *pyfile; +- struct _node *py_file_node = NULL; ++ char *pycontent; + PyObject *py_compiled_node, *py_file_module; + int is_a_package = 0; + struct stat pystat; +@@ -483,7 +482,7 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) { + + if (!uwsgi_check_scheme(filename)) { + +- pyfile = fopen(filename, "r"); ++ FILE *pyfile = fopen(filename, "r"); + if (!pyfile) { + uwsgi_log("failed to open python file %s\n", filename); + return NULL; +@@ -507,37 +506,32 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) { + } + } + +- py_file_node = PyParser_SimpleParseFile(pyfile, real_filename, Py_file_input); +- if (!py_file_node) { +- PyErr_Print(); +- uwsgi_log("failed to parse file %s\n", real_filename); +- if (is_a_package) ++ fclose(pyfile); ++ pycontent = uwsgi_simple_file_read(real_filename); ++ ++ if (!pycontent) { ++ if (is_a_package) { + free(real_filename); +- fclose(pyfile); ++ } ++ uwsgi_log("no data read from file %s\n", real_filename); + return NULL; + } + +- fclose(pyfile); + } + else { + size_t pycontent_size = 0; +- char *pycontent = uwsgi_open_and_read(filename, &pycontent_size, 1, NULL); ++ pycontent = uwsgi_open_and_read(filename, &pycontent_size, 1, NULL); + +- if (pycontent) { +- py_file_node = PyParser_SimpleParseString(pycontent, Py_file_input); +- if (!py_file_node) { +- PyErr_Print(); +- uwsgi_log("failed to parse url %s\n", real_filename); +- return NULL; +- } ++ if (!pycontent) { ++ uwsgi_log("no data read from url %s\n", real_filename); ++ return NULL; + } + } + +- py_compiled_node = (PyObject *) PyNode_Compile(py_file_node, real_filename); +- ++ py_compiled_node = Py_CompileString(pycontent, real_filename, Py_file_input); + if (!py_compiled_node) { + PyErr_Print(); +- uwsgi_log("failed to compile python file %s\n", real_filename); ++ uwsgi_log("failed to compile %s\n", real_filename); + return NULL; + } + |