From nobody Tue Aug 4 11:58:04 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 4hDsW20Yvdz6n6sF; Tue, 04 Aug 2026 11:58:06 +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 4hDsW174bmz3vYg; Tue, 04 Aug 2026 11:58:05 +0000 (UTC) (envelope-from joneum@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785844686; 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=6I5vvUQ/07zpjn3g2O+dSmhnU53lz3GokZK/tEPPCEQ=; b=BZ9ob5X1P3GROr3IV1XQCjwxvSIq7tTJt5yL2UsLvumG+dvoKT0lDI/N106lYx2hOJKIt/ K67FC+TaTFZOa9bUrrk5RUC3ZURYGCgDzdbrDKOiacfe+PJREMo08w5UmblPJiKID3tyDe mAjQRK+Er13tjXb6p9hGfTBj6G3WQ942acDI+Ui5dE1Zxp8MqforSC4SxeGDgDGZQ1Zmoa J2YmFwfuCn1h4NZf/kAu4AUqW18PnLgAH/h2564zLaHHy8zT3/xkZa1Eg/3PF6rfo6otVz oYghXEPmIYVscnUiyVCBlV4Jn/g7L7mSdke56z+4NHuknhzT8ArEotzXA+agpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785844686; a=rsa-sha256; cv=none; b=wIgMufgntQsygh7Zek8mZZ/u9jCutHwlqEejfoDvCmii04PqJBiEi2GXEgU86P0j8Wiegg YxlBQe+NR8I9IGChcEgN7DRXYjhYigSE2JQ3CiHnvyuG70A0k06Z7WNIItaCYykNaG9zTC wm4P3gi41+8qV2Y5g2H6XyY9JOAMX2BsFu6qNHECg4qcHt0I2U7E2O47HnjDZzqRUyfA8J VvTI9pclnIIAHgetS1mwma/+21/d7j/36fljyOOSSmCiHtq6+VWm4inwoXfH3TpCBYwU21 nBo4uIqohCtpclTxizju1XlpetCfnFna1BmsmQCKhxFAJU6k2WIER1ecZzpxGA== 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=1785844686; 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=6I5vvUQ/07zpjn3g2O+dSmhnU53lz3GokZK/tEPPCEQ=; b=EXv/P6D7UU38zUUy3ih9K6zLJBdpP7PBwj/994oirnZNuBQI6mtHNct3ReTlsqNHa7n6VY U8f06ei2PHIydaOkr7HXTAEdxFiC06f2wPioqbdaBre7Q44rBePKF6BNkcgvzJCbZrbDWk aNxRDM8ci9J7pyJ+3A+5y1gxKQcySBJkbw6bwT29kZMJYWwIgSC1GYvvm1KB63lPR8BWDd llgQ53opF550pjoXVuzas3iRyEopGENSq4aceKh2w95v9EUMHjbqlpDkIE/lpQcxxPOUTX o452eN4qxBolyt01kKtMa1G9TRuUDP7hnDqkMyLXAJxcGPZsLIcTT+jfldNTzg== 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 4hDsW12KDNzvrm; Tue, 04 Aug 2026 11:58:05 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Message-ID: <7efe84e2-fbfb-4b7e-a6b1-977ca68a0977@FreeBSD.org> Date: Tue, 4 Aug 2026 13:58:04 +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: 206b53381e95 - main - www/nginx-devel: 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: <6a71d13d.1ea9b.7fcdd259@gitrepo.freebsd.org> From: Jochen Neumeister In-Reply-To: <6a71d13d.1ea9b.7fcdd259@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=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: Why wasn’t the PORTREVISION increased? > 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); > + > >