From nobody Tue Aug 4 11:47:08 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 4hDsGN5Yr7z6n62W for ; Tue, 04 Aug 2026 11:47:08 +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 4hDsGN48Xgz3qRv for ; Tue, 04 Aug 2026 11:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785844028; 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=/EZiK+osIkGCTLQpFPxCIRT52AdEFHZYR9g4Yn7trSs=; b=UW4mKXV2xRt9MheZp0mTGUuGBuKSg7dV8VsHVx4EQZhkZ4mVXkCY3n04dTV2VXDixr4WOY SgT2xmVmOX2j0KVDoB3Ry/9hSuPPqjxIVS3W9WokNGIi9qyM0riaLvAblGlpvet48HFwXq bCwZJitM5GwIPX181AfX+0js5R+qF9QwemT2gwb9MhO5fTmqCztri1Mp2BKcHR6FtJ13ze 2PhxMnzcAm8CMyZ/kAlyNfL0yrKd+iLMpuEbnM591rl8gfxJzEiB5YoOyOTXj3OPtYSQMi AgCG+UZ29jFADUwG4vKQQ33K8e1Ij6oN6Ja/TqacpSw3+qAF9MtwhaYqUsQtcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785844028; a=rsa-sha256; cv=none; b=fGDDQU0IsfYwQ8FUbJM/FB5vXZKKzDaVZUUSP5q7GsNMO/5ExqJtHl02T186gKfmtpZRlj lV+KKy15NVEggoUFn3f7jTGMWNo1kGUIeqwnvM8NaAEYhkI0Dc9bNkRwidYCisQlrey7j1 TLB30nJ9Pef/ft8rLHUKjGhClN1/M5MH5/hxm1iAkTZ8A8zOqYU1SzixTSC9qnYaJJhRx9 5su6QK4qetsgubeZfqBoOFtaglr9VfCZExJADlg7JRa6cfDLjM8VeSuNpjEy/YI+v9GA0M b5VYKsDgyDyG5XVaGPYN1Hx49i4oa8bzQPv/+39qDgC7P2BAu3wgFnK4nsWBZw== 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=1785844028; 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=/EZiK+osIkGCTLQpFPxCIRT52AdEFHZYR9g4Yn7trSs=; b=sEDi3e8S5RDrMPZQctQuxWAoA55UPheeGb6rsDpmlW9MEvh24B6nLbiuLapJMMMCnhJ0xV LKHGLuLzhhC/3sEg+ma+GSjjWtyGBTHMcNd0AddL02096DjISVqAUfz1i0mgWtILM3ZWE4 puUuMvb7rRkl5PeClPJOIdJI9abMxQyM5yJG6adRP8XvhUmXuA6RSmv4Orj9qZqpYBiw2A dK+KlxD3tjZxY6xihFCjQMtvpVofnZwO8Qtp3q+D1jg7WWJmgkLHpA+pWoa/V8ICVZ37ZR X9uDM7Pw4T3/K0CK+IcpgyehkmMajM9KLHDxMRd6njnikUEJ5Sz2scP/Mj20eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDsGN1mGHzlw2 for ; Tue, 04 Aug 2026 11:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c372 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 04 Aug 2026 11:47:08 +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: 2fc4e25bbaae - main - www/nginx: 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: 2fc4e25bbaae7b55ced7bbe99f9ac401b8890b7b Auto-Submitted: auto-generated Date: Tue, 04 Aug 2026 11:47:08 +0000 Message-Id: <6a71d13c.1c372.48bea7f0@gitrepo.freebsd.org> The branch main has been updated by nxjoseph: URL: https://cgit.FreeBSD.org/ports/commit/?id=2fc4e25bbaae7b55ced7bbe99f9ac401b8890b7b commit 2fc4e25bbaae7b55ced7bbe99f9ac401b8890b7b Author: Hiroo Ono AuthorDate: 2026-07-08 15:06:35 +0000 Commit: Yusuf Yaman CommitDate: 2026-08-04 11:46:48 +0000 www/nginx: chase devel/mongo-c-driver update PR: 296604 Reported by: Hiroo Ono (author) Approved by: Jochen Neumeister (maintainer timeout, 3+ weeks) Approved by: osa, vvd (Mentors, implicit) --- www/nginx/Makefile | 3 ++- www/nginx/Makefile.extmod | 7 +++++-- www/nginx/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/Makefile b/www/nginx/Makefile index fba1e8e9ce87..78ae33299b0e 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -284,7 +284,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/Makefile.extmod b/www/nginx/Makefile.extmod index 066625a892e0..0863dbbf6a9d 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/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:06dc0be:headers_more HEADERS_MORE_VARS= DSO_EXTMODS+=headers_more diff --git a/www/nginx/files/extra-patch-nginx-gridfs_config b/www/nginx/files/extra-patch-nginx-gridfs_config new file mode 100644 index 000000000000..01c37fda60b1 --- /dev/null +++ b/www/nginx/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/files/extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c b/www/nginx/files/extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c new file mode 100644 index 000000000000..765dd2b067ff --- /dev/null +++ b/www/nginx/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); +