rpms/mod_security/EL-5 .cvsignore, 1.7, 1.8 mod_security.conf, 1.5, 1.6 mod_security.spec, 1.16, 1.17 sources, 1.8, 1.9

[Michael G. Fleming (mfleming)]

Author: mfleming

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

Modified Files:
	.cvsignore mod_security.conf mod_security.spec sources 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Apr 2007 10:33:48 -0000	1.7
+++ .cvsignore	19 Jun 2007 09:59:15 -0000	1.8
@@ -1,3 +1,3 @@
-modsecurity-apache_2.1.0.tar.gz
+modsecurity-apache_2.1.1.tar.gz
 mod_security.conf
 modsecurity_localrules.conf


Index: mod_security.conf
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/mod_security.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_security.conf	2 Apr 2007 10:33:48 -0000	1.5
+++ mod_security.conf	19 Jun 2007 09:59:15 -0000	1.6
@@ -12,11 +12,9 @@
 	Include modsecurity.d/modsecurity_crs_10_config.conf
 	
 	# Protocol violation and anomalies.
-	# These are disabled as there's a bug in REQUEST_FILENAME handling
-	# causing the "+" character to be incorrectly handled.
 	
-	# Include modsecurity.d/modsecurity_crs_20_protocol_violations.conf
-	# Include modsecurity.d/modsecurity_crs_21_protocol_anomalies.conf
+	Include modsecurity.d/modsecurity_crs_20_protocol_violations.conf
+	Include modsecurity.d/modsecurity_crs_21_protocol_anomalies.conf
 	
 	# HTTP policy rules
 	
@@ -35,7 +33,6 @@
 	# Include modsecurity.d/modsecurity_crs_55_marketing.conf
 	
 	# Put your local rules in here.
-	# The existing example is for the CVE-2007-1359 vulnerability
 
 	Include modsecurity.d/modsecurity_localrules.conf
 </IfModule>


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/mod_security.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_security.spec	2 Apr 2007 10:33:48 -0000	1.16
+++ mod_security.spec	19 Jun 2007 09:59:15 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.0
-Release: 3%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -41,17 +41,21 @@
 %defattr (-,root,root)
 %doc CHANGES LICENSE README.* modsecurity* doc
 %{_libdir}/httpd/modules/mod_security2.so
-%config %{_sysconfdir}/httpd/conf.d/mod_security.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 %dir %{_sysconfdir}/httpd/modsecurity.d
 %dir %{_sysconfdir}/httpd/modsecurity.d/blocking
-%config %{_sysconfdir}/httpd/modsecurity.d/*.conf
-%config %{_sysconfdir}/httpd/modsecurity.d/blocking/*.conf
+%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/*.conf
+%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/blocking/*.conf
 
 
 %changelog
-* Mon Apr 2 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.0-3
-- Sync with devel
-- Fix CVE-2007-1359 (bz #231728)
+* Tue Jun 19 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.1-1
+- New upstream release
+- Drop ASCIIZ rule (fixed upstream)
+- Re-enable protocol violation/anomalies rules now that REQUEST_FILENAME
+  is fixed upstream.
+
+* Sun Apr 1 2007 Michael Fleming <mfleming+rpm at enlartenment.com> 2.1.0-3
 - Automagically configure correct library path for libxml2 library.
 - Add LoadModule for mod_unique_id as the logging wants this at runtime
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Apr 2007 10:33:48 -0000	1.8
+++ sources	19 Jun 2007 09:59:15 -0000	1.9
@@ -1,3 +1,3 @@
-2e919766f2878c4ee46334816004dd15  modsecurity-apache_2.1.0.tar.gz
-ca0529cce7b56675e5f319c75cbb7398  mod_security.conf
-cbd1dbca89666a85fe9d703de26444c6  modsecurity_localrules.conf
+ab74ed5f320ffc4ed9f56487bf17c670  modsecurity-apache_2.1.1.tar.gz
+f84917a3f4893b8bf9400755a1a9f883  mod_security.conf
+80dc93f186cab170828d0ac621baac30  modsecurity_localrules.conf