Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

upgpkg(main/uwsgi): 2.0.25.1

This commit is contained in:
Sylirre 2024-04-17 14:10:27 +03:00
parent 543d9ec50a
commit b1501b958f
No known key found for this signature in database
GPG Key ID: D3611414834B814C
3 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/uwsgi/build.sh
View File

@ -2,10 +2,9 @@ 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.24"
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION="2.0.25.1"
TERMUX_PKG_SRCURL=https://github.com/unbit/uwsgi/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=6be644f8c36379a97ca1c71c03c146af109983a58eacefbcfdaaff3c62d7edf8
TERMUX_PKG_SHA256=a1e4a401f71d29e49d4762223412c32a42594c415f9d72d0f759680e5b8f4cf9
TERMUX_PKG_DEPENDS="libandroid-glob, libandroid-sysv-semaphore, libandroid-utimes, libcap, libcrypt, libjansson, libuuid, libxml2, openssl, pcre, python"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_AUTO_UPDATE=true

27
packages/uwsgi/core-uwsgi.c.patch
View File

@ -1,22 +1,23 @@
--- a/core/uwsgi.c
+++ b/core/uwsgi.c
@@ -1194,6 +1194,7 @@
// in threading mode we need to use the cancel pthread subsystem
void wait_for_threads() {
diff -uNr uwsgi-2.0.25.1/core/uwsgi.c uwsgi-2.0.25.1.mod/core/uwsgi.c
--- uwsgi-2.0.25.1/core/uwsgi.c 2024-04-15 22:43:55.000000000 +0300
+++ uwsgi-2.0.25.1.mod/core/uwsgi.c 2024-04-17 13:58:37.488293121 +0300
@@ -1198,6 +1198,7 @@
// This function is called from signal handler or main thread to wait worker threads.
// `uwsgi.workers[uwsgi.mywid].manage_next_request` should be set to 0 to stop worker threads.
static void wait_for_threads() {
+#ifndef __ANDROID__
int i, ret;
// on some platform thread cancellation is REALLY flaky
@@ -1243,6 +1244,7 @@
end:
pthread_mutex_unlock(&uwsgi.six_feet_under_lock);
+#endif /* __ANDROID__ */
// This option was added because we used pthread_cancel().
@@ -1217,6 +1218,7 @@
}
}
}
+#endif
}
@@ -2718,7 +2720,7 @@
@@ -2690,7 +2692,7 @@
#ifdef __APPLE__
uwsgi_string_new_list(&uwsgi.mime_file, "/etc/apache2/mime.types");
#else

62
packages/uwsgi/uwsgiconfig.py.patch
View File

@ -1,6 +1,7 @@
--- a/uwsgiconfig.py
+++ b/uwsgiconfig.py
@@ -725,7 +725,7 @@
diff -uNr uwsgi-2.0.25.1/uwsgiconfig.py uwsgi-2.0.25.1.mod/uwsgiconfig.py
--- uwsgi-2.0.25.1/uwsgiconfig.py 2024-04-15 22:43:55.000000000 +0300
+++ uwsgi-2.0.25.1.mod/uwsgiconfig.py 2024-04-17 14:08:43.743475152 +0300
@@ -730,7 +730,7 @@
if not self.include_path:
raise
except:
@ -9,35 +10,25 @@
additional_include_paths = self.get('additional_include_paths')
if additional_include_paths:
@@ -1079,23 +1079,23 @@
# re-enable after pcre fix
if self.get('pcre'):
if self.get('pcre') == 'auto':
- pcreconf = spcall('pcre-config --libs')
+ pcreconf = spcall('sh @TERMUX_PREFIX@/bin/pcre-config --libs')
if pcreconf:
self.libs.append(pcreconf)
- pcreconf = spcall("pcre-config --cflags")
+ pcreconf = spcall("sh @TERMUX_PREFIX@/bin/pcre-config --cflags")
self.cflags.append(pcreconf)
self.gcc_list.append('core/regexp')
self.cflags.append("-DUWSGI_PCRE")
has_pcre = True
@@ -1085,13 +1085,13 @@
required_pcre = self.get('pcre')
if required_pcre:
- pcre_libs = spcall('pcre2-config --libs8')
+ pcre_libs = spcall('sh @TERMUX_PREFIX@/bin/pcre2-config --libs')
if pcre_libs:
- pcre_cflags = spcall("pcre2-config --cflags")
+ pcre_cflags = spcall("sh @TERMUX_PREFIX@/bin/pcre2-config --cflags")
pcre_define = "-DUWSGI_PCRE2"
else:
- pcreconf = spcall('pcre-config --libs')
+ pcreconf = spcall('sh @TERMUX_PREFIX@/bin/pcre-config --libs')
if pcreconf is None:
print("*** libpcre headers unavailable. uWSGI build is interrupted. You have to install pcre development package or disable pcre")
sys.exit(1)
else:
self.libs.append(pcreconf)
- pcreconf = spcall("pcre-config --cflags")
+ pcreconf = spcall("sh @TERMUX_PREFIX@/bin/pcre-config --cflags")
self.cflags.append(pcreconf)
self.gcc_list.append('core/regexp')
self.cflags.append("-DUWSGI_PCRE")
@@ -1123,7 +1123,7 @@
- pcre_libs = spcall('pcre-config --libs')
- pcre_cflags = spcall("pcre-config --cflags")
+ pcre_libs = spcall('sh @TERMUX_PREFIX@/bin/pcre-config --libs')
+ pcre_cflags = spcall("sh @TERMUX_PREFIX@/bin/pcre-config --cflags")
pcre_define = "-DUWSGI_PCRE"
else:
pcre_libs = None
@@ -1130,7 +1130,7 @@
if self.has_include('uuid/uuid.h'):
self.cflags.append("-DUWSGI_UUID")
@ -46,7 +37,7 @@
self.libs.append('-luuid')
if self.get('append_version'):
@@ -1310,10 +1310,10 @@
@@ -1315,10 +1315,10 @@
if self.get('xml'):
if self.get('xml') == 'auto':
@ -59,7 +50,7 @@
self.cflags.append(xmlconf)
self.cflags.append("-DUWSGI_XML -DUWSGI_XML_LIBXML2")
self.gcc_list.append('core/xmlconf')
@@ -1324,7 +1324,7 @@
@@ -1329,13 +1329,13 @@
self.gcc_list.append('core/xmlconf')
report['xml'] = 'expat'
elif self.get('xml') == 'libxml2':
@ -68,3 +59,10 @@
if xmlconf is None:
print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML")
sys.exit(1)
else:
self.libs.append(xmlconf)
- xmlconf = spcall("xml2-config --cflags")
+ xmlconf = spcall("sh @TERMUX_PREFIX@/bin/xml2-config --cflags")
if xmlconf is None:
print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML")
sys.exit(1)