aboutsummaryrefslogtreecommitdiff
path: root/net/uwsgi/patches
diff options
context:
space:
mode:
Diffstat (limited to 'net/uwsgi/patches')
-rw-r--r--net/uwsgi/patches/001-dont-hardcode-zlib.patch2
-rw-r--r--net/uwsgi/patches/002-dont-override-toolchain-optimization.patch2
-rw-r--r--net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch2
-rw-r--r--net/uwsgi/patches/010-uclibc-ng.patch2
-rw-r--r--net/uwsgi/patches/020-uwsgiconfig-system-python3.patch6
-rw-r--r--net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch10
6 files changed, 10 insertions, 14 deletions
diff --git a/net/uwsgi/patches/001-dont-hardcode-zlib.patch b/net/uwsgi/patches/001-dont-hardcode-zlib.patch
index 23ca62d5d..df007ce06 100644
--- a/net/uwsgi/patches/001-dont-hardcode-zlib.patch
+++ b/net/uwsgi/patches/001-dont-hardcode-zlib.patch
@@ -1,6 +1,6 @@
--- a/uwsgiconfig.py
+++ b/uwsgiconfig.py
-@@ -851,11 +851,11 @@ class uConf(object):
+@@ -856,11 +856,11 @@ class uConf(object):
self.cflags.append('-DUWSGI_HAS_EXECINFO')
report['execinfo'] = True
diff --git a/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch b/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch
index 196edfbdb..ff8de5df9 100644
--- a/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch
+++ b/net/uwsgi/patches/002-dont-override-toolchain-optimization.patch
@@ -1,6 +1,6 @@
--- a/uwsgiconfig.py
+++ b/uwsgiconfig.py
-@@ -680,7 +680,7 @@ class uConf(object):
+@@ -685,7 +685,7 @@ class uConf(object):
self.include_path += os.environ['UWSGI_INCLUDES'].split(',')
diff --git a/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch b/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch
index 169a309f8..6f496ef0d 100644
--- a/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch
+++ b/net/uwsgi/patches/003-hard-code-Linux-as-compilation-os.patch
@@ -1,6 +1,6 @@
--- a/uwsgiconfig.py
+++ b/uwsgiconfig.py
-@@ -5,9 +5,9 @@
+@@ -5,9 +5,9 @@ uwsgi_version = '2.0.19.1'
import os
import re
import time
diff --git a/net/uwsgi/patches/010-uclibc-ng.patch b/net/uwsgi/patches/010-uclibc-ng.patch
index e967320d9..e12c3c514 100644
--- a/net/uwsgi/patches/010-uclibc-ng.patch
+++ b/net/uwsgi/patches/010-uclibc-ng.patch
@@ -1,6 +1,6 @@
--- a/core/uwsgi.c
+++ b/core/uwsgi.c
-@@ -1820,7 +1820,7 @@ void uwsgi_plugins_atexit(void) {
+@@ -1822,7 +1822,7 @@ void uwsgi_plugins_atexit(void) {
void uwsgi_backtrace(int depth) {
diff --git a/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch b/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch
index 82522be19..7c7389269 100644
--- a/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch
+++ b/net/uwsgi/patches/020-uwsgiconfig-system-python3.patch
@@ -1,7 +1,5 @@
-Index: uwsgi-2.0.18/Makefile
-===================================================================
---- uwsgi-2.0.18.orig/Makefile
-+++ uwsgi-2.0.18/Makefile
+--- a/Makefile
++++ b/Makefile
@@ -1,4 +1,4 @@
-PYTHON := python
+PYTHON ?= python3
diff --git a/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch b/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch
index 7acdfc71c..cd4572123 100644
--- a/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch
+++ b/net/uwsgi/patches/030-plugins-cgi_adds_dontresolve_option.patch
@@ -11,8 +11,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
plugins/cgi/cgi_plugin.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
-diff --git a/plugins/cgi/cgi_plugin.c b/plugins/cgi/cgi_plugin.c
-index d032db17c..30e1cc528 100644
--- a/plugins/cgi/cgi_plugin.c
+++ b/plugins/cgi/cgi_plugin.c
@@ -15,6 +15,7 @@ struct uwsgi_cgi {
@@ -23,7 +21,7 @@ index d032db17c..30e1cc528 100644
int from_docroot;
int has_mountpoints;
struct uwsgi_dyn_dict *default_cgi;
-@@ -75,6 +76,8 @@ struct uwsgi_option uwsgi_cgi_options[] = {
+@@ -75,6 +76,8 @@ struct uwsgi_option uwsgi_cgi_options[]
{"cgi-safe", required_argument, 0, "skip security checks if the cgi file is under the specified path", uwsgi_opt_add_string_list, &uc.cgi_safe, 0},
@@ -32,7 +30,7 @@ index d032db17c..30e1cc528 100644
{0, 0, 0, 0, 0, 0, 0},
};
-@@ -475,6 +478,7 @@ static int uwsgi_cgi_request(struct wsgi_request *wsgi_req) {
+@@ -475,6 +478,7 @@ static int uwsgi_cgi_request(struct wsgi
char full_path[PATH_MAX];
char tmp_path[PATH_MAX];
@@ -40,7 +38,7 @@ index d032db17c..30e1cc528 100644
struct stat cgi_stat;
int need_free = 0;
int is_a_file = 0;
-@@ -533,6 +537,10 @@ static int uwsgi_cgi_request(struct wsgi_request *wsgi_req) {
+@@ -533,6 +537,10 @@ static int uwsgi_cgi_request(struct wsgi
uwsgi_404(wsgi_req);
return UWSGI_OK;
}
@@ -51,7 +49,7 @@ index d032db17c..30e1cc528 100644
full_path_len = strlen(tmp_path);
// add +1 to copy the null byte
-@@ -639,6 +647,11 @@ static int uwsgi_cgi_request(struct wsgi_request *wsgi_req) {
+@@ -639,6 +647,11 @@ static int uwsgi_cgi_request(struct wsgi
}
}