Hello community,
here is the log from the commit of package apache2-mod_security2 for
openSUSE:Factory checked in at 2015-08-05 06:50:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_security2 (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_security2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_security2"
Changes:
--------
---
/work/SRC/openSUSE:Factory/apache2-mod_security2/apache2-mod_security2.changes
2015-07-20 11:21:08.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.apache2-mod_security2.new/apache2-mod_security2.changes
2015-08-05 06:50:59.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 29 06:42:19 UTC 2015 - [email protected]
+
+- fix build for lua 5.3
+ + apache2-mod_security2-lua-5.3.patch
+
+-------------------------------------------------------------------
New:
----
apache2-mod_security2-lua-5.3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_security2.spec ++++++
--- /var/tmp/diff_new_pack.s0nz2b/_old 2015-08-05 06:51:00.000000000 +0200
+++ /var/tmp/diff_new_pack.s0nz2b/_new 2015-08-05 06:51:00.000000000 +0200
@@ -38,6 +38,8 @@
Source7: empty.conf
Patch0: apache2-mod_security2-no_rpath.diff
Patch1: modsecurity-fixes.patch
+# https://github.com/SpiderLabs/ModSecurity/pull/837
+Patch2: apache2-mod_security2-lua-5.3.patch
BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel
BuildRequires: apache2-prefork
@@ -73,6 +75,7 @@
bzip2 -dc %{SOURCE4} > %{_sourcedir}/%{faq} && touch -r %{SOURCE4}
%{_sourcedir}/%{faq}
%patch0
%patch1 -p1
+%patch2 -p1
%build
# aclocal only works with never distributions,
++++++ apache2-mod_security2-lua-5.3.patch ++++++
>From 422e22141b9f6cdd0496919093fcf51b02732b84 Mon Sep 17 00:00:00 2001
From: Athmane Madjoudj <[email protected]>
Date: Fri, 13 Feb 2015 13:24:50 +0100
Subject: [PATCH] Fix build issue with Lua >= 5.3
---
apache2/msc_lua.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/apache2/msc_lua.c b/apache2/msc_lua.c
index f4482ae..58206a7 100644
--- a/apache2/msc_lua.c
+++ b/apache2/msc_lua.c
@@ -111,8 +111,11 @@ char *lua_compile(msc_script **script, const char
*filename, apr_pool_t *pool) {
dump.pool = pool;
dump.parts = apr_array_make(pool, 128, sizeof(msc_script_part *));
+#if LUA_VERSION_NUM >= 503
+ lua_dump(L, dump_writer, &dump, 1);
+#else
lua_dump(L, dump_writer, &dump);
-
+#endif
(*script) = apr_pcalloc(pool, sizeof(msc_script));
(*script)->name = filename;
(*script)->parts = dump.parts;