diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile index c7e2c2ac91c2..a8b3cff6d058 100644 --- a/www/angie-module-lua/Makefile +++ b/www/angie-module-lua/Makefile @@ -1,45 +1,45 @@ PORTNAME= angie-module-lua -GH_TUPLE= openresty:lua-nginx-module:v0.10.25:lua -GH_TUPLE+= openresty:stream-lua-nginx-module:v0.0.13:lua_stream -GH_TUPLE+= vision5:ngx_devel_kit:v0.3.2:ndk +GH_TUPLE= openresty:lua-nginx-module:v0.10.28:lua +GH_TUPLE+= openresty:stream-lua-nginx-module:v0.0.16:lua_stream +GH_TUPLE+= vision5:ngx_devel_kit:v0.3.3:ndk COMMENT= Angie Lua dynamic 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==${PKGVERSION}:www/angie-module-ndk \ - lua-resty-core==0.1.27:www/lua-resty-core + lua-resty-core>=0.1.29:www/lua-resty-core USES= luajit:luajit-openresty MASTERDIR= ${.CURDIR}/../../www/angie do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${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 46b570724957..31a80a49c73b 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.25/config.orig -+++ ../lua-nginx-module-0.10.25/config +--- ../lua-nginx-module-0.10.28/config.orig ++++ ../lua-nginx-module-0.10.28/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 ef3c1ea1033c..f6fc143022dd 100644 --- a/www/angie-module-lua/files/patch-stream-lua-config +++ b/www/angie-module-lua/files/patch-stream-lua-config @@ -1,35 +1,26 @@ ---- ../stream-lua-nginx-module-0.0.13/config.orig -+++ ../stream-lua-nginx-module-0.0.13/config -@@ -45,9 +45,9 @@ +--- ../stream-lua-nginx-module-0.0.16/config.orig ++++ ../stream-lua-nginx-module-0.0.16/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 @@ +@@ -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 -@@ -436,7 +436,7 @@ - . auto/feature - - if [ $ngx_found = yes ]; then -- CORE_LIBS="-Wl,--require-defined=pcre_version $CORE_LIBS" -+ : - fi - ;; - esac diff --git a/www/angie/distinfo b/www/angie/distinfo index 66e92564c29c..a1fa308393c1 100644 --- a/www/angie/distinfo +++ b/www/angie/distinfo @@ -1,51 +1,51 @@ TIMESTAMP = 1737668800 SHA256 (angie-1.8.1.tar.gz) = db30b69045cf9a40f144911814414d9e1b4d4370f6693d008f4017dcb4370b4c SIZE (angie-1.8.1.tar.gz) = 1672621 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.1_GH0.tar.gz) = ed267444667d3f85f92d1bd910a7010e8272f4de1aa83afa39c1c97eac17dade SIZE (stnoonan-spnego-http-auth-nginx-module-v1.1.1_GH0.tar.gz) = 18507 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.3_GH0.tar.gz) = 43158a75bbc8d4ba66ec9c60a1ec13a792803a36b62ffc3fa01088d8675108e0 SIZE (nginx-modules-ngx_cache_purge-2.5.3_GH0.tar.gz) = 17156 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.37_GH0.tar.gz) = cf6e169d6b350c06d0c730b0eaf4973394026ad40094cddd3b3a5b346577019d SIZE (openresty-headers-more-nginx-module-v0.37_GH0.tar.gz) = 29433 SHA256 (max-lt-nginx-jwt-module-v3.4.2_GH0.tar.gz) = c8c8a01c27e3aab853ddd437c119b9a3fcd1f111c1627ad200a0277b19505ff9 SIZE (max-lt-nginx-jwt-module-v3.4.2_GH0.tar.gz) = 16453 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.25_GH0.tar.gz) = bc764db42830aeaf74755754b900253c233ad57498debe7a441cee2c6f4b07c2 -SIZE (openresty-lua-nginx-module-v0.10.25_GH0.tar.gz) = 725616 -SHA256 (openresty-stream-lua-nginx-module-v0.0.13_GH0.tar.gz) = 01b715754a8248cc7228e0c8f97f7488ae429d90208de0481394e35d24cef32f -SIZE (openresty-stream-lua-nginx-module-v0.0.13_GH0.tar.gz) = 376245 -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 (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-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.3_GH0.tar.gz) = faa2fcd5168b10764d35081356511d5f84db5c526a1aa4b6add2db94b6853b2b +SIZE (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = 66561 SHA256 (nginx-njs-0.8.2_GH0.tar.gz) = 6f17387db8df90b6e3382d280455962ff85fa2b1a32d91c2ce1fd1af5a854d72 SIZE (nginx-njs-0.8.2_GH0.tar.gz) = 733916 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.32_GH0.tar.gz) = 958bbe7084704f9df49f8b71e8b90700591cd3edca7409f74bf0d8721621402f SIZE (kaltura-nginx-vod-module-1.32_GH0.tar.gz) = 471031