public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mod_security] f43: update to 2.9.12, rebuild for lua 5.5
@ 2026-06-11 11:23 Tom spot Callaway
  0 siblings, 0 replies; only message in thread
From: Tom spot Callaway @ 2026-06-11 11:23 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/mod_security
Branch : f43
Commit : 33f81e0cf697696f33d7e273c1abcaf595e9aed7
Author : Tom spot Callaway <spotaws@amazon.com>
Date   : 2026-03-14T17:34:54-04:00
Stats  : +42/-3 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/mod_security/c/33f81e0cf697696f33d7e273c1abcaf595e9aed7?branch=f43

Log:
update to 2.9.12, rebuild for lua 5.5

---
diff --git a/.gitignore b/.gitignore
index a97e602..923a2b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ modsecurity-apache_2.5.12.tar.gz
 /modsecurity-v2.9.8.tar.gz
 /modsecurity-v2.9.9.tar.gz
 /modsecurity-v2.9.11.tar.gz
+/modsecurity-v2.9.12.tar.gz

diff --git a/mod_security-2.9.12-lua-5.5.patch b/mod_security-2.9.12-lua-5.5.patch
new file mode 100644
index 0000000..eb88160
--- /dev/null
+++ b/mod_security-2.9.12-lua-5.5.patch
@@ -0,0 +1,31 @@
+diff -up modsecurity-v2.9.12/apache2/msc_lua.c.lua55 modsecurity-v2.9.12/apache2/msc_lua.c
+--- modsecurity-v2.9.12/apache2/msc_lua.c.lua55	2026-03-14 17:26:08.306090891 -0400
++++ modsecurity-v2.9.12/apache2/msc_lua.c	2026-03-14 17:27:24.031487783 -0400
+@@ -433,12 +433,12 @@ int lua_execute(msc_script *script, char
+ #else
+ 
+     /* Create new state. */
+-#if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 504 || LUA_VERSION_NUM == 501
++#if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 504 || LUA_VERSION_NUM == 505 || LUA_VERSION_NUM == 501
+     L = luaL_newstate();
+ #elif LUA_VERSION_NUM == 500
+     L = lua_open();
+ #else
+-#error We are only tested under Lua 5.0, 5.1, 5.2, 5.3, or 5.4.
++#error We are only tested under Lua 5.0, 5.1, 5.2, 5.3, 5.4, or 5.5.
+ #endif
+     luaL_openlibs(L);
+ 
+@@ -463,10 +463,10 @@ int lua_execute(msc_script *script, char
+     /* Register functions. */
+ #if LUA_VERSION_NUM == 500 || LUA_VERSION_NUM == 501
+     luaL_register(L, "m", mylib);
+-#elif LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 504
++#elif LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503 || LUA_VERSION_NUM == 504 || LUA_VERSION_NUM == 505
+     luaL_setfuncs(L, mylib, 0);
+ #else
+-#error We are only tested under Lua 5.0, 5.1, 5.2, 5.3, or 5.4.
++#error We are only tested under Lua 5.0, 5.1, 5.2, 5.3, 5.4, or 5.5.
+ #endif
+ 
+     lua_setglobal(L, "m");

diff --git a/mod_security.spec b/mod_security.spec
index 88ef637..961a2ca 100644
--- a/mod_security.spec
+++ b/mod_security.spec
@@ -11,8 +11,8 @@
 
 Summary: Security module for the Apache HTTP Server
 Name: mod_security
-Version: 2.9.11
-Release: 3%{?dist}
+Version: 2.9.12
+Release: 1%{?dist}
 License: Apache-2.0
 URL: http://www.modsecurity.org/
 Source: https://github.com/owasp-modsecurity/ModSecurity/releases/download/v%{version}/modsecurity-v%{version}.tar.gz
@@ -23,6 +23,9 @@ Patch1: modsecurity-2.9.3-apulibs.patch
 Patch2: mod_security-2.9.3-remote-rules-timeout.patch
 Patch3: mod_security-2.9.7-send_error_bucket.patch
 Patch4: mod_security-2.9.7-pipedlogs.patch
+# https://github.com/owasp-modsecurity/ModSecurity/commit/0843a27048c802b63122a190a63ae8469abc55eb
+# https://github.com/owasp-modsecurity/ModSecurity/commit/6d6deb10af260c907cc5b9ad522a6a103ba714e1
+Patch5: mod_security-2.9.12-lua-5.5.patch
 
 Requires: httpd httpd-mmn = %{_httpd_mmn}
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -148,6 +151,10 @@ install -m0644 mlogc/mlogc-default.conf %{buildroot}%{_sysconfdir}/mlogc.conf
 %endif
 
 %changelog
+* Sat Mar 14 2026 Tom Callaway <spot@fedoraproject.org> - 2.9.12-1
+- update to 2.9.12
+- rebuild for lua 5.5
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index d62ba4d..c4bed51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modsecurity-v2.9.11.tar.gz) = caaf47037dd926faeec6acedfdde5277d43de35cf8f8b7e63a55c4dde178bbb8c758e80e4dcc18cce2cb9a0648df0845290e06485103e189e0299cecfc67c11e
+SHA512 (modsecurity-v2.9.12.tar.gz) = 1fce5fd3362a70271ce9255dc0ab51319ea84cbdbc508e4708a11e1699dbf61c2d85664c0cb015e3907cdfabb048aa334dc1ad73a9151bff75a22bd762a9d170

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-11 11:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-11 11:23 [rpms/mod_security] f43: update to 2.9.12, rebuild for lua 5.5 Tom spot Callaway

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox