update metadata; cleanup

(Portage version: 2.1.4)

4 files changed, 33 insertions, 32 deletions

diff --git a/www-apache/mod_evasive/ChangeLog b/www-apache/mod_evasive/ChangeLog
index 9c842960486d..7aa00fe2cd2c 100644
--- a/www-apache/mod_evasive/ChangeLog
+++ b/www-apache/mod_evasive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_evasive
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_evasive/ChangeLog,v 1.2 2007/09/10 10:30:02 hollow Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_evasive/ChangeLog,v 1.3 2008/01/31 18:48:36 hollow Exp $
+
+  31 Jan 2008; Benedikt Böhm <hollow@gentoo.org> files/10_mod_evasive.conf,
+  metadata.xml, mod_evasive-1.10.1.ebuild:
+  update metadata; cleanup
 
   10 Sep 2007; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
   fix metadata
diff --git a/www-apache/mod_evasive/files/10_mod_evasive.conf b/www-apache/mod_evasive/files/10_mod_evasive.conf
index 6c8b8b617ed7..31ea08c7bf09 100644
--- a/www-apache/mod_evasive/files/10_mod_evasive.conf
+++ b/www-apache/mod_evasive/files/10_mod_evasive.conf
@@ -1,31 +1,31 @@
 <IfDefine EVASIVE>
-	<IfModule !mod_evasive.c>
-		LoadModule evasive_module modules/mod_evasive.so
-	</IfModule>
+LoadModule evasive_module modules/mod_evasive.so
 
-	DOSHashTableSize 3097
-	DOSPageCount 5
-	DOSSiteCount 100
-	DOSPageInterval 2
-	DOSSiteInterval 2
-	DOSBlockingPeriod 10
+DOSHashTableSize 3097
+DOSPageCount 5
+DOSSiteCount 100
+DOSPageInterval 2
+DOSSiteInterval 2
+DOSBlockingPeriod 10
 
-	# Set here an email to notify the DoS to someone
-	# (here is better to set the server administrator email)
-	DOSEmailNotify root
+# Set here an email to notify the DoS to someone
+# (here is better to set the server administrator email)
+DOSEmailNotify root
 
-	# Uncomment this line if you want to execute a specific command
-	# after the DoS detection
-	#DOSSystemCommand    "su - someuser -c '/sbin/... %s ...'"
+# Uncomment this line if you want to execute a specific command
+# after the DoS detection
+#DOSSystemCommand    "su - someuser -c '/sbin/... %s ...'"
 
-	# Specify the desired mod_evasive log location
-	DOSLogDir /var/log/apache2/evasive
+# Specify the desired mod_evasive log location
+DOSLogDir /var/log/apache2/evasive
 
-	# WHITELISTING IP ADDRESSES
-	# IP addresses of trusted clients can be whitelisted to insure they are never
-	# denied.  The purpose of whitelisting is to protect software, scripts, local
-	# searchbots, or other automated tools from being denied for requesting large
-	# amounts of data from the server.
-	#DOSWhitelist    127.0.0.* 
-	#DOSWhitelist    172.16.1.*
+# WHITELISTING IP ADDRESSES
+# IP addresses of trusted clients can be whitelisted to insure they are never
+# denied.  The purpose of whitelisting is to protect software, scripts, local
+# searchbots, or other automated tools from being denied for requesting large
+# amounts of data from the server.
+#DOSWhitelist    127.0.0.* 
+#DOSWhitelist    172.16.1.*
 </IfDefine>
+
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_evasive/metadata.xml b/www-apache/mod_evasive/metadata.xml
index a1f5ceff2352..64a719ea1bfd 100644
--- a/www-apache/mod_evasive/metadata.xml
+++ b/www-apache/mod_evasive/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>apache</herd>
-	<maintainer>
-		<email>apache-bugs@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_evasive/mod_evasive-1.10.1.ebuild b/www-apache/mod_evasive/mod_evasive-1.10.1.ebuild
index 4a451b15cb89..433e921985a1 100644
--- a/www-apache/mod_evasive/mod_evasive-1.10.1.ebuild
+++ b/www-apache/mod_evasive/mod_evasive-1.10.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_evasive/mod_evasive-1.10.1.ebuild,v 1.1 2007/09/09 10:44:22 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_evasive/mod_evasive-1.10.1.ebuild,v 1.2 2008/01/31 18:48:36 hollow Exp $
 
 inherit apache-module eutils
 
 KEYWORDS="~amd64 ~x86"
 
-DESCRIPTION="mod_evasive is an evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack"
+DESCRIPTION="mod_evasive is an evasive maneuvers module to provide action in the event of an HTTP DoS"
 HOMEPAGE="http://www.zdziarski.com/projects/mod_evasive/"
 SRC_URI="http://www.zdziarski.com/projects/mod_evasive/${P/-/_}.tar.gz"