From nobody Tue Aug 4 11:57:23 2026 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 4hDsVG62xSz6n6Xm; Tue, 04 Aug 2026 11:57:26 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDsVG5RMQz3vRc; Tue, 04 Aug 2026 11:57:26 +0000 (UTC) (envelope-from joneum@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785844646; 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: in-reply-to:in-reply-to:references:references; bh=qVi/pP7OI6N7G3N6Mvl44ljSJcBnViRMXoids7HgM90=; b=dbsPpaZhXC3B6n1aXEk6ASK7ZoQhUdbrEvFf7XtNrTtABwZqIS/qAh96Eqc3C3HDIWFxxc VZ/E7R55/FXinkJCktBdwAkcMuXAsKmPyMPr/3EJ7z39lDI7PacEWaUxWDN4OQgPQeLAQU 7UYs+/ArJfgD66QfY6DGq79Us0W2xYj0WSdvb1x6RyNyMpP+RS4M3aO9LoT28wv5OhM5mP 1EBY5ozO36GjH7zqMaJBhyilTRvmdj+VNnYhxLgDrsGdCdN9XYzlxWJPvmXGhweshQ5Y1t dG4mhQ8q1JZ3iww1fGjbyDUvNxdR9KT7BV4nQqFA1vdjmvwhSjPJGFF6fjn+UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785844646; a=rsa-sha256; cv=none; b=T+PBrjwh4rbBW9ne9qBAx+HCFd/JhxNQjffuOg0aC9KFB5ubA0wQ3r1907RmJJLjPCYSKq NCTlxLpBEYsnvZfEMkX9VE09k1grR/rqKuKUMRWztu++8plNWtVPFdW76tBNlrM/OGadvQ 5HRaR1/DO8uBjg4cz4r27Mj2aZ821Hp3hBX7hRe+WbMhSgSEOoIK9eaEflK+n01qNnKgdu HktJHWRlSMF8nX5lHMbTJYJSsqPttGpdOzaCKU+vtO0+F+T519f1KRzSd4XgqhGiKYQcSB gM62bzxWrylxY42F2DJl3pOHxYdRFb99jbS2sDoSF7Sl+6zkfi+WmIaMLWIlPg== 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=1785844646; 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: in-reply-to:in-reply-to:references:references; bh=qVi/pP7OI6N7G3N6Mvl44ljSJcBnViRMXoids7HgM90=; b=mevooDrCt4tehQOpf2SZoJ0G3rVXC2PPCvj0dNLwigPgktKF2SFyEfRLNnyaaD3ocqg783 kacJB1wNta4gM4ZlH53KbrPqa1qkB2I3s5V4PmgJP6hwzbSgcuekisGkm4/tEMf1OSMwoL +kn06hz9V8FqorMEGHk3aeOd9k3pDaa1MYr5ow8mRzWvTwxjo/tsSlHagA6H3t39AZ9V8B gHsPgPvlJFu1KdLx6OmlDPLpq01tiN2Lm/1nTJPoO4t/A17U/AKFVXx5sQDKo1BBZ8naC3 gMzSMpLafVdqAuWmLEABNnV9Jv+W3PLS5hjRHuGmeP1pTT3wYPOxO+CYrri9ag== Received: from [192.168.188.202] (p57993ebf.dip0.t-ipconnect.de [87.153.62.191]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: joneum/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4hDsVG05gmzw0X; Tue, 04 Aug 2026 11:57:25 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Message-ID: <067542cf-fc1e-41d7-8281-f94ea1ba8995@FreeBSD.org> Date: Tue, 4 Aug 2026 13:57:23 +0200 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 2fc4e25bbaae - main - www/nginx: chase devel/mongo-c-driver update Content-Language: de-DE To: Yusuf Yaman , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <6a71d13c.1c372.48bea7f0@gitrepo.freebsd.org> From: Jochen Neumeister In-Reply-To: <6a71d13c.1c372.48bea7f0@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Am 04.08.26 um 13:47 schrieb Yusuf Yaman: > 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 > Why wasn’t PORTREVISION updated? Were dependent ports such as nginx-full tested? If so, why wasn’t PORTREVISION updated there as well? > 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); > + > >