packages: apache-mod_security/apache-mod_security.conf, apache-mod_security...

[gotar]

Author: gotar                        Date: Thu Apr 15 18:47:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use modsecurity.conf-minimal by default with the rest of base rules,
- set SecDataDir to /var/run/httpd, package *.data files,
- S: apache-mod_headers for crs_49_header_tagging, rel. 3

---- Files affected:
packages/apache-mod_security:
   apache-mod_security.conf (1.4 -> 1.5) , apache-mod_security.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/apache-mod_security/apache-mod_security.conf
diff -u packages/apache-mod_security/apache-mod_security.conf:1.4 packages/apache-mod_security/apache-mod_security.conf:1.5
--- packages/apache-mod_security/apache-mod_security.conf:1.4	Sat Jun 13 15:02:51 2009
+++ packages/apache-mod_security/apache-mod_security.conf	Thu Apr 15 20:47:04 2010
@@ -8,6 +8,7 @@
 	# This is the ModSecurity Core Rules Set.
 
 	# Basic configuration goes in here
+	Include conf.d/modsecurity.d/modsecurity.conf-minimal
 	Include conf.d/modsecurity.d/modsecurity_crs_10_config.conf
 
 	# Protocol violation and anomalies.
@@ -31,7 +32,32 @@
 
 	# Include modsecurity.d/modsecurity_crs_55_marketing.conf
 
+	Include conf.d/modsecurity.d/modsecurity_crs_23_request_limits.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_41_phpids_converter.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_41_phpids_filters.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_41_sql_injection_attacks.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_41_xss_attacks.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_42_tight_security.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_47_common_exceptions.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_48_local_exceptions.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_49_enforcement.conf
+	Include conf.d/modsecurity.d/modsecurity_crs_49_inbound_blocking.conf
+
+	# Optional rules
+
+	# Include conf.d/modsecurity.d/modsecurity_crs_40_experimental.conf
+	# Include conf.d/modsecurity.d/modsecurity_crs_42_comment_spam.conf
+	# Include conf.d/modsecurity.d/modsecurity_crs_46_et_sql_injection.conf
+	# Include conf.d/modsecurity.d/modsecurity_crs_46_et_web_rules.conf
+	# <IfModule mod_headers.c>
+	#	Include conf.d/modsecurity.d/modsecurity_crs_49_header_tagging.conf
+	# </IfModule>
+	# Include conf.d/modsecurity.d/modsecurity_crs_59_outbound_blocking.conf
+	# Include conf.d/modsecurity.d/modsecurity_crs_60_correlation.conf
+
 	# Put your local rules in here.
 
 	Include conf.d/modsecurity.d/modsecurity_localrules.conf
+
+	SecDataDir	/var/run/httpd
 </IfModule>

================================================================
Index: packages/apache-mod_security/apache-mod_security.spec
diff -u packages/apache-mod_security/apache-mod_security.spec:1.31 packages/apache-mod_security/apache-mod_security.spec:1.32
--- packages/apache-mod_security/apache-mod_security.spec:1.31	Thu Apr 15 13:15:19 2010
+++ packages/apache-mod_security/apache-mod_security.spec	Thu Apr 15 20:47:04 2010
@@ -5,7 +5,7 @@
 Summary(pl.UTF-8):	Moduł do apache: ochrona aplikacji WWW
 Name:		apache-mod_%{mod_name}
 Version:	2.5.12
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
@@ -16,6 +16,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apache-mod_unique_id
+Suggests:	apache-mod_headers
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
@@ -57,7 +58,7 @@
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/90_mod_%{mod_name}.conf
 
 install -d $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/blocking
-cp -a rules/*.conf rules/base_rules/* $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d
+cp -a modsecurity.conf-minimal rules/*.conf rules/base_rules/* $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d
 #cp -a rules/blocking/*.conf $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/blocking
 echo '# Drop your local rules in here.' > $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/modsecurity_localrules.conf
 
@@ -74,11 +75,11 @@
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES MODSECURITY_LICENSING_EXCEPTION README.* modsecurity* doc/* rules/optional_rules rules/README.rules rules/CHANGELOG.rules
+%doc CHANGES MODSECURITY_LICENSING_EXCEPTION README.* modsecurity* doc/* rules/optional_rules rules/README.rules rules/CHANGELOG.rules tools
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
 %dir %{apacheconfdir}/modsecurity.d
 %dir %{apacheconfdir}/modsecurity.d/blocking
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/modsecurity.d/*.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/modsecurity.d/*.*
 #%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/modsecurity.d/blocking/*.conf
 %attr(755,root,root) %{apachelibdir}/*.so
 
@@ -88,6 +89,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2010/04/15 18:47:04  gotar
+- use modsecurity.conf-minimal by default with the rest of base rules,
+- set SecDataDir to /var/run/httpd, package *.data files,
+- S: apache-mod_headers for crs_49_header_tagging, rel. 3
+
 Revision 1.31  2010/04/15 11:15:19  gotar
 - install base rules, rel. 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_security/apache-mod_security.conf?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_security/apache-mod_security.spec?r1=1.31&r2=1.32&f=u