5 files changed, 11 insertions, 90 deletions

diff --git a/www/mod_evasive/Makefile b/www/mod_evasive/Makefile
index 6ab3fbc01497..a080f48ad7e6 100644
--- a/www/mod_evasive/Makefile
+++ b/www/mod_evasive/Makefile
@@ -5,24 +5,23 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mod_dosevasive20
-PORTVERSION=	1.10
-PORTREVISION=	1
+PORTNAME=	mod_evasive
+PORTVERSION=	1.10.1
 CATEGORIES=	www security
-MASTER_SITES=	http://www.nuclearelephant.com/projects/dosevasive/ \
+MASTER_SITES=	http://www.zdziarski.com/projects/mod_evasive/ \
 		ftp://ftp.oav.net/pkg_freebsd/distfiles/
-DISTNAME=	mod_dosevasive_${PORTVERSION}
+DISTNAME=	mod_evasive_${PORTVERSION}
 DIST_SUBDIR=	apache2
 
 MAINTAINER=	kiwi@oav.net
-COMMENT=	An Apache 2 module to try to protect HTTP DoS or DDoS attacks
+COMMENT=	An Apache module to try to protect the HTTP Server from DoS/DDoS attacks
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 WANT_APACHE=	2
 AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
-WRKSRC=		${WRKDIR}/mod_dosevasive
+WRKSRC=		${WRKDIR}/mod_evasive
 
 PORTDOCS=	LICENSE README test.pl
 
@@ -31,8 +30,8 @@ PORTDOCS=	LICENSE README test.pl
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \
-		${WRKSRC}/mod_dosevasive.c ${WRKSRC}/mod_dosevasive20.c \
-		${WRKSRC}/mod_dosevasiveNSAPI.c
+		${WRKSRC}/mod_evasive.c ${WRKSRC}/mod_evasive20.c \
+		${WRKSRC}/mod_evasiveNSAPI.c
 
 post-install:
 .if !defined (NOPORTDOCS)
diff --git a/www/mod_evasive/distinfo b/www/mod_evasive/distinfo
index c7f767af1369..2f5b63ad5c28 100644
--- a/www/mod_evasive/distinfo
+++ b/www/mod_evasive/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache2/mod_dosevasive_1.10.tar.gz) = 5e5eee54b3fba64c83898828693931ff
-SHA256 (apache2/mod_dosevasive_1.10.tar.gz) = 8706ff58be35378fce2b7a916cc2bce6249a00c79eaa09e3ebbdb163d4e87bb9
-SIZE (apache2/mod_dosevasive_1.10.tar.gz) = 19567
+MD5 (apache2/mod_evasive_1.10.1.tar.gz) = 784fca4a124f25ccff5b48c7a69a65e5
+SHA256 (apache2/mod_evasive_1.10.1.tar.gz) = 07c45139aa313899484a900f0fc162b3e17eb4f60fe474d7f3dd6c9941e95667
+SIZE (apache2/mod_evasive_1.10.1.tar.gz) = 20454
diff --git a/www/mod_evasive20/Makefile b/www/mod_evasive20/Makefile
deleted file mode 100644
index 6ab3fbc01497..000000000000
--- a/www/mod_evasive20/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:	mod_dosevasive20
-# Date created:				26 Jul 2004
-# Whom:					Xavier Beaudouin <kiwi@oav.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mod_dosevasive20
-PORTVERSION=	1.10
-PORTREVISION=	1
-CATEGORIES=	www security
-MASTER_SITES=	http://www.nuclearelephant.com/projects/dosevasive/ \
-		ftp://ftp.oav.net/pkg_freebsd/distfiles/
-DISTNAME=	mod_dosevasive_${PORTVERSION}
-DIST_SUBDIR=	apache2
-
-MAINTAINER=	kiwi@oav.net
-COMMENT=	An Apache 2 module to try to protect HTTP DoS or DDoS attacks
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-WANT_APACHE=	2
-AP_FAST_BUILD=	YES
-AP_GENPLIST=	YES
-WRKSRC=		${WRKDIR}/mod_dosevasive
-
-PORTDOCS=	LICENSE README test.pl
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \
-		${WRKSRC}/mod_dosevasive.c ${WRKSRC}/mod_dosevasive20.c \
-		${WRKSRC}/mod_dosevasiveNSAPI.c
-
-post-install:
-.if !defined (NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.   for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.   endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/www/mod_evasive20/distinfo b/www/mod_evasive20/distinfo
deleted file mode 100644
index c7f767af1369..000000000000
--- a/www/mod_evasive20/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (apache2/mod_dosevasive_1.10.tar.gz) = 5e5eee54b3fba64c83898828693931ff
-SHA256 (apache2/mod_dosevasive_1.10.tar.gz) = 8706ff58be35378fce2b7a916cc2bce6249a00c79eaa09e3ebbdb163d4e87bb9
-SIZE (apache2/mod_dosevasive_1.10.tar.gz) = 19567
diff --git a/www/mod_evasive20/pkg-descr b/www/mod_evasive20/pkg-descr
deleted file mode 100644
index 338260dae53f..000000000000
--- a/www/mod_evasive20/pkg-descr
+++ /dev/null
@@ -1,30 +0,0 @@
-mod_dosevasive 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.
-It is also designed to be a detection and network management tool, and can be
-easily configured to talk to ipchains, firewalls, routers, and etcetera.
-mod_dosevasive presently reports abuses via email and syslog facilities.
-
-Detection is performed by creating an internal dynamic hash table of IP
-Addresses and URIs, and denying any single IP address from any of the
-following:
-
-    * Requesting the same page more than a few times per second
-    * Making more than 50 concurrent requests on the same child per second
-    * Making any requests while temporarily blacklisted (on a blocking list) 
-
-This method has worked well in both single-server script attacks as well as
-distributed attacks, but just like other evasive tools, is only as useful to
-the point of bandwidth and processor consumption (e.g. the amount of bandwidth
-and processor required to receive/process/respond to invalid requests), which
-is why it's a good idea to integrate this with your firewalls and routers for
-maximum protection.
-
-This module instantiates for each listener individually, and therefore has a
-built-in cleanup mechanism and scaling capabilities. Because of this per-child
-design, legitimate requests are never compromised (even from proxies and NAT
-addresses) but only scripted attacks. Even a user repeatedly clicking on
-'reload' should not be affected unless they do it maliciously. mod_dosevasive
-is fully tweakable through the Apache configuration file, easy to incorporate
-into your web server, and easy to use. 
-
-WWW: http://www.nuclearelephant.com/projects/dosevasive/