diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile index bef051ff088e..012f96b6ace1 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.28 +MODULE_VERSION= 0.10.29 MODULE_PORTREVISION= 0 GH_TUPLE= openresty:lua-nginx-module:v${MODULE_VERSION}:lua GH_TUPLE+= openresty:stream-lua-nginx-module:v0.0.16: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 USES= luajit:luajit-openresty MASTERDIR= ${.CURDIR}/../../www/angie do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${MODDIR} .for i in ngx_http_lua_module ngx_stream_lua_module ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} .endfor ${INSTALL_MAN} ${WRKSRC_lua}/README.markdown \ ${STAGEDIR}${DOCSDIR}/README.lua-nginx-module.markdown ${INSTALL_MAN} ${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 31a80a49c73b..b4c3fa02f0f2 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.28/config.orig -+++ ../lua-nginx-module-0.10.28/config +--- ../lua-nginx-module-0.10.29/config.orig ++++ ../lua-nginx-module-0.10.29/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/distinfo b/www/angie/distinfo index 336d148b466e..2d7106458b9d 100644 --- a/www/angie/distinfo +++ b/www/angie/distinfo @@ -1,53 +1,53 @@ TIMESTAMP = 1765300000 SHA256 (angie-1.10.3.tar.gz) = ff820ec9dc7ac8b0e873c52ddc48b3417f5054f157b5d2df5c1b8ed7adfb2256 SIZE (angie-1.10.3.tar.gz) = 1758928 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.9.0_GH0.tar.gz) = d7c72634261a053afaacc2cb762eccf9ce4c462ca738ad0c4809eb964ddf3c0c SIZE (kjdev-nginx-auth-jwt-0.9.0_GH0.tar.gz) = 75474 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.4_GH0.tar.gz) = 5bd04373d818b1aa0f3ba0b31b54149207a17815b026f222c537daf587b0cbda SIZE (nginx-modules-ngx_cache_purge-2.5.4_GH0.tar.gz) = 17174 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.63_GH0.tar.gz) = 8af374d29592ef95baee53c91959c7b04927f11304c318a94f0ee140760515a4 SIZE (openresty-echo-nginx-module-v0.63_GH0.tar.gz) = 53421 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.3_GH0.tar.gz) = 35d2a6bc957105ee5b4fc0b360d36ddb0e5be05f2f391b27405751a2587dd82b SIZE (max-lt-nginx-jwt-module-v3.4.3_GH0.tar.gz) = 16452 SHA256 (kjdev-nginx-keyval-0.3.0_GH0.tar.gz) = c4e5d2a03ead32cfccb9f04f01a8cdf664f5deca3f677c13b1509bff832cf2c7 SIZE (kjdev-nginx-keyval-0.3.0_GH0.tar.gz) = 24150 -SHA256 (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 634827d54de6216cb0502d14f76610788b3a3e33160e91d5578d6db0d9a34a20 -SIZE (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 869217 +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 (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.1_GH0.tar.gz) = 61365eea69c6862fc8a5b5df531503ae49499f6bcd5af932496b84850a2824a4 SIZE (nginx-njs-0.9.1_GH0.tar.gz) = 966480 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