aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEirik Oeverby <ltning-freebsd@anduin.net>2024-05-13 09:48:03 +0000
committerMateusz Piotrowski <0mp@FreeBSD.org>2024-05-13 10:28:23 +0000
commit5f61eef0e8bbaffff7fd816aaf0befc364e8245b (patch)
treebf25d7816a226f79d686b9d1f972215c0e7d9c71
parent06aa8bbc8e1eda41bc29ca4510faf829ebf4f9c2 (diff)
downloadports-5f61eef0e8bbaffff7fd816aaf0befc364e8245b.tar.gz
ports-5f61eef0e8bbaffff7fd816aaf0befc364e8245b.zip
www/nginx: Add support for 3rd party stream-lua-nginx-module
PR: 277719 Approved by: maintainer timeout Reported by: Eirik Oeverby <ltning-freebsd@anduin.net> Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Co-authored-by: Xavier Beaudouin <kiwi@oav.net> (cherry picked from commit edac05fd7cb3fa2f9c794165b8ffcfc9e32c20c4)
-rw-r--r--www/nginx/Makefile2
-rw-r--r--www/nginx/Makefile.extmod10
-rw-r--r--www/nginx/Makefile.options.desc1
-rw-r--r--www/nginx/distinfo2
-rw-r--r--www/nginx/pkg-plist1
5 files changed, 14 insertions, 2 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 4d92fc92c11e..b720743e02ba 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,6 +1,6 @@
PORTNAME= nginx
PORTVERSION= 1.24.0
-PORTREVISION?= 16
+PORTREVISION?= 17
PORTEPOCH= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 2f68a38b8462..8e1ec1dd0b48 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -10,7 +10,7 @@ OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE COOKIE_FLAG
HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_MP4_H264 HTTP_NOTICE HTTP_PROXY_CONNECT HTTP_PUSH \
HTTP_PUSH_STREAM HTTP_REDIS HTTP_SLICE_AHEAD HTTP_SUBS_FILTER HTTP_TARANTOOL \
HTTP_UPLOAD HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \
- HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA MEMC \
+ HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA LUASTREAM MEMC \
MODSECURITY3 NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2\
RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS VOD VTS \
XSS WEBSOCKIFY
@@ -229,6 +229,14 @@ LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.26:lua
LUA_VARS= DSO_EXTMODS+=lua
+LUASTREAM_IMPLIES= DEVEL_KIT
+LUASTREAM_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
+LUASTREAM_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core
+LUASTREAM_CONFIGURE_ENV=LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
+ LUAJIT_LIB=${LOCALBASE}/lib
+LUASTREAM_GH_TUPLE= openresty:stream-lua-nginx-module:v0.0.14:luastream
+LUASTREAM_VARS= DSO_EXTMODS+=luastream
+
LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link
LINK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-link-function-config \
${PATCHDIR}/extra-patch-ngx_link_func_module.c
diff --git a/www/nginx/Makefile.options.desc b/www/nginx/Makefile.options.desc
index 598e1f75a83f..d299cc6b3607 100644
--- a/www/nginx/Makefile.options.desc
+++ b/www/nginx/Makefile.options.desc
@@ -82,6 +82,7 @@ IPV6_DESC= Enable IPv6 support
LET_DESC= 3rd party let module
LINK_DESC= 3rd party link function module
LUA_DESC= 3rd party lua module
+LUASTREAM_DESC= 3rd party lua stream module
MAILGRP_DESC= Modules that require MAIL module
MAIL_DESC= Enable IMAP4/POP3/SMTP proxy module
MAIL_IMAP_DESC= Enable IMAP4 proxy module
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 3e48677696fc..c038036d9d0a 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -143,3 +143,5 @@ SHA256 (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92
SIZE (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = 14646
SHA256 (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 0b12bbc53a41f3e3d6df419c173b8c87434be3e6cd255a8193aa91345a2de6cf
SIZE (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 12448
+SHA256 (openresty-stream-lua-nginx-module-v0.0.14_GH0.tar.gz) = 8e2ff6ad5f91127da3c01757e7e654f1addf9769450d9159601d2cc153953c47
+SIZE (openresty-stream-lua-nginx-module-v0.0.14_GH0.tar.gz) = 381313
diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist
index 94e0cd5e7946..35d8f66bfad8 100644
--- a/www/nginx/pkg-plist
+++ b/www/nginx/pkg-plist
@@ -63,6 +63,7 @@
%%DSO%%%%LET%%libexec/nginx/ngx_http_let_module.so
%%DSO%%%%LINK%%libexec/nginx/ngx_http_link_func_module.so
%%DSO%%%%LUA%%libexec/nginx/ngx_http_lua_module.so
+%%DSO%%%%LUASTREAM%%libexec/nginx/ngx_stream_lua_module.so
%%DSO%%%%MAIL%%libexec/nginx/ngx_mail_module.so
%%DSO%%%%MAIL%%%%CT%%libexec/nginx/ngx_mail_ssl_ct_module.so
%%DSO%%%%MEMC%%libexec/nginx/ngx_http_memc_module.so