diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile
index 2d73df912508..3820097a05ec 100644
--- a/www/angie-module-lua/Makefile
+++ b/www/angie-module-lua/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	angie-module-lua
-MODULE_VERSION=	0.10.29
-MODULE_PORTREVISION=	4
-GH_TUPLE=	openresty:lua-nginx-module:v${MODULE_VERSION}:lua
-GH_TUPLE+=	openresty:stream-lua-nginx-module:v0.0.16:lua_stream
+MODULE_VERSION=	0.10.29.2
+MODULE_PORTREVISION=	0
+GH_TUPLE=	openresty:lua-nginx-module:v${MODULE_VERSION:S|.2$|R2|}:lua
+GH_TUPLE+=	openresty:stream-lua-nginx-module:v0.0.17R4:lua_stream
 GH_TUPLE+=	vision5:ngx_devel_kit:v0.3.4:ndk
 
 COMMENT=	Angie Lua dynamic module
 WWW=		https://github.com/openresty/lua-nginx-module/
 
 LICENSE_FILE=	${WRKSRC_lua}/README.markdown
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFIGURE_ADD=	--add-dynamic-module=${WRKSRC_lua} \
 		--add-dynamic-module=${WRKSRC_lua_stream} \
 		--add-dynamic-module=${WRKSRC_ndk}
 
 CONFIGURE_ENV=	LUAJIT_INC=${LUAJIT_INCDIR} \
 		LUAJIT_LIB=${LOCALBASE}/lib
 
 RUN_DEPENDS=	angie-module-ndk>=0.3.4,1:www/angie-module-ndk \
-		lua-resty-core>=0.1.31:www/lua-resty-core
+		lua-resty-core>=0.1.32:www/lua-resty-core
 
 USES= 		luajit:luajit-openresty
 
 MASTERDIR=	${.CURDIR}/../../www/angie
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} \
 		 ${STAGEDIR}${MODDIR}
 
 	${INSTALL_LIB}  ${WRKSRC}/objs/ngx_http_lua_module.so \
 			${WRKSRC}/objs/ngx_stream_lua_module.so \
 		${STAGEDIR}${MODDIR}
 
 	${INSTALL_DATA} ${WRKSRC_lua}/README.markdown \
 		${STAGEDIR}${DOCSDIR}/README.lua-nginx-module.markdown
 	${INSTALL_DATA} ${WRKSRC_lua_stream}/README.md \
 		${STAGEDIR}${DOCSDIR}/README.stream-lua-nginx-module.md
 
 do-install-DEBUG-on:
 .for i in ngx_http_lua_module ngx_stream_lua_module
 	${INSTALL} ${COPY} -m ${_SHAREMODE} ${WRKSRC_DEBUG}/objs/${i}.so \
 	    ${STAGEDIR}${MODDIR}/${i}-debug.so
 .endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/angie-module-lua/files/patch-lua-config b/www/angie-module-lua/files/patch-lua-config
index b4c3fa02f0f2..a56a797979bd 100644
--- a/www/angie-module-lua/files/patch-lua-config
+++ b/www/angie-module-lua/files/patch-lua-config
@@ -1,26 +1,26 @@
---- ../lua-nginx-module-0.10.29/config.orig
-+++ ../lua-nginx-module-0.10.29/config
+--- ../lua-nginx-module-0.10.29R2/config.orig
++++ ../lua-nginx-module-0.10.29R2/config
 @@ -45,9 +45,9 @@
          NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
 
          if [ $NGX_RPATH = YES ]; then
 -            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
 +            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
          else
 -            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
 +            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
          fi
 
          . auto/feature
 @@ -71,9 +71,9 @@
              NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
 
              if [ $NGX_RPATH = YES ]; then
 -                ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
 +                ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
              else
 -                ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
 +                ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
              fi
 
              . auto/feature
diff --git a/www/angie-module-lua/files/patch-stream-lua-config b/www/angie-module-lua/files/patch-stream-lua-config
index f6fc143022dd..6955a22db71a 100644
--- a/www/angie-module-lua/files/patch-stream-lua-config
+++ b/www/angie-module-lua/files/patch-stream-lua-config
@@ -1,26 +1,26 @@
---- ../stream-lua-nginx-module-0.0.16/config.orig
-+++ ../stream-lua-nginx-module-0.0.16/config
+--- ../stream-lua-nginx-module-0.0.17R4/config.orig
++++ ../stream-lua-nginx-module-0.0.17R4/config
 @@ -45,9 +45,9 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then
          NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
  
          if [ $NGX_RPATH = YES ]; then
 -            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
 +            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
          else
 -            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
 +            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
          fi
  
          . auto/feature
 @@ -71,9 +71,9 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then
              NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
  
              if [ $NGX_RPATH = YES ]; then
 -                ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
 +                ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
              else
 -                ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
 +                ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
              fi
  
              . auto/feature
diff --git a/www/angie/distinfo b/www/angie/distinfo
index 293ec4577e2c..c54367afd21c 100644
--- a/www/angie/distinfo
+++ b/www/angie/distinfo
@@ -1,55 +1,55 @@
-TIMESTAMP = 1775030586
+TIMESTAMP = 1776174670
 SHA256 (angie-1.11.4.tar.gz) = b95009ceef7a1c40809aead95f71901ca1c5c9d2630eca0763853811b641983c
 SIZE (angie-1.11.4.tar.gz) = 1883725
 SHA256 (61131-nginx-http-auth-totp-1.1.0_GH0.tar.gz) = d36d2b75a3b239e63ec060ef9ccfa6b89acbceb74b7c93e47550c1f75ac4857e
 SIZE (61131-nginx-http-auth-totp-1.1.0_GH0.tar.gz) = 9813
 SHA256 (kjdev-nginx-auth-jwt-0.11.0_GH0.tar.gz) = 43febe1dba5757ffb663f0bb2ac3835c3aea3ff0cbbcfb36c0edb51662f58d60
 SIZE (kjdev-nginx-auth-jwt-0.11.0_GH0.tar.gz) = 82906
 SHA256 (stnoonan-spnego-http-auth-nginx-module-v1.1.3_GH0.tar.gz) = 0e1e54f8ab7d76f922881f13d870edf8b820ef645b19013774c825110d011640
 SIZE (stnoonan-spnego-http-auth-nginx-module-v1.1.3_GH0.tar.gz) = 32975
 SHA256 (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b
 SIZE (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = 16207
 SHA256 (nginx-modules-ngx_cache_purge-2.5.6_GH0.tar.gz) = bbad4277b8b70a98ba04ba9a1af78d1363266da56683da55a2d46ba97880206d
 SIZE (nginx-modules-ngx_cache_purge-2.5.6_GH0.tar.gz) = 17312
 SHA256 (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859
 SIZE (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = 14558
 SHA256 (openresty-echo-nginx-module-v0.64_GH0.tar.gz) = 6f43f56d7e7e8526716bbda06b300f0119912eede47b3a48bb948252a1fb38c8
 SIZE (openresty-echo-nginx-module-v0.64_GH0.tar.gz) = 53549
 SHA256 (bpaquet-ngx_http_enhanced_memcached_module-v0.3_GH0.tar.gz) = 4071b2cc0baa9f403c124c0ef0cdfbde14dacc1ec9f0dbc92d7310ac530e3eeb
 SIZE (bpaquet-ngx_http_enhanced_memcached_module-v0.3_GH0.tar.gz) = 101136
 SHA256 (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 6b91d3c2c2f254ebb37eb3dd6dd41048dfb18320bb98a3afdd1ad38b47f6d609
 SIZE (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 14188
 SHA256 (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = ad72fc23348d715a330994984531fab9b3606e160483236737f9a4a6957d9452
 SIZE (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = 8877
 SHA256 (openresty-headers-more-nginx-module-v0.39_GH0.tar.gz) = dde68d3fa2a9fc7f52e436d2edc53c6d703dcd911283965d889102d3a877c778
 SIZE (openresty-headers-more-nginx-module-v0.39_GH0.tar.gz) = 29616
 SHA256 (max-lt-nginx-jwt-module-v3.4.4_GH0.tar.gz) = 7c3effa96936d87c3a8a0e07ff91d2d341a7f78f8bb3d6c9085b06f398684242
 SIZE (max-lt-nginx-jwt-module-v3.4.4_GH0.tar.gz) = 17300
 SHA256 (kjdev-nginx-keyval-0.4.0_GH0.tar.gz) = bf5b9585cffe4da08cc96ebdcf936322743b464f5d16b53abe6f0bb63f13a3cc
 SIZE (kjdev-nginx-keyval-0.4.0_GH0.tar.gz) = 34615
-SHA256 (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = ca2c2122b909529bf9d1a89e9a5763835a2bd2629def8cb279c550f638f0a78f
-SIZE (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = 892502
-SHA256 (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 3b1103cf5ee940ea94711eae1a7ccc1a161273ec9a08eb415f1d45ad385f967d
-SIZE (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 395259
+SHA256 (openresty-lua-nginx-module-v0.10.29R2_GH0.tar.gz) = 2435bb65900d556a9175c77548ff0ef4cb507b786f57f7d1c4a7904a7f5063fd
+SIZE (openresty-lua-nginx-module-v0.10.29R2_GH0.tar.gz) = 892562
+SHA256 (openresty-stream-lua-nginx-module-v0.0.17R4_GH0.tar.gz) = 214927614eef96d5b1f26c0adaf94a8fd8c32f73dd17e494c217ca40f60e5910
+SIZE (openresty-stream-lua-nginx-module-v0.0.17R4_GH0.tar.gz) = 417131
 SHA256 (vision5-ngx_devel_kit-v0.3.4_GH0.tar.gz) = 14a28063294f645d457b1eb10e3c23bbba44398f1c5f021421b58b6f8ab31662
 SIZE (vision5-ngx_devel_kit-v0.3.4_GH0.tar.gz) = 66474
 SHA256 (nginx-njs-0.9.6_GH0.tar.gz) = 713e931d1ffcd337f6304dc55e512dcf2099ba4cc3a996c9ea14f22d5d9cdd79
 SIZE (nginx-njs-0.9.6_GH0.tar.gz) = 953437
 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9
 SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742
 SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438
 SIZE (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = 25471
 SHA256 (arut-nginx-rtmp-module-v1.2.2_GH0.tar.gz) = 07f19b7bffec5e357bb8820c63e5281debd45f5a2e6d46b1636d9202c3e09d78
 SIZE (arut-nginx-rtmp-module-v1.2.2_GH0.tar.gz) = 519934
 SHA256 (openresty-set-misc-nginx-module-v0.33_GH0.tar.gz) = cd5e2cc834bcfa30149e7511f2b5a2183baf0b70dc091af717a89a64e44a2985
 SIZE (openresty-set-misc-nginx-module-v0.33_GH0.tar.gz) = 30084
 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-e12e965ac1837ca709709f9a26f572a54d83430e_GH0.tar.gz) = da2a26aa75884e1216941c7291b6e8b7fc4dd7163700a04191b92060b61fabb3
 SIZE (yaoweibin-ngx_http_substitutions_filter_module-e12e965ac1837ca709709f9a26f572a54d83430e_GH0.tar.gz) = 94121
 SHA256 (kyprizel-testcookie-nginx-module-64137c2f7e66e8866f56fdecaaf09ac10a034da9_GH0.tar.gz) = 2946fd88157be64f69e29409160cf48a594fd6272c3f4c6b7f170bfa13074ee0
 SIZE (kyprizel-testcookie-nginx-module-64137c2f7e66e8866f56fdecaaf09ac10a034da9_GH0.tar.gz) = 20732
 SHA256 (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = c86e318addb9c88d70fdbd58ff1f6ef6f404a93070f6db8017a1f880c97946c4
 SIZE (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = 40139
 SHA256 (kaltura-nginx-vod-module-1.33_GH0.tar.gz) = 9c9600e5da4ee02ef6820d056da9eb5f3449f715468334ddab41727b76d478d8
 SIZE (kaltura-nginx-vod-module-1.33_GH0.tar.gz) = 471858
 SHA256 (tokers-zstd-nginx-module-0.1.1_GH0.tar.gz) = 707d534f8ca4263ff043066db15eac284632aea875f9fe98c96cea9529e15f41
 SIZE (tokers-zstd-nginx-module-0.1.1_GH0.tar.gz) = 55417