demus/mod_security-rpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to 2.9.0

Browse Source 
- Remove backported patch
- Add patch to fix lua 5.3 build issue (PR #837)
This commit is contained in:
Athmane Madjoudj 2015-02-13 13:33:30 +01:00
parent 5df960fd89
commit 12990c8b41
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,3 +15,4 @@ modsecurity-apache_2.5.12.tar.gz
/modsecurity-apache_2.7.7.tar.gz.sha256 /modsecurity-apache_2.7.7.tar.gz.sha256
/modsecurity-2.8.0.tar.gz /modsecurity-2.8.0.tar.gz
/modsecurity-2.8.0.tar.gz.sha256 /modsecurity-2.8.0.tar.gz.sha256
/modsecurity-2.9.0.tar.gz

13
mod_security.spec
View File

@ -9,8 +9,8 @@
Summary: Security module for the Apache HTTP Server Summary: Security module for the Apache HTTP Server
Name: mod_security Name: mod_security
Version: 2.8.0 Version: 2.9.0
Release: 7%{?dist} Release: 1%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: http://www.modsecurity.org/ URL: http://www.modsecurity.org/
Group: System Environment/Daemons Group: System Environment/Daemons
@ -18,9 +18,11 @@ Source: https://www.modsecurity.org/tarball/%{version}/modsecurity-%{version}.ta
Source1: mod_security.conf Source1: mod_security.conf
Source2: 10-mod_security.conf Source2: 10-mod_security.conf
Source3: modsecurity_localrules.conf Source3: modsecurity_localrules.conf
Patch0: 0001-mlogc-Changes-the-default-SSL-algo-to-TLS-1.2.patch # Github PR #837
Patch0: modsecurity-2.9.0-fix-lua53-build.patch
Requires: httpd httpd-mmn = %{_httpd_mmn} Requires: httpd httpd-mmn = %{_httpd_mmn}
BuildRequires: httpd-devel libxml2-devel pcre-devel lua-devel BuildRequires: httpd-devel libxml2-devel pcre-devel lua-devel
# Required for force recent TLS version
BuildRequires: curl-devel >= 7.38.0 BuildRequires: curl-devel >= 7.38.0
%description %description
@ -123,6 +125,11 @@ rm -rf %{buildroot}
%endif %endif
%changelog %changelog
* Fri Feb 13 2015 Athmane Madjoudj <athmane@fedoraproject.org> 2.9.0-1
- Update to 2.9.0
- Remove backported patch
- Add patch to fix lua 5.3 build issue (PR #837)
* Tue Nov 04 2014 Athmane Madjoudj <athmane@fedoraproject.org> 2.8.0-7 * Tue Nov 04 2014 Athmane Madjoudj <athmane@fedoraproject.org> 2.8.0-7
- Make sure mod_security is built with correct curl version - Make sure mod_security is built with correct curl version

16
modsecurity-2.9.0-fix-lua53-build.patch Normal file
View File

@ -0,0 +1,16 @@
diff -ru modsecurity-2.9.0.orig/apache2/msc_lua.c modsecurity-2.9.0/apache2/msc_lua.c
--- modsecurity-2.9.0.orig/apache2/msc_lua.c 2015-02-12 20:08:30.000000000 +0100
+++ modsecurity-2.9.0/apache2/msc_lua.c 2015-02-13 13:07:42.976716385 +0100
@@ -111,8 +111,11 @@
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;

2
sources
View File

@ -1 +1 @@
52035dcec07523cb6cc2149b2a180e20 modsecurity-2.8.0.tar.gz ecf42d21f26338443d7111891851628c modsecurity-2.9.0.tar.gz