Date: Tue, 04 Aug 2026 11:47:09 +0000 From: Yusuf Yaman <nxjoseph@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Hiroo Ono <hiroo.ono+freebsd@gmail.com> Subject: git: 206b53381e95 - main - www/nginx-devel: chase devel/mongo-c-driver update Message-ID: <6a71d13d.1ea9b.7fcdd259@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by nxjoseph: URL: https://cgit.FreeBSD.org/ports/commit/?id=206b53381e95c2f8d7af75ff415145494d73b34b commit 206b53381e95c2f8d7af75ff415145494d73b34b Author: Hiroo Ono <hiroo.ono+freebsd@gmail.com> AuthorDate: 2026-07-08 15:13:26 +0000 Commit: Yusuf Yaman <nxjoseph@FreeBSD.org> CommitDate: 2026-08-04 11:46:48 +0000 www/nginx-devel: chase devel/mongo-c-driver update PR: 296605 Reported by: Hiroo Ono <hiroo.ono+freebsd@gmail.com> (author) Approved by: Jochen Neumeister <joneum@FreeBSD.org> (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 <ngx_config.h> + #include <ngx_core.h> + #include <ngx_http.h> +-#include <mongoc.h> ++#include <mongoc/mongoc.h> + #include <signal.h> + #include <stdio.h> + +@@ -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); +home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a71d13d.1ea9b.7fcdd259>