dist-git conversion

#2781)

.cvsignore

@@ -1,3 +0,0 @@
-mod_security.conf
-modsecurity-apache_2.1.0.tar.gz
-modsecurity_localrules.conf

.gitignore

@@ -0,0 +1 @@
+modsecurity-apache_2.1.7.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: mod_security
-# $Id$
-NAME := mod_security
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

mod_security.conf

@@ -12,11 +12,9 @@ LoadModule unique_id_module modules/mod_unique_id.so
 	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_20_protocol_violations.conf
-	# Include modsecurity.d/modsecurity_crs_21_protocol_anomalies.conf
+	Include modsecurity.d/modsecurity_crs_21_protocol_anomalies.conf
 	
 	# HTTP policy rules
 	
@@ -35,7 +33,6 @@ LoadModule unique_id_module modules/mod_unique_id.so
 	# 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>

mod_security.spec

@@ -1,8 +1,8 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.0
+Version: 2.1.7
-Release: 3%{?dist}
+Release: 1%{?dist}
-License: GPL
+License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
 Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -29,9 +29,9 @@ perl -pi.orig -e 's|LIBDIR|%{_libdir}|;' %{SOURCE1}
 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
@@ -41,14 +41,38 @@ rm -rf %{buildroot}
 %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
+%dir %{_sysconfdir}/httpd/modsecurity.d/optional_rules
-%config %{_sysconfdir}/httpd/modsecurity.d/*.conf
+%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/*.conf
-%config %{_sysconfdir}/httpd/modsecurity.d/blocking/*.conf
+%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
 
 %changelog
+* Sun Apr 13 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.7-1
+- Update to upstream 2.1.7
+
+* Sat Jan 27 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.5-1
+- Update to 2.1.5 (bz#425986)
+- "blocking" -> "optional_rules" per tarball ;-)
+
+
+* Thu Sep  13 2007 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.3-1
+- Update to 2.1.3
+- Update License tag per guidelines.
+
+* Mon Sep  3 2007 Joe Orton <jorton@redhat.com> 2.1.1-3
+- rebuild for fixed 32-bit APR (#254241)
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.1.1-2
+- Rebuild for selinux ppc32 issue.
+
+* Tue Jun 19 2007 Michael Fleming <mfleming+rpm@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@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

modsecurity_localrules.conf

@@ -0,0 +1,2 @@
+# Drop your local rules in here.
+

sources

@@ -1,3 +1 @@
-2e919766f2878c4ee46334816004dd15  modsecurity-apache_2.1.0.tar.gz
+19c34dd5611e0c516c0717de793f4640  modsecurity-apache_2.1.7.tar.gz
-cbd1dbca89666a85fe9d703de26444c6  modsecurity_localrules.conf
-ca0529cce7b56675e5f319c75cbb7398  mod_security.conf