lua-resty-core: update to 0.1.28

modular/lua-resty-core/lua-resty-core.spec

@@ -0,0 +1,54 @@
+#define rc_flag    rc4
+%define lua_ver    5.1
+%define _luapkgdir %{_datadir}/lua/%{lua_ver}
+
+Name:          lua-resty-core
+Version:       0.1.28
+Release:       1%{dist}
+License:       BSD
+URL:           https://github.com/openresty/lua-resty-core
+Source:        https://github.com/openresty/lua-resty-core/archive/refs/tags/v%{version}.tar.gz
+BuildArch:     noarch
+BuildRequires: lua-filesystem
+Requires:      lua(abi) == %{lua_ver}
+Requires:      lua-resty-lrucache nginx-cp >= 1.24.0
+
+Summary:       New FFI-based API for lua-nginx-module
+
+%description
+New FFI-based Lua API for ngx_http_lua_module and/or
+ngx_stream_lua_module
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+
+%install
+install -d %{buildroot}%{_luapkgdir}/resty/core
+install -d -p %{buildroot}%{_luapkgdir}/ngx/ssl
+install lib/resty/*.lua %{buildroot}%{_luapkgdir}/resty/
+install lib/resty/core/*.lua %{buildroot}%{_luapkgdir}/resty/core/
+install lib/ngx/*.lua %{buildroot}%{_luapkgdir}/ngx/
+install lib/ngx/ssl/*.lua %{buildroot}%{_luapkgdir}/ngx/ssl/
+
+%files
+%doc README.markdown
+%{_luapkgdir}/resty/*
+%{_luapkgdir}/ngx/*
+
+%changelog
+* Mon Apr  8 2024 Raven <raven@sysadmins.ws> - 0.1.28-1
+- version bump
+
+* Thu Apr 13 2023 Raven <raven@sysadmins.ws> - 0.1.26-1
+- version bump
+
+* Wed May 25 2022 Raven <raven@sysadmins.ws> - 0.1.23-1
+- version bump
+
+* Tue May 11 2021 Raven <raven@sysadmins.ws> - 0.1.21-1
+- version bump
+
+* Wed Apr 22 2020 Raven <raven@sysadmins.ws> - 0.1.18rc4-1
+- initial build

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

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 <raven@sysadmins.ws> - 1.24.0-5
+- upgrade lua-nginx-module to 0.10.26
+
 * Mon Nov 20 2023 Raven <raven@sysadmins.ws> - 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 <raven@sysadmins.ws> - 1.24.0-3
+* Wed Oct 25 2023 Raven <raven@sysadmins.ws> - 1.24.0-3
 - backported 284a0c7 and c93cb45 from 1.25.3
 
 * Mon Oct 23 2023 Raven <raven@sysadmins.ws> - 1.24.0-2