# HG changeset patch # User Franz Glasner # Date 1741950965 -3600 # Node ID 6aa5c9b981b214919ba8d09bcfaf166e78f06f23 # Parent 189c78b4567d1f0834cc44b7646afe75f5d29387 Bump version to 2.1.pl9: use the master branch again instead of the uwsgi-2.0 branch While there: Do not enable the SSL option by default now because we use uwsginl as backend application server that is not expsed to the Internet directly. diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl-plugin-lang-py3/Makefile --- a/uwsginl-plugin-lang-py3/Makefile Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl-plugin-lang-py3/Makefile Fri Mar 14 12:16:05 2025 +0100 @@ -2,7 +2,7 @@ PORTNAME?= ${UWSGI_NAME}-plugin-lang-py3 #DISTVERSION= 2.0.20 -PORTVERSION= 2.1.pl8.g${MYGH_TAG_DATE} +PORTVERSION= 2.1.pl9.g${MYGH_TAG_DATE} PORTREVISION?= 0 CATEGORIES?= www python # Use GitHub id for now (before official 2.1); see below diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl-plugin-lang-py3/distinfo --- a/uwsginl-plugin-lang-py3/distinfo Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl-plugin-lang-py3/distinfo Fri Mar 14 12:16:05 2025 +0100 @@ -1,3 +1,3 @@ -TIMESTAMP = 1741476806 -SHA256 (unbit-uwsgi-2.1.pl8.g20241026-02a2fc47c7cd32a5c0d1e07808f36cbe1533ecbe_GH0.tar.gz) = d688798a2e07288ce8f2b5d1164f4a07f9d6f5d6f86a3a1c0e9b33f4afa71eb0 -SIZE (unbit-uwsgi-2.1.pl8.g20241026-02a2fc47c7cd32a5c0d1e07808f36cbe1533ecbe_GH0.tar.gz) = 816517 +TIMESTAMP = 1741948920 +SHA256 (unbit-uwsgi-2.1.pl9.g20241026-89cb161cda959697a4afe013f348b06646b960aa_GH0.tar.gz) = 957c6962655c3fdf81128ed2e39c42dd6eb1c3e426357e40594394e63c8935c0 +SIZE (unbit-uwsgi-2.1.pl9.g20241026-89cb161cda959697a4afe013f348b06646b960aa_GH0.tar.gz) = 866454 diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl-plugin-lang-pypy3/Makefile --- a/uwsginl-plugin-lang-pypy3/Makefile Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl-plugin-lang-pypy3/Makefile Fri Mar 14 12:16:05 2025 +0100 @@ -2,7 +2,7 @@ PORTNAME= ${UWSGI_NAME}-plugin-lang-pypy3 #DISTVERSION= 2.0.20 -PORTVERSION= 2.1.pl8.g${MYGH_TAG_DATE} +PORTVERSION= 2.1.pl9.g${MYGH_TAG_DATE} CATEGORIES= www python # Use GitHub id for now (before official 2.1); see below #MASTER_SITES= https://projects.unbit.it/downloads/ diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl-plugin-lang-pypy3/distinfo --- a/uwsginl-plugin-lang-pypy3/distinfo Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl-plugin-lang-pypy3/distinfo Fri Mar 14 12:16:05 2025 +0100 @@ -1,3 +1,3 @@ -TIMESTAMP = 1741476794 -SHA256 (unbit-uwsgi-2.1.pl8.g20241026-02a2fc47c7cd32a5c0d1e07808f36cbe1533ecbe_GH0.tar.gz) = d688798a2e07288ce8f2b5d1164f4a07f9d6f5d6f86a3a1c0e9b33f4afa71eb0 -SIZE (unbit-uwsgi-2.1.pl8.g20241026-02a2fc47c7cd32a5c0d1e07808f36cbe1533ecbe_GH0.tar.gz) = 816517 +TIMESTAMP = 1741948883 +SHA256 (unbit-uwsgi-2.1.pl9.g20241026-89cb161cda959697a4afe013f348b06646b960aa_GH0.tar.gz) = 957c6962655c3fdf81128ed2e39c42dd6eb1c3e426357e40594394e63c8935c0 +SIZE (unbit-uwsgi-2.1.pl9.g20241026-89cb161cda959697a4afe013f348b06646b960aa_GH0.tar.gz) = 866454 diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl/Makefile --- a/uwsginl/Makefile Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl/Makefile Fri Mar 14 12:16:05 2025 +0100 @@ -3,7 +3,7 @@ PORTNAME= uwsginl #DISTVERSION= 2.0.28 # "pl" sorts before .a .b .dev ... -PORTVERSION= 2.1.pl8.g${MYGH_TAG_DATE} +PORTVERSION= 2.1.pl9.g${MYGH_TAG_DATE} CATEGORIES= www # Use GitHub id for now (before official 2.1); see below #MASTER_SITES= https://projects.unbit.it/downloads/ @@ -33,7 +33,7 @@ PLIST_SUB= PORTNAME=${PORTNAME} PLUGIN_DIR=${PLUGIN_DIR} OPTIONS_DEFINE= DEBUGSYM UWSGIDEBUG JSON PCRE XML SSL -OPTIONS_DEFAULT= SSL BUILTINYAML +OPTIONS_DEFAULT= PCRE BUILTINYAML OPTIONS_RADIO= YAML OPTIONS_RADIO_YAML= BUILTINYAML LIBYAML diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl/Makefile.gh --- a/uwsginl/Makefile.gh Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl/Makefile.gh Fri Mar 14 12:16:05 2025 +0100 @@ -3,7 +3,7 @@ USE_GITHUB= yes GH_ACCOUNT= unbit GH_PROJECT= uwsgi -# This is the commit id of 2.0.28 in branch uwsgi-2.0 -GH_TAGNAME= 02a2fc47c7cd32a5c0d1e07808f36cbe1533ecbe +# This is a commit id in the master branch as of 2024-10-26 +GH_TAGNAME= 89cb161cda959697a4afe013f348b06646b960aa MYGH_TAG_DATE= 20241026 diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl/distinfo --- a/uwsginl/distinfo Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl/distinfo Fri Mar 14 12:16:05 2025 +0100 @@ -1,3 +1,3 @@ -TIMESTAMP = 1741476781 -SHA256 (unbit-uwsgi-2.1.pl8.g20241026-02a2fc47c7cd32a5c0d1e07808f36cbe1533ecbe_GH0.tar.gz) = d688798a2e07288ce8f2b5d1164f4a07f9d6f5d6f86a3a1c0e9b33f4afa71eb0 -SIZE (unbit-uwsgi-2.1.pl8.g20241026-02a2fc47c7cd32a5c0d1e07808f36cbe1533ecbe_GH0.tar.gz) = 816517 +TIMESTAMP = 1741948825 +SHA256 (unbit-uwsgi-2.1.pl9.g20241026-89cb161cda959697a4afe013f348b06646b960aa_GH0.tar.gz) = 957c6962655c3fdf81128ed2e39c42dd6eb1c3e426357e40594394e63c8935c0 +SIZE (unbit-uwsgi-2.1.pl9.g20241026-89cb161cda959697a4afe013f348b06646b960aa_GH0.tar.gz) = 866454 diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl/files/patch-core-logging.c --- a/uwsginl/files/patch-core-logging.c Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl/files/patch-core-logging.c Fri Mar 14 12:16:05 2025 +0100 @@ -1,6 +1,6 @@ ---- core/logging.c.orig 2024-10-26 09:59:26 UTC +--- core/logging.c.orig 2024-10-26 09:39:02 UTC +++ core/logging.c -@@ -536,13 +536,23 @@ void uwsgi_log_do_rotate(char *logfile, char *rotatedf +@@ -549,13 +549,23 @@ void uwsgi_log_do_rotate(char *logfile, char *rotatedf uwsgi_error_open(logfile); exit(1); } diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl/files/patch-core_socket.c --- a/uwsginl/files/patch-core_socket.c Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl/files/patch-core_socket.c Fri Mar 14 12:16:05 2025 +0100 @@ -1,7 +1,7 @@ Fix SOCK_NONBLOCK handling for FreeBSD, copied from NetBSD. ---- core/socket.c.orig 2024-06-05 01:53:18 UTC +--- core/socket.c.orig 2024-10-26 09:39:02 UTC +++ core/socket.c -@@ -413,7 +413,7 @@ static int connect_to_unix(char *socket_name, int time +@@ -421,7 +421,7 @@ static int connect_to_unix(char *socket_name, int time memcpy(uws_addr.sun_path, socket_name, UMIN(strlen(socket_name), 102)); } @@ -10,7 +10,7 @@ uwsgi_poll.fd = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0); #else uwsgi_poll.fd = socket(AF_UNIX, SOCK_STREAM, 0); -@@ -453,7 +453,7 @@ static int connect_to_tcp(char *socket_name, int port, +@@ -461,7 +461,7 @@ static int connect_to_tcp(char *socket_name, int port, uws_addr.sin_addr.s_addr = inet_addr(socket_name); } @@ -19,7 +19,7 @@ uwsgi_poll.fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); #else uwsgi_poll.fd = socket(AF_INET, SOCK_STREAM, 0); -@@ -827,7 +827,7 @@ int timed_connect(struct pollfd *fdpoll, const struct +@@ -835,7 +835,7 @@ int timed_connect(struct pollfd *fdpoll, const struct int cnt; /* set non-blocking socket */ @@ -28,7 +28,7 @@ // hmm, nothing to do, as we are already non-blocking #else int arg = fcntl(fdpoll->fd, F_GETFL, NULL); -@@ -861,7 +861,7 @@ int timed_connect(struct pollfd *fdpoll, const struct +@@ -869,7 +869,7 @@ int timed_connect(struct pollfd *fdpoll, const struct } @@ -37,7 +37,7 @@ uwsgi_socket_b(fdpoll->fd); #else /* re-set blocking socket */ -@@ -1907,7 +1907,7 @@ int uwsgi_accept(int server_fd) { +@@ -1915,7 +1915,7 @@ int uwsgi_accept(int server_fd) { struct sockaddr_un client_src; memset(&client_src, 0, sizeof(struct sockaddr_un)); socklen_t client_src_len = 0; diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl/files/patch-plugins_corerouter_corerouter.c --- a/uwsginl/files/patch-plugins_corerouter_corerouter.c Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl/files/patch-plugins_corerouter_corerouter.c Fri Mar 14 12:16:05 2025 +0100 @@ -1,7 +1,7 @@ Fix SOCK_NONBLOCK handling for FreeBSD, copied from NetBSD. ---- plugins/corerouter/corerouter.c.orig 2024-06-05 01:59:02 UTC +--- plugins/corerouter/corerouter.c.orig 2024-10-26 09:39:02 UTC +++ plugins/corerouter/corerouter.c -@@ -822,7 +822,7 @@ void uwsgi_corerouter_loop(int id, void *data) { +@@ -881,7 +881,7 @@ void uwsgi_corerouter_loop(int id, void *data) { while (ugs) { if (ugs->gateway == &ushared->gateways[id] && ucr->interesting_fd == ugs->fd) { if (!ugs->subscription) { diff -r 189c78b4567d -r 6aa5c9b981b2 uwsginl/files/patch-proto_base.c --- a/uwsginl/files/patch-proto_base.c Fri Mar 14 11:37:40 2025 +0100 +++ b/uwsginl/files/patch-proto_base.c Fri Mar 14 12:16:05 2025 +0100 @@ -1,12 +1,12 @@ Fix SOCK_NONBLOCK handling for FreeBSD, copied from NetBSD. ---- proto/base.c.orig 2024-06-05 02:00:36 UTC +--- proto/base.c.orig 2024-10-26 09:39:02 UTC +++ proto/base.c @@ -97,7 +97,7 @@ int uwsgi_proto_base_accept(struct wsgi_request *wsgi_ int uwsgi_proto_base_accept(struct wsgi_request *wsgi_req, int fd) { wsgi_req->c_len = sizeof(struct sockaddr_un); -#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL) -+#if (defined(__linux__) ||defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL) - return accept4(fd, (struct sockaddr *) &wsgi_req->client_addr, (socklen_t *) & wsgi_req->c_len, SOCK_NONBLOCK); ++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL) + return accept4(fd, (struct sockaddr *) &wsgi_req->client_addr, (socklen_t *) & wsgi_req->c_len, SOCK_NONBLOCK); #elif defined(__linux__) int client_fd = accept(fd, (struct sockaddr *) &wsgi_req->client_addr, (socklen_t *) & wsgi_req->c_len);