From dc4a57cecdd0e0268823a280be0110a4b0fbba9c Mon Sep 17 00:00:00 2001 From: Michael Fleming Date: Sat, 7 Nov 2009 01:00:17 +0000 Subject: [PATCH] - Fix rules and Apache configuration (bz#533124) --- mod_security.spec | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/mod_security.spec b/mod_security.spec index c77862c..40f258d 100644 --- a/mod_security.spec +++ b/mod_security.spec @@ -1,7 +1,7 @@ Summary: Security module for the Apache HTTP Server Name: mod_security Version: 2.5.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.modsecurity.org/ Group: System Environment/Daemons @@ -31,9 +31,10 @@ make %{_smp_mflags} mlogc rm -rf %{buildroot} install -D -m755 apache2/.libs/mod_security2.so %{buildroot}/%{_libdir}/httpd/modules/mod_security2.so install -D -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/mod_security.conf -install -d %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/optional_rules/ -cp -r rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/ -cp -r rules/optional_rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/optional_rules/ +install -d %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/ +install -D -m644 rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/ +cp -R rules/base_rules %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/ +cp -R rules/optional_rules %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/ install -D -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/modsecurity_localrules.conf install -Dp tools/mlogc %{buildroot}/%{_bindir}/mlogc install -D -m644 apache2/mlogc-src/mlogc-default.conf %{buildroot}/%{_sysconfdir}/mlogc.conf @@ -43,24 +44,33 @@ rm -rf %{buildroot} %files %defattr (-,root,root) -%doc CHANGES LICENSE README.* modsecurity* doc MODSECURITY_LICENSING_EXCEPTION +%doc rules/util CHANGES LICENSE README.* modsecurity* doc MODSECURITY_LICENSING_EXCEPTION %{_libdir}/httpd/modules/mod_security2.so %{_bindir}/mlogc %config(noreplace) %{_sysconfdir}/mlogc.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf %dir %{_sysconfdir}/httpd/modsecurity.d -%dir %{_sysconfdir}/httpd/modsecurity.d/optional_rules +%{_sysconfdir}/httpd/modsecurity.d/optional_rules +%{_sysconfdir}/httpd/modsecurity.d/base_rules %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/*.conf -%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf %changelog +* Fri Nov 6 2009 Michael Fleming - 2.5.10-2 +- Fix rules and Apache configuration (bz#533124) + * Thu Oct 8 2009 Michael Fleming - 2.5.10-1 - Upgrade to 2.5.10 (with Core Rules v2) +* Sat Jul 25 2009 Fedora Release Engineering - 2.5.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Mar 12 2009 Michael Fleming 2.5.9-1 - Update to upstream release 2.5.9 - Fixes potential DoS' in multipart request and PDF XSS handling +* Wed Feb 25 2009 Fedora Release Engineering - 2.5.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 29 2008 Michael Fleming 2.5.7-1 - Update to upstream 2.5.7 - Reinstate mlogc