Date: Tue, 06 Jan 2026 17:40:52 +0000 From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a428cd2fbd54 - main - www/nginx-acme: fix build with nginx-devel flavor Message-ID: <695d4924.376f8.c414606@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=a428cd2fbd5423a64f43aa61d14f69e4ca699189 commit a428cd2fbd5423a64f43aa61d14f69e4ca699189 Author: Jochen Neumeister <joneum@FreeBSD.org> AuthorDate: 2026-01-06 17:39:23 +0000 Commit: Jochen Neumeister <joneum@FreeBSD.org> CommitDate: 2026-01-06 17:40:35 +0000 www/nginx-acme: fix build with nginx-devel flavor Fix build failure when building www/nginx-acme against www/nginx-devel due to an updated ngx_http_validate_host() function signature. The build previously failed with: error[E0061]: this function takes 4 arguments but 3 arguments were supplied --> src/conf/order.rs:252:28 Apply a flavor-specific patch for the devel flavor only, keeping the default nginx flavor unchanged. This restores successful builds for both nginx and nginx-devel flavors. Sponsored by: Netzkommune GmbH --- www/nginx-acme/Makefile | 1 + www/nginx-acme/files/extra-patch-src_conf_order.rs-devel | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/www/nginx-acme/Makefile b/www/nginx-acme/Makefile index a85fc8cdc07a..c48493a86ee8 100644 --- a/www/nginx-acme/Makefile +++ b/www/nginx-acme/Makefile @@ -47,6 +47,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/nginx:www/nginx .if ${FLAVOR} == devel NGINX_VERSION= ${NGINX_VERSION_DEVEL} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_conf_order.rs-devel .else NGINX_VERSION= ${NGINX_VERSION_DEFAULT} .endif diff --git a/www/nginx-acme/files/extra-patch-src_conf_order.rs-devel b/www/nginx-acme/files/extra-patch-src_conf_order.rs-devel new file mode 100644 index 000000000000..9284fb470a46 --- /dev/null +++ b/www/nginx-acme/files/extra-patch-src_conf_order.rs-devel @@ -0,0 +1,11 @@ +--- src/conf/order.rs.orig 2026-01-06 14:12:56.622627000 +0100 ++++ src/conf/order.rs 2026-01-06 14:14:51.810902000 +0100 +@@ -249,7 +249,7 @@ fn validate_host(pool: &Pool, mut host: ngx_str_t) -> + + fn validate_host(pool: &Pool, mut host: ngx_str_t) -> Result<ngx_str_t, Status> { + let mut pool = pool.clone(); +- let rc = Status(unsafe { nginx_sys::ngx_http_validate_host(&mut host, pool.as_mut(), 1) }); ++ let rc = Status(unsafe { nginx_sys::ngx_http_validate_host(&mut host, std::ptr::null_mut(), pool.as_mut(), 1) }); + if rc != Status::NGX_OK { + return Err(rc); + }help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?695d4924.376f8.c414606>