git: 51f2e5e1228d - main - www/nginx: Fix nginx with LUA after lua-resty-core update
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 21 Feb 2024 19:21:41 UTC
The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=51f2e5e1228ddfa53ac91a51f1b68273d1bce45c commit 51f2e5e1228ddfa53ac91a51f1b68273d1bce45c Author: Christos Chatzaras <chris@cretaforce.gr> AuthorDate: 2024-02-21 19:14:26 +0000 Commit: Florian Smeets <flo@FreeBSD.org> CommitDate: 2024-02-21 19:21:20 +0000 www/nginx: Fix nginx with LUA after lua-resty-core update In f08bfacc8fd6 lua-resty-core was updated this requires an updated version of openresty-lua-nginx-module. To prevent further people from bricking their nginx update the openresty-lua-nginx-module 3rd party module to 0.10.26. Otherwise people will find an nginx that does not start anymore with the following error message: nginx: [alert] failed to load the 'resty.core' module (https://github.com/openresty/lua-resty-core); ensure you are using an OpenResty release from https://openresty.org/en/download.html (reason: /usr/local/share/lua/5.1/resty/core/base.lua:24: ngx_http_lua_module 0.10.26 required) in /usr/local/etc/nginx/nginx.conf:1044 PR: 277145 Approved by: portmgr (blanket, just fix it) --- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 2 +- www/nginx/distinfo | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index a5cb24a6812a..3e431ec495d9 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nginx PORTVERSION= 1.24.0 -PORTREVISION?= 14 +PORTREVISION?= 15 PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 29185702dee2..f3f6d0526210 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -226,7 +226,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.25:lua +LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.26:lua LUA_VARS= DSO_EXTMODS+=lua LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link diff --git a/www/nginx/distinfo b/www/nginx/distinfo index f9d579b4f120..3e48677696fc 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1693596932 +TIMESTAMP = 1708285506 SHA256 (nginx-1.24.0.tar.gz) = 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d SIZE (nginx-1.24.0.tar.gz) = 1112471 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -103,8 +103,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.25_GH0.tar.gz) = bc764db42830aeaf74755754b900253c233ad57498debe7a441cee2c6f4b07c2 -SIZE (openresty-lua-nginx-module-v0.10.25_GH0.tar.gz) = 725616 +SHA256 (openresty-lua-nginx-module-v0.10.26_GH0.tar.gz) = a75983287a2bdc5e964ace56a51b215dc2ec996639d4916cd393d6ebba94b565 +SIZE (openresty-lua-nginx-module-v0.10.26_GH0.tar.gz) = 745785 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