Date: Mon, 1 Jan 2024 23:35:17 GMT From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a0a2255e0b5c - main - www/nginx-devel: third-party modules management (+) Message-ID: <202401012335.401NZHbo082898@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0a2255e0b5c9f36160d49db0af9f7608384c2ce commit a0a2255e0b5c9f36160d49db0af9f7608384c2ce Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2024-01-01 23:31:17 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2024-01-01 23:35:10 +0000 www/nginx-devel: third-party modules management (+) o) remove third-party cookie_flag module, the functionality supported natively by the proxy_cookie_flags directive; o) update third-party ndk module to 0.3.3; o) update third-party lua module to 0.10.26.rc2. Updated version of the lua module can be built with pcre2. Bump PORTREVISION. --- www/nginx-devel/Makefile | 5 ++--- www/nginx-devel/Makefile.extmod | 9 +++------ www/nginx-devel/Makefile.options.desc | 1 - www/nginx-devel/distinfo | 12 +++++------- www/nginx-devel/pkg-plist | 1 - 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index a10ae1556677..645d9f3af748 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.25.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -243,8 +243,7 @@ CFLAGS+= -DNDEBUG CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14" .endif -.if empty(PORT_OPTIONS:MLUA) && empty(PORT_OPTIONS:MMODSECURITY3) && \ - empty(PORT_OPTIONS:MPASSENGER) +.if empty(PORT_OPTIONS:MMODSECURITY3) && empty(PORT_OPTIONS:MPASSENGER) CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib" .else CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre" diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index e0590731a01e..022f17b30262 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -2,7 +2,7 @@ OPTIONS_GROUP+= THIRDPARTYGRP # External modules (arrayvar MUST appear after devel_kit for build-dep) -OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE COOKIE_FLAG CT \ +OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE CT \ DEVEL_KIT ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \ FIPS_CHECK FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST \ HTTP_AUTH_KRB5 HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL \ @@ -33,9 +33,6 @@ BROTLI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_brotli_filter_config CACHE_PURGE_GH_TUPLE= nginx-modules:ngx_cache_purge:a84b0f3:cache_purge CACHE_PURGE_VARS= DSO_EXTMODS+=cache_purge -COOKIE_FLAG_GH_TUPLE= AirisX:nginx_cookie_flag_module:c4ff449:cookie_flag -COOKIE_FLAG_VARS= DSO_EXTMODS+=cookie_flag - CT_IMPLIES= HTTP_SSL CT_GH_TUPLE= grahamedgecombe:nginx-ct:93e9884:ct CT_VARS= DSO_EXTMODS+=ct @@ -55,7 +52,7 @@ DYNAMIC_UPSTREAM_IMPLIES= STREAM DYNAMIC_UPSTREAM_GH_TUPLE= ZigzagAK:ngx_dynamic_upstream:960eef2:dynamic_upstream DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream -DEVEL_KIT_GH_TUPLE= vision5:ngx_devel_kit:v0.3.2:devel_kit +DEVEL_KIT_GH_TUPLE= vision5:ngx_devel_kit:v0.3.3:devel_kit DEVEL_KIT_VARS= FIRST_DSO_EXTMODS+=devel_kit ENCRYPTSESSION_IMPLIES= DEVEL_KIT @@ -216,7 +213,7 @@ LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUA_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUAJIT_LIB=${LOCALBASE}/lib -LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.26rc1:lua +LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.26rc2:lua LUA_VARS= DSO_EXTMODS+=lua LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc index 9bdf6684892b..d79433a2ebf7 100644 --- a/www/nginx-devel/Makefile.options.desc +++ b/www/nginx-devel/Makefile.options.desc @@ -3,7 +3,6 @@ ARRAYVAR_DESC= 3rd party array_var module AWS_AUTH_DESC= 3rd party aws auth module BROTLI_DESC= 3rd party brotli module CACHE_PURGE_DESC= 3rd party cache_purge module -COOKIE_FLAG_DESC= 3rd party cookie_flag module CT_DESC= 3rd party cert_transparency module (SSL req.) DEBUGLOG_DESC= Enable debug log (--with-debug) DEVEL_KIT_DESC= 3rd party Nginx Development Kit module diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index a04624c06d9d..a2093c2b81d7 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1702660971 +TIMESTAMP = 1704150548 SHA256 (nginx-1.25.3.tar.gz) = 64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86 SIZE (nginx-1.25.3.tar.gz) = 1216580 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -19,12 +19,10 @@ SHA256 (google-ngx_brotli-659b4b3_GH0.tar.gz) = 34308698dbc6c17f16193d62396746ec SIZE (google-ngx_brotli-659b4b3_GH0.tar.gz) = 16333 SHA256 (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = ddfd4fdd99075d906b7b75c49f56ec96b76df7951dfa54502e0f83890447031f SIZE (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = 17162 -SHA256 (AirisX-nginx_cookie_flag_module-c4ff449_GH0.tar.gz) = 4b8c1c1e1ed59ed85751f4bd7d68026ad5051103c8b983e05ad17eb0cdab138e -SIZE (AirisX-nginx_cookie_flag_module-c4ff449_GH0.tar.gz) = 4713 SHA256 (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 72fdd125b9207cdda135f368095f85b943a78a4ff004d1cd217972e12b1571b2 SIZE (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 7224 -SHA256 (vision5-ngx_devel_kit-v0.3.2_GH0.tar.gz) = aa961eafb8317e0eb8da37eb6e2c9ff42267edd18b56947384e719b85188f58b -SIZE (vision5-ngx_devel_kit-v0.3.2_GH0.tar.gz) = 66551 +SHA256 (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = faa2fcd5168b10764d35081356511d5f84db5c526a1aa4b6add2db94b6853b2b +SIZE (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = 66561 SHA256 (openresty-drizzle-nginx-module-3504fc6_GH0.tar.gz) = 86076735597f14db28cffabc0ab1f233cd51aab7cf112c56e267783e7814fc65 SIZE (openresty-drizzle-nginx-module-3504fc6_GH0.tar.gz) = 51596 SHA256 (ZigzagAK-ngx_dynamic_upstream-960eef2_GH0.tar.gz) = 86e7c6ed6dba2d4c5f5b87ecb91f25ccdb7a08b8a88236e632114f830b9e354b @@ -97,8 +95,8 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617 SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656 -SHA256 (openresty-lua-nginx-module-v0.10.26rc1_GH0.tar.gz) = 1cfe6fdcc62cb924d06b46e629a6043f463fafa84ec561c051be2e28dfc55427 -SIZE (openresty-lua-nginx-module-v0.10.26rc1_GH0.tar.gz) = 745427 +SHA256 (openresty-lua-nginx-module-v0.10.26rc2_GH0.tar.gz) = 3798109d047c917d564831051e31c0baac94ac6be379809df7d609505f0c302e +SIZE (openresty-lua-nginx-module-v0.10.26rc2_GH0.tar.gz) = 745839 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8 SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist index 015cc60e4d7e..c81e6d434f59 100644 --- a/www/nginx-devel/pkg-plist +++ b/www/nginx-devel/pkg-plist @@ -14,7 +14,6 @@ %%DSO%%%%BROTLI%%libexec/nginx/ngx_http_brotli_filter_module.so %%DSO%%%%BROTLI%%libexec/nginx/ngx_http_brotli_static_module.so %%DSO%%%%CACHE_PURGE%%libexec/nginx/ngx_http_cache_purge_module.so -%%DSO%%%%COOKIE_FLAG%%libexec/nginx/ngx_http_cookie_flag_filter_module.so %%DSO%%%%CT%%libexec/nginx/ngx_http_ssl_ct_module.so %%DSO%%%%CT%%libexec/nginx/ngx_ssl_ct_module.so %%DSO%%%%DEVEL_KIT%%libexec/nginx/ndk_http_module.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401012335.401NZHbo082898>