From nobody Wed Jun 5 02:15:25 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vv9zL1wyYz5NKjF; Wed, 05 Jun 2024 02:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vv9zL1D3mz4bHy; Wed, 5 Jun 2024 02:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717553726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ZV1B3OOHvQt9+owpqtPzC5jk6Fb0YTFgXBdvcSRSMM=; b=eS8Ugogd+4bZHhnAXBQGxAUKdXRrbuDrz+PWQEPcRXc8Hjrci5MqNf4piqwyHutSae/MIz cT9g7JRxkjfQsRfKw+eqKIt8SDQXsoUcy53nif3mw6jnRJzl5xS3iNQF6Fdxw86ZId3PT0 AWp+b2FXyWvsa0xoHMRdx6Lzg142oNSNi0PTDyR4/tCCWMFV4Gb/nqSfO7wKlUO+mt1Nj4 wzjpXPggkpMLjMno+LnfFfPLx9D2OmGO4hPtnwKJQ1SAYNLhRF6tXoJxOv8SzfSF+Nm27/ H233yIWXk9xR4G6Zk964/siWuzBNioL1y90SH1VXSnZoRh4vOeCLFwyShBb4wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717553726; a=rsa-sha256; cv=none; b=XdI60v5RYEEhb2zssaMKZNeHXEZvdR8ymLoFuEeg2V2xVzYVGoFXkcymRc4BwRZ1ZRbSPG Av1q8U7GvI3mO7gvaDtdpIwJdYgBNdIyGYwLv1QmfWc9Olv9H5VuGOH8fqI6yS3wmAVNGC QrHUgiN0SV0RZMSca2WiS8AIOCRZQP+lggcWe+qClhDNRTmH/xbGC/TFsNwt/DMhfTT4Fb 0oLdRebAiQqi611iHxG2WIV3iEsDzTFtpkfXFpA4seoJNBBgs3cv9fSUAGRv20k6fTp7n/ +Y3rkhUlKT/Z2EMj1Rb0Tu/Lsb7wIOYVNKoZ0EtyQYtLAmgHW9N78JEs8D9hUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717553726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ZV1B3OOHvQt9+owpqtPzC5jk6Fb0YTFgXBdvcSRSMM=; b=Q9bJdQwzz5psjg5dm4vUU0ONkn1Jpt/xwy/8sIlFyhNytmDSU1wf8FEFYIpPZymQ1QHhc4 yjaSN5Wk1/XA8irOKfyQm5vhq/wCuyeS7TWAtbXcObVYFM90xagbKsxcEDFPXe5/rYJP/N AJJBHZ1tFo9BLEu168tOvZTC4TgoYls7tpahjiybmfPbUbrUG84yXOzXakqW//1jW9wqYm 9xotL6li9PrXug2dZ38xXHr12/4KL/LVDP0938enHl/P79UCVA6+7jJ1sVrq3kL95q330H gzmwcWpzPrymBwdh1zieIOIa1Dovb+XFik3+JCgpSenUt3fhquLKFOEQGbi3fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vv9zL0X3fzjsM; Wed, 5 Jun 2024 02:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4552FP4x098550; Wed, 5 Jun 2024 02:15:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4552FPqX098547; Wed, 5 Jun 2024 02:15:25 GMT (envelope-from git) Date: Wed, 5 Jun 2024 02:15:25 GMT Message-Id: <202406050215.4552FPqX098547@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Wen Heping Subject: git: 2b4304b08890 - main - www/uwsgi: Fix SOCK_NONBLOCK handling for FreeBSD, copied from NetBSD. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b4304b08890a2c8c4c765a74c8ed993d2ecb8a4 Auto-Submitted: auto-generated The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b4304b08890a2c8c4c765a74c8ed993d2ecb8a4 commit 2b4304b08890a2c8c4c765a74c8ed993d2ecb8a4 Author: Wen Heping AuthorDate: 2024-06-05 02:10:33 +0000 Commit: Wen Heping CommitDate: 2024-06-05 02:15:11 +0000 www/uwsgi: Fix SOCK_NONBLOCK handling for FreeBSD, copied from NetBSD. Reported by: Joerg Sonnenberger --- www/uwsgi/Makefile | 1 + www/uwsgi/files/patch-core_socket.c | 48 ++++++++++++++++++++++ .../files/patch-plugins_corerouter_corerouter.c | 12 ++++++ www/uwsgi/files/patch-proto_base.c | 12 ++++++ 4 files changed, 73 insertions(+) diff --git a/www/uwsgi/Makefile b/www/uwsgi/Makefile index 403d4f8fe20b..13afa802ef5f 100644 --- a/www/uwsgi/Makefile +++ b/www/uwsgi/Makefile @@ -1,5 +1,6 @@ PORTNAME= uwsgi PORTVERSION= 2.0.26 +PORTREVISION= 1 CATEGORIES= www python PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} diff --git a/www/uwsgi/files/patch-core_socket.c b/www/uwsgi/files/patch-core_socket.c new file mode 100644 index 000000000000..323b47236506 --- /dev/null +++ b/www/uwsgi/files/patch-core_socket.c @@ -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); diff --git a/www/uwsgi/files/patch-plugins_corerouter_corerouter.c b/www/uwsgi/files/patch-plugins_corerouter_corerouter.c new file mode 100644 index 000000000000..91fa5f7a228a --- /dev/null +++ b/www/uwsgi/files/patch-plugins_corerouter_corerouter.c @@ -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; diff --git a/www/uwsgi/files/patch-proto_base.c b/www/uwsgi/files/patch-proto_base.c new file mode 100644 index 000000000000..9b3f6abe60c5 --- /dev/null +++ b/www/uwsgi/files/patch-proto_base.c @@ -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);