From 5dd99e3b8ab7c99fe389663c68122462c475fd69 Mon Sep 17 00:00:00 2001 From: Raven Date: Tue, 9 Apr 2024 10:24:56 +0600 Subject: [PATCH] nginx-cp: update lua module --- ...-lua-mod-lowering-luajit-alert-severity.patch | 6 +++--- modular/nginx-cp/nginx-cp.spec | 16 ++++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modular/nginx-cp/nginx-1.24-lua-mod-lowering-luajit-alert-severity.patch b/modular/nginx-cp/nginx-1.24-lua-mod-lowering-luajit-alert-severity.patch index 3168728..338c685 100644 --- a/modular/nginx-cp/nginx-1.24-lua-mod-lowering-luajit-alert-severity.patch +++ b/modular/nginx-cp/nginx-1.24-lua-mod-lowering-luajit-alert-severity.patch @@ -1,6 +1,6 @@ -diff -ruN a/lua-nginx-module-0.10.26-pre/src/ngx_http_lua_module.c b/lua-nginx-module-0.10.26-pre/src/ngx_http_lua_module.c ---- a/lua-nginx-module-0.10.26-pre/src/ngx_http_lua_module.c 2023-11-14 05:23:08.000000000 +0600 -+++ b/lua-nginx-module-0.10.26-pre/src/ngx_http_lua_module.c 2023-11-20 11:08:10.584363198 +0600 +diff -ruN a/lua-nginx-module-0.10.26/src/ngx_http_lua_module.c b/lua-nginx-module-0.10.26/src/ngx_http_lua_module.c +--- a/lua-nginx-module-0.10.26/src/ngx_http_lua_module.c 2023-11-14 05:23:08.000000000 +0600 ++++ b/lua-nginx-module-0.10.26/src/ngx_http_lua_module.c 2023-11-20 11:08:10.584363198 +0600 @@ -888,7 +888,7 @@ #ifndef OPENRESTY_LUAJIT diff --git a/modular/nginx-cp/nginx-cp.spec b/modular/nginx-cp/nginx-cp.spec index 052d0f2..0afbb7e 100644 --- a/modular/nginx-cp/nginx-cp.spec +++ b/modular/nginx-cp/nginx-cp.spec @@ -30,7 +30,7 @@ # specific package versions %if %{with lua} -%define luamod_ver 0.10.26-pre +%define luamod_ver 0.10.26 %define ndk_ver 0.3.1 %endif @@ -43,7 +43,7 @@ Name: nginx-cp Epoch: 1 Version: 1.24.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -130,7 +130,7 @@ BuildRequires: openssl-devel BuildRequires: pcre2-devel BuildRequires: zlib-devel -BuildRequires: gd-devel >= 2.3 +BuildRequires: pkgconfig(gdlib) BuildRequires: libxslt-devel BuildRequires: redhat-rpm-config @@ -173,7 +173,8 @@ Requires: lua luajit2 BuildRequires: luajit-devel lua-devel Requires: lua luajit lua-socket %endif -Requires: lua luajit2 lua-socket lua-resty-core +Requires: lua luajit2 lua-socket +Requires: lua-resty-core >= 0.1.26 %endif @@ -339,7 +340,7 @@ sed -i '1 i\LUAJIT_LIB=%{_libdir}' lua-nginx-module-%{luamod_ver}/config ngx_ldflags="$RPM_LD_FLAGS -Wl,-E" -ngx_cflags="%{optflags} $(pcre-config --cflags) -DTCP_FASTOPEN=23 -fPIC" +ngx_cflags="%{optflags} $(pcre2-config --cflags) -DTCP_FASTOPEN=23 -fPIC" %if 0%{?rhel} <= 8 ngx_cflags="-I%{ssl_prefix}/include/openssl3 $ngx_cflags" %endif @@ -680,12 +681,15 @@ fi %endif %changelog +* Mon Apr 8 2024 Raven - 1.24.0-5 +- upgrade lua-nginx-module to 0.10.26 + * Mon Nov 20 2023 Raven - 1.24.0-4 - import lua module from master branch to build with PCRE2 support - use OS native gcc compiler -* Thu Oct 25 2023 Raven - 1.24.0-3 +* Wed Oct 25 2023 Raven - 1.24.0-3 - backported 284a0c7 and c93cb45 from 1.25.3 * Mon Oct 23 2023 Raven - 1.24.0-2