Mercurial > hgrepos > FreeBSD > ports > www > uwsginl

changeset 175:c567b3394ef8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MERGE: upstream uwsgi 2.0.28 as of 2024-10-26. BUGS: Just basic merge. No adjustments and no tests.
author Franz Glasner <fzglas.hg@dom66.de>
date Sat, 08 Mar 2025 20:46:03 +0100
parents 927ba0b5d294 (current diff) 72804fc47f7c (diff)
children 9f86d2b1b802
files uwsginl-plugin-lang-py3/distinfo uwsginl-plugin-lang-pypy3/distinfo uwsginl/Makefile uwsginl/distinfo uwsginl/files/patch-core_socket.c uwsginl/files/patch-plugins_corerouter_corerouter.c uwsginl/files/patch-proto_base.c
diffstat 7 files changed, 83 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/uwsginl-plugin-lang-py3/distinfo	Wed Jan 17 01:35:14 2024 +0100
+++ b/uwsginl-plugin-lang-py3/distinfo	Sat Mar 08 20:46:03 2025 +0100
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705442922
-SHA256 (unbit-uwsgi-2.1.pl7.g20231226-d95638bf70f382d44c23c13324e589696d9e49bd_GH0.tar.gz) = 0f8348d9d04546f95305a0cba569c9f69bcc6f6081810670c4154a4695be7236
-SIZE (unbit-uwsgi-2.1.pl7.g20231226-d95638bf70f382d44c23c13324e589696d9e49bd_GH0.tar.gz) = 861925
+TIMESTAMP = 1734750335
+SHA256 (unbit-uwsgi-2.0.28_GH0.tar.gz) = 4bb0762c5becb0414352cca664957206df4d6847e9a1c472e87708dc2cdad610
+SIZE (unbit-uwsgi-2.0.28_GH0.tar.gz) = 815887
--- a/uwsginl-plugin-lang-pypy3/distinfo	Wed Jan 17 01:35:14 2024 +0100
+++ b/uwsginl-plugin-lang-pypy3/distinfo	Sat Mar 08 20:46:03 2025 +0100
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705442922
-SHA256 (unbit-uwsgi-2.1.pl7.g20231226-d95638bf70f382d44c23c13324e589696d9e49bd_GH0.tar.gz) = 0f8348d9d04546f95305a0cba569c9f69bcc6f6081810670c4154a4695be7236
-SIZE (unbit-uwsgi-2.1.pl7.g20231226-d95638bf70f382d44c23c13324e589696d9e49bd_GH0.tar.gz) = 861925
+TIMESTAMP = 1734750335
+SHA256 (unbit-uwsgi-2.0.28_GH0.tar.gz) = 4bb0762c5becb0414352cca664957206df4d6847e9a1c472e87708dc2cdad610
+SIZE (unbit-uwsgi-2.0.28_GH0.tar.gz) = 815887
--- a/uwsginl/Makefile	Wed Jan 17 01:35:14 2024 +0100
+++ b/uwsginl/Makefile	Sat Mar 08 20:46:03 2025 +0100
@@ -1,7 +1,7 @@
 # Based on www/uwsgi by: Daniel Gerzo <danger@FreeBSD.org>
 
 PORTNAME=	uwsginl
-#DISTVERSION=	2.0.20
+#DISTVERSION=	2.0.28
 # "pl" sorts before .a .b .dev ...
 PORTVERSION=    2.1.pl7.g${MYGH_TAG_DATE}
 CATEGORIES=	www
@@ -19,7 +19,7 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		cpe pkgconfig python:3.8-3.11,build
+USES=		cpe pkgconfig python:3.8-3.13,build
 USE_RC_SUBR=	uwsginl
 CPE_VENDOR=	unbit
 
--- a/uwsginl/distinfo	Wed Jan 17 01:35:14 2024 +0100
+++ b/uwsginl/distinfo	Sat Mar 08 20:46:03 2025 +0100
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705442922
-SHA256 (unbit-uwsgi-2.1.pl7.g20231226-d95638bf70f382d44c23c13324e589696d9e49bd_GH0.tar.gz) = 0f8348d9d04546f95305a0cba569c9f69bcc6f6081810670c4154a4695be7236
-SIZE (unbit-uwsgi-2.1.pl7.g20231226-d95638bf70f382d44c23c13324e589696d9e49bd_GH0.tar.gz) = 861925
+TIMESTAMP = 1734750335
+SHA256 (unbit-uwsgi-2.0.28_GH0.tar.gz) = 4bb0762c5becb0414352cca664957206df4d6847e9a1c472e87708dc2cdad610
+SIZE (unbit-uwsgi-2.0.28_GH0.tar.gz) = 815887
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/uwsginl/files/patch-core_socket.c	Sat Mar 08 20:46:03 2025 +0100
@@ -0,0 +1,48 @@
+Fix SOCK_NONBLOCK handling for FreeBSD, copied from NetBSD.
+--- core/socket.c.orig	2024-06-05 01:53:18 UTC
++++ core/socket.c
+@@ -413,7 +413,7 @@ static int connect_to_unix(char *socket_name, int time
+ 		memcpy(uws_addr.sun_path, socket_name, UMIN(strlen(socket_name), 102));
+ 	}
+ 
+-#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
+ 	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,
+ 		uws_addr.sin_addr.s_addr = inet_addr(socket_name);
+ 	}
+ 
+-#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
+ 	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 
+ 	int cnt;
+ 	/* set non-blocking socket */
+ 
+-#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
+ 	// 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 
+ 	}
+ 
+ 
+-#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
+ 	uwsgi_socket_b(fdpoll->fd);
+ #else
+ 	/* re-set blocking socket */
+@@ -1907,7 +1907,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;
+-#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
+         return accept4(server_fd, (struct sockaddr *) &client_src, &client_src_len, SOCK_NONBLOCK);
+ #elif defined(__linux__)
+         int client_fd = accept(server_fd, (struct sockaddr *) &client_src, &client_src_len);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/uwsginl/files/patch-plugins_corerouter_corerouter.c	Sat Mar 08 20:46:03 2025 +0100
@@ -0,0 +1,12 @@
+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
+@@ -822,7 +822,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) {
+-#if defined(__linux__) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(SOCK_NONBLOCK) && !defined(OBSOLETE_LINUX_KERNEL)
+ 						new_connection = accept4(ucr->interesting_fd, (struct sockaddr *) &cr_addr, &cr_addr_len, SOCK_NONBLOCK);
+ 						if (new_connection < 0) {
+ 							taken = 1;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/uwsginl/files/patch-proto_base.c	Sat Mar 08 20:46:03 2025 +0100
@@ -0,0 +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
+@@ -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);
+ #elif defined(__linux__)
+ 	int client_fd = accept(fd, (struct sockaddr *) &wsgi_req->client_addr, (socklen_t *) & wsgi_req->c_len);