Author: gotar Date: Sat Jun 13 13:02:57 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- restored local rules
---- Files affected:
packages/apache-mod_security:
apache-mod_security.conf (1.3 -> 1.4) , apache-mod_security.spec (1.26 ->
1.27)
---- Diffs:
================================================================
Index: packages/apache-mod_security/apache-mod_security.conf
diff -u packages/apache-mod_security/apache-mod_security.conf:1.3
packages/apache-mod_security/apache-mod_security.conf:1.4
--- packages/apache-mod_security/apache-mod_security.conf:1.3 Sat Jun 13
14:34:51 2009
+++ packages/apache-mod_security/apache-mod_security.conf Sat Jun 13
15:02:51 2009
@@ -33,5 +33,5 @@
# Put your local rules in here.
- # Include conf.d/modsecurity.d/modsecurity_localrules.conf
+ Include conf.d/modsecurity.d/modsecurity_localrules.conf
</IfModule>
================================================================
Index: packages/apache-mod_security/apache-mod_security.spec
diff -u packages/apache-mod_security/apache-mod_security.spec:1.26
packages/apache-mod_security/apache-mod_security.spec:1.27
--- packages/apache-mod_security/apache-mod_security.spec:1.26 Sat Jun 13
14:43:40 2009
+++ packages/apache-mod_security/apache-mod_security.spec Sat Jun 13
15:02:51 2009
@@ -15,7 +15,7 @@
BuildRequires: apache-devel
BuildRequires: rpmbuild(macros) >= 1.268
Requires: apache(modules-api) = %apache_modules_api
-Requires: apache(mod_unique_id)
+Requires: apache-mod_unique_id
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define apacheconfdir %(%{apxs} -q SYSCONFDIR
2>/dev/null)/conf.d
@@ -59,7 +59,7 @@
install -d $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/blocking
cp -a rules/*.conf $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
+echo '# Drop your local rules in here.' >
$RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/modsecurity_localrules.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -74,7 +74,7 @@
%files
%defattr(644,root,root,755)
-%doc CHANGES 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
%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
@@ -88,6 +88,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2009/06/13 13:02:51 gotar
+- restored local rules
+
Revision 1.26 2009/06/13 12:43:40 gotar
- [error] ModSecurity: ModSecurity requires mod_unique_id to be installed.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_security/apache-mod_security.conf?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_security/apache-mod_security.spec?r1=1.26&r2=1.27&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
