ports/123594: maintainer update www/mod_clamav

[Tom Müller-Kortkamp]

>Number:         123594
>Category:       ports
>Synopsis:       maintainer update www/mod_clamav
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 11 19:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Tom Müller-Kortkamp
>Release:        RELENG_7_0
>Organization:
kommunity GmbH & Co. KG
>Environment:
FreeBSD parallels.lan 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008     root at logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386


>Description:
Update to 0.22.
Check that Apache-2.2 is NOT installed
>How-To-Repeat:

>Fix:
--- mod_clamav.orig/Makefile	2008-05-11 10:15:44.000000000 +0200
+++ mod_clamav/Makefile	2008-05-11 12:47:07.000000000 +0200
@@ -2,31 +2,39 @@
 # Date created:				Sun Oct 19
 # Whom:					Clement Laforet <clement at FreeBSD.org>
 #
-# $FreeBSD: ports/www/mod_clamav/Makefile,v 1.13 2008/04/16 16:10:18 garga Exp $
+# $FreeBSD: ports/www/mod_clamav/Makefile,v 1.12 2007/12/19 23:08:38 garga Exp $
 #
 
 PORTNAME=	mod_clamav
-PORTVERSION=	0.21
-PORTREVISION=	3
+PORTVERSION=	0.22
+#PORTREVISION=	1
 CATEGORIES=	www security
-MASTER_SITES=	http://software.othello.ch/mod_clamav/
+MASTER_SITES=	http://software.othello.ch/mod_clamav/ \
+		http://www.kommunity.net/download/mod_clamav/
 
 MAINTAINER=	tmueko at kommunity.net
-COMMENT=	Scans content delivered by the Apache2 proxy module for viruses
-
-LIB_DEPENDS+=	clamav.4:${PORTSDIR}/${CLAMAV_PORT}
+COMMENT=	Scans content delivered by the Apache20 proxy module for viruses
 
 USE_AUTOTOOLS=	libtool:15
 USE_APACHE=	YES
 WITH_APACHE2=	YES
 GNU_CONFIGURE=	yes
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/include/apache22/http_core.h) || exists(${LOCALBASE}/include/apache/http_core.h)
+IGNORE=	mod_clamav only compile and run with apache-2.0.x
+.endif
+
 .if defined(WITH_CLAMAVDEVEL)
-CLAMAV_PORT=	security/clamav-devel
+RUN_DEPENDS+=	libclamav:${PORTSDIR}/security/clamav-devel
+BUILD_DEPENDS+=	libclamav:${PORTSDIR}/security/clamav-devel
 .else
-CLAMAV_PORT=	security/clamav
+BUILD_DEPENDS+=	libclamav:${PORTSDIR}/security/clamav
 .endif
 
+RUN_DEPENDS+=	apache20:${PORTSDIR}/www/apache20
+
 CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs \
 		--libdir=${PREFIX}/lib/apache2
 CFLAGS+=	-I${LOCALBASE}/include
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN mod_clamav.orig/distinfo mod_clamav/distinfo
--- mod_clamav.orig/distinfo	2008-05-11 10:15:44.000000000 +0200
+++ mod_clamav/distinfo	2008-05-10 17:43:27.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (mod_clamav-0.21.tar.gz) = 98bd0d8628be8ddeae21da6623e57d20
-SHA256 (mod_clamav-0.21.tar.gz) = b5e2265582cfe5a10c6fb407d3ca0be0b6f5a4bad3e3750366450b93980d1254
-SIZE (mod_clamav-0.21.tar.gz) = 308497
+MD5 (mod_clamav-0.22.tar.gz) = 63d1a1fd02418a870e483a1a642dfb92
+SHA256 (mod_clamav-0.22.tar.gz) = f13c18ccfb6e40b7315db32c26c3602e14a4c9b7bf8e2ff23df87aca2e5f4341
+SIZE (mod_clamav-0.22.tar.gz) = 308718
diff -ruN mod_clamav.orig/files/patch-mod_clamav.c mod_clamav/files/patch-mod_clamav.c
--- mod_clamav.orig/files/patch-mod_clamav.c	2008-05-11 10:15:44.000000000 +0200
+++ mod_clamav/files/patch-mod_clamav.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
---- mod_clamav.c.bak	Fri Oct 12 10:03:41 2007
-+++ mod_clamav.c	Fri Oct 12 10:02:09 2007
-@@ -102,6 +102,22 @@
-     unsigned long	reloads;	/* number of database reloads (local) */
- } clamav_stats;
- 
-+const char *cl_perror(int clerror) /* deprecated */ 
-+{ 
-+	return cl_strerror(clerror); 
-+} 
-+ 
-+void cl_freetrie(struct cl_node *root) /* for backward compatibility */ 
-+{ 
-+	cl_free(root); 
-+} 
-+ 
-+int cl_buildtrie(struct cl_node *root) /* for backward compatibility */ 
-+{ 
-+	return cl_build(root); 
-+} 
-+ 
-+
- static void	clamav_virus_record(clamav_stats *stats, const char *uri,
- 		    const char *req, const char *virus, off_t size) {
-     /* find the index of the entry we are about to create */



>Release-Note:
>Audit-Trail:
>Unformatted: