dist-git conversion

#2781)

.cvsignore

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

.gitignore

@@ -0,0 +1 @@
+modsecurity-apache_2.5.10.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

@@ -7,30 +7,7 @@ LoadModule unique_id_module modules/mod_unique_id.so
 	# This is the ModSecurity Core Rules Set.
 	
 	# Basic configuration goes in here
-	Include modsecurity.d/modsecurity_crs_10_config.conf
-	
-	# Protocol violation and anomalies.
-	
-	Include modsecurity.d/modsecurity_crs_20_protocol_violations.conf
-	Include modsecurity.d/modsecurity_crs_21_protocol_anomalies.conf
-	
-	# HTTP policy rules
-	
-	Include modsecurity.d/modsecurity_crs_30_http_policy.conf
-
-	# Here comes the Bad Stuff...
-	
-	Include modsecurity.d/modsecurity_crs_35_bad_robots.conf
-	Include modsecurity.d/modsecurity_crs_40_generic_attacks.conf
-	Include modsecurity.d/modsecurity_crs_45_trojans.conf
-	Include modsecurity.d/modsecurity_crs_50_outbound.conf
-
-	# Search engines and other crawlers. Only useful if you want to track
-	# Google / Yahoo et. al.
-	
-	# Include modsecurity.d/modsecurity_crs_55_marketing.conf
-	
-	# Put your local rules in here.
-
+	Include modsecurity.d/*.conf
+	Include modsecurity.d/base_rules/*.conf
 	Include modsecurity.d/modsecurity_localrules.conf
 </IfModule>

mod_security.spec

@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.5.6
-Release: 1%{?dist}
+Version: 2.5.10
+Release: 2%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -25,30 +25,56 @@ as a powerful umbrella - shielding web applications from attacks.
 cd apache2
 %configure
 make %{_smp_mflags}
+make %{_smp_mflags} mlogc
 
 %install
 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
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr (-,root,root)
-%doc CHANGES LICENSE README.* modsecurity* doc 
+%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 <mfleming+rpm@thatfleminggent.com> - 2.5.10-2
+- Fix rules and Apache configuration (bz#533124)
+
+* Thu Oct 8 2009 Michael Fleming <mfleming+rpm@thatfleminggent.com> - 2.5.10-1
+- Upgrade to 2.5.10 (with Core Rules v2)
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Mar 12 2009 Michael Fleming <mfleming+rpm@thatfleminggent.com> 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 <rel-eng@lists.fedoraproject.org> - 2.5.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Dec 29 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.5.7-1
+- Update to upstream 2.5.7
+- Reinstate mlogc
+
 * Sat Aug 2 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.5.6-1
 - Update to upstream 2.5.6
 - Remove references to mlogc, it no longer ships in the main tarball.

sources

@@ -1 +1 @@
-eb9e80a232269378752aa5b81f3e99f8  modsecurity-apache_2.5.6.tar.gz
+a049f858e297fb16579b5dbb0d5d692d  modsecurity-apache_2.5.10.tar.gz