sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat(uwsgi): enable auto-update, upgrade to 2.0.20

Browse Source 
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
This commit is contained in:
Aditya Alok 2022-04-15 01:45:17 +05:30
parent 54beaf1a2b
commit c6090e7d2f
No known key found for this signature in database
GPG Key ID: 345AE134142077D8
2 changed files with 4 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/uwsgi/build.sh
View File

@ -2,12 +2,13 @@ TERMUX_PKG_HOMEPAGE=https://projects.unbit.it/uwsgi
TERMUX_PKG_DESCRIPTION="uWSGI application server container"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.0.19.1
TERMUX_PKG_REVISION=5
TERMUX_PKG_VERSION=2.0.20
TERMUX_PKG_SRCURL=https://github.com/unbit/uwsgi/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=bf17cdbb9bd8bcb7c1633e34d9d7308cb4cc19eb0ff2d61057f840c1ba1fc41b
TERMUX_PKG_SHA256=88ab9867d8973d8ae84719cf233b7dafc54326fcaec89683c3f9f77c002cdff9
TERMUX_PKG_DEPENDS="libandroid-glob, libandroid-sysv-semaphore, libcap, libcrypt, libjansson, libuuid, libxml2, openssl, pcre, python"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
termux_step_post_get_source() {
cp $TERMUX_PKG_BUILDER_DIR/sys_time.c ./core/

107
packages/uwsgi/use-Py_CompileString.patch
View File

@ -1,107 +0,0 @@
https://github.com/unbit/uwsgi/commit/8c890c84604a0477b46a66eab8a620733f596cc8
diff --git a/plugins/python/pyloader.c b/plugins/python/pyloader.c
index a63c375b..d8ab6fe3 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 37d0b7bb..79f29d43 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;
}