From nobody Tue Aug 4 11:47:09 2026 X-Original-To: dev-commits-ports-main@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 4hDsGP5jScz6n60p for ; Tue, 04 Aug 2026 11:47:09 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDsGP3gdJz3qS0 for ; Tue, 04 Aug 2026 11:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785844029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ay24CJqG5OvarUmNp8CirupxjTwCwcXPzoHoFStZ0gg=; b=kJkJe9+KRaVUiaxRGfWFmActV2k6YLA7c1i+40DIun7uQkagHRH7ShSdn6ySJI6ISt00Tq Y4Bxf+RuI9/7o6Od+7udyCO12vgU84hHQqxGyQsZK7ikA+tq5oxlvBxerXy3hdq4aq+88D e24hGjqgO8G2jELMfT59O6ZyBMp9hm5khtU52weesoHTgXb+4Me0K6jeY51ymWXjpPJ4QF QML2QMTqWA1smuL116qiBuYzI6jrGX1dueo/5NBcD3SIwf3oBBemO1CMt/xPlUl2Omu72b mayRAU9jz70N04y7eIsZw+kwhlI81n86NURnLU7UNssW1CL/dpta0WxsrHOfcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785844029; a=rsa-sha256; cv=none; b=fpl6Gg2NxF+Q5vqi+zrnuiskYxgkK3Hf9fKU6Nr6dkfrlrEhldCkdRppP5Vouat7Co39ow J+/xvBQpbiVdnaD2GT/eBO8BO6y9CZq5CQSJyI3wnolS7NX/AFfHs6uQj1XEMR2kfQPV5d vlxje8l9DEm84SbykPa4+e4YI8afX1OrftLSUXIyxftPwHBjT1DgtGgjMqGfLkRC1I0kcG PlMl9x5A5WwO7/eOb9GjuPXZFeuVcdi0O+w24zDXIVCsrB+06De4qxaguTNqpaNBhufEDD RmRkXwouTZoNH14PxacUfgV54CjxQDZ9m1Ma72SeuRA/v/zEgncw/0ZEzibfyA== 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=1785844029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ay24CJqG5OvarUmNp8CirupxjTwCwcXPzoHoFStZ0gg=; b=kxDkwYtoPNoZE2EgREmaukTPeimtlnrZfYhzCzaKMwrlb1wMi+iKhyxKNhuX909J87WgmI Gz9wPydvuNSaiOMV+/yS37uarO9JitCcYvBJJgQJsiQk4xYNQO5kCFd71V8IFIyWgXf260 AUNBLLL69vxWOlY0eID5I6XCU69eBfWV14CiKiZc8+HoJRA8JUSxBwX7C9rlTaAMyMD0dn XxkactFlDDQIc0kK665hEyAx7UGIASZ6ClVnkHMI91rZ296rCxe8oCA5o8LtntUHjgk0b2 Z+1ioonqPbPSpS7ALq/xH10yYeEsA4aH3OSDAASZTdAQAZIC94FcA1uV2aTzHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDsGP2Tq8zlw3 for ; Tue, 04 Aug 2026 11:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ea9b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 04 Aug 2026 11:47:09 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Hiroo Ono From: Yusuf Yaman Subject: git: 206b53381e95 - main - www/nginx-devel: chase devel/mongo-c-driver update List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nxjoseph X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 206b53381e95c2f8d7af75ff415145494d73b34b Auto-Submitted: auto-generated Date: Tue, 04 Aug 2026 11:47:09 +0000 Message-Id: <6a71d13d.1ea9b.7fcdd259@gitrepo.freebsd.org> The branch main has been updated by nxjoseph: URL: https://cgit.FreeBSD.org/ports/commit/?id=206b53381e95c2f8d7af75ff415145494d73b34b commit 206b53381e95c2f8d7af75ff415145494d73b34b Author: Hiroo Ono AuthorDate: 2026-07-08 15:13:26 +0000 Commit: Yusuf Yaman CommitDate: 2026-08-04 11:46:48 +0000 www/nginx-devel: chase devel/mongo-c-driver update PR: 296605 Reported by: Hiroo Ono (author) Approved by: Jochen Neumeister (maintainer timeout, 3+ weeks) Approved by: osa, vvd (Mentors, implicit) --- www/nginx-devel/Makefile | 3 ++- www/nginx-devel/Makefile.extmod | 7 +++++-- .../files/extra-patch-nginx-gridfs_config | 14 ++++++++++++++ .../extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c | 20 ++++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 7949bb6a3328..f0c9b2cfc07b 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -293,7 +293,8 @@ post-patch-FASTDFS-on: ${WRKSRC_fastdfs}/src/config post-patch-GRIDFS-on: - @${REINPLACE_CMD} 's!\/usr!${LOCALBASE}!g' \ + @${REINPLACE_CMD} -e 's!%%LOCALBASE%%!${LOCALBASE}!g' \ + -e 's!%%MONGOC_VERSION%%!${MONGOC_VERSION}!g' \ ${WRKSRC_gridfs}/nginx-gridfs/config post-patch-HTTP_AUTH_KRB5-on: diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 5e691b0a067e..1174bea762ad 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -62,9 +62,12 @@ FORMINPUT_GH_TUPLE= calio:form-input-nginx-module:v0.12:forminput FORMINPUT_VARS= DSO_EXTMODS+=forminput GRIDFS_GH_TUPLE= nieoding:nginx-gridfs:059bdc3:gridfs -GRIDFS_LIB_DEPENDS= libbson-1.0.so:devel/libbson \ - libmongoc-1.0.so:devel/mongo-c-driver +GRIDFS_LIB_DEPENDS= libbson2.so:devel/libbson \ + libmongoc2.so:devel/mongo-c-driver GRIDFS_VARS= DSO_EXTMODS+=gridfs GRIDFS_SUBDIR=/nginx-gridfs +MONGOC_VERSION!= cd ${.CURDIR}/../../devel/mongo-c-driver; make -V DISTVERSION +GRIDFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c \ + ${PATCHDIR}/extra-patch-nginx-gridfs_config HEADERS_MORE_GH_TUPLE= openresty:headers-more-nginx-module:v0.39:headers_more HEADERS_MORE_VARS= DSO_EXTMODS+=headers_more diff --git a/www/nginx-devel/files/extra-patch-nginx-gridfs_config b/www/nginx-devel/files/extra-patch-nginx-gridfs_config new file mode 100644 index 000000000000..01c37fda60b1 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-nginx-gridfs_config @@ -0,0 +1,14 @@ +--- ../nginx-gridfs-059bdc3/nginx-gridfs/config.orig 2026-07-07 12:40:20.001344000 +0000 ++++ ../nginx-gridfs-059bdc3/nginx-gridfs/config 2026-07-07 12:41:06.850920000 +0000 +@@ -1,7 +1,7 @@ + ngx_module_type=HTTP + ngx_module_name=ngx_http_gridfs_module +-ngx_module_incs="/usr/include/libmongoc-1.0 /usr/include/libbson-1.0" +-ngx_module_libs="-lmongoc-1.0 -lbson-1.0" ++ngx_module_incs="%%LOCALBASE%%/include/mongoc-%%MONGOC_VERSION%% %%LOCALBASE%%/include/bson-%%MONGOC_VERSION%%" ++ngx_module_libs="-lmongoc2 -lbson2" + ngx_module_srcs="$ngx_addon_dir/ngx_http_gridfs_module.c" + . auto/module +-ngx_addon_name=$ngx_module_name +\ No newline at end of file ++ngx_addon_name=$ngx_module_name diff --git a/www/nginx-devel/files/extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c b/www/nginx-devel/files/extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c new file mode 100644 index 000000000000..765dd2b067ff --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c @@ -0,0 +1,20 @@ +--- ../nginx-gridfs-059bdc3/nginx-gridfs/ngx_http_gridfs_module.c.orig 2018-01-20 07:53:32.000000000 +0000 ++++ ../nginx-gridfs-059bdc3/nginx-gridfs/ngx_http_gridfs_module.c 2026-07-07 14:27:08.501699000 +0000 +@@ -1,7 +1,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +@@ -361,7 +361,7 @@ + bson_init(&filter); + bson_oid_init_from_string(&oid, (const char*)value); + bson_append_oid(&filter, "_id", -1, &oid); +- gfile = mongoc_gridfs_find_one(gridfs, &filter, &error); ++ gfile = mongoc_gridfs_find_one_with_opts(gridfs, &filter, NULL, &error); + + bson_destroy (&filter); +