rpms/mod_security/EL-4 .cvsignore, 1.9, 1.10 mod_security.spec, 1.15, 1.16 sources, 1.10, 1.11

[Michael Fleming (mfleming)]

Author: mfleming

Update of /cvs/extras/rpms/mod_security/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3308

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Thu May 1 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.7-1
- New upstream release (bz #444794)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Sep 2007 07:53:14 -0000	1.9
+++ .cvsignore	1 May 2008 01:33:21 -0000	1.10
@@ -1 +1 @@
-modsecurity-apache_2.1.3.tar.gz
+modsecurity-apache_2.1.7.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/mod_security.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mod_security.spec	13 Sep 2007 07:53:14 -0000	1.15
+++ mod_security.spec	1 May 2008 01:33:21 -0000	1.16
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.3
+Version: 2.1.7
 Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
@@ -29,9 +29,9 @@
 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/blocking/
+install -d %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/optional_rules/
 cp -r rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/
-cp -r rules/blocking/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/blocking/
+cp -r rules/optional_rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/optional_rules/
 install -D -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/modsecurity_localrules.conf
 
 %clean
@@ -43,12 +43,15 @@
 %{_libdir}/httpd/modules/mod_security2.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 %dir %{_sysconfdir}/httpd/modsecurity.d
-%dir %{_sysconfdir}/httpd/modsecurity.d/blocking
+%dir %{_sysconfdir}/httpd/modsecurity.d/optional_rules
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/*.conf
-%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/blocking/*.conf
+%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
 
 %changelog
+* Thu May 1 2008 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.7-1
+- New upstream release (bz #444794)
+
 * Thu Sep 13 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.3-1
 - New upstream release
 - Update License tag per guidelines


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Sep 2007 07:53:14 -0000	1.10
+++ sources	1 May 2008 01:33:21 -0000	1.11
@@ -1 +1 @@
-b98a65ce4fd5deb343e295bac9490331  modsecurity-apache_2.1.3.tar.gz
+19c34dd5611e0c516c0717de793f4640  modsecurity-apache_2.1.7.tar.gz