From tmueko@thegates.kommunity.net  Fri Oct 12 12:21:37 2007
Return-Path: <tmueko@thegates.kommunity.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A774E16A46B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Oct 2007 12:21:37 +0000 (UTC)
	(envelope-from tmueko@thegates.kommunity.net)
Received: from thegates.kommunity.net (thegates.kommunity.net [195.20.112.252])
	by mx1.freebsd.org (Postfix) with ESMTP id 274DD13C46B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Oct 2007 12:21:36 +0000 (UTC)
	(envelope-from tmueko@thegates.kommunity.net)
Received: from thegates.kommunity.net (localhost [127.0.0.1])
	by thegates.kommunity.net (8.13.8/8.13.8) with ESMTP id l9CC8lkV042115
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 12 Oct 2007 14:08:47 +0200 (CEST)
	(envelope-from tmueko@thegates.kommunity.net)
Received: (from tmueko@localhost)
	by thegates.kommunity.net (8.13.8/8.13.8/Submit) id l9CC8knC042114;
	Fri, 12 Oct 2007 14:08:47 +0200 (CEST)
	(envelope-from tmueko)
Message-Id: <200710121208.l9CC8knC042114@thegates.kommunity.net>
Date: Fri, 12 Oct 2007 14:08:47 +0200 (CEST)
From: Tom Mueller-Kortkamp <tmueko@kommunity.net>
Reply-To: Tom Mueller-Kortkamp <tmueko@kommunity.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: fix for www/mod_clamav
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         117135
>Category:       ports
>Synopsis:       fix for www/mod_clamav
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 12 12:30:03 UTC 2007
>Closed-Date:    Mon Oct 15 15:37:28 UTC 2007
>Last-Modified:  Mon Oct 15 15:40:02 UTC 2007
>Originator:     Tom Mueller-Kortkamp
>Release:        FreeBSD 6.2-RELEASE-p7 i386
>Organization:
Kommunity GmbH & Co. KG
>Environment:
System: FreeBSD thegates.kommunity.net 6.2-RELEASE

>Description:
	Fix for broken mod_clamav
>How-To-Repeat:

>Fix:

--- mod_clamav begins here ---
diff -Nur mod_clamav.bak/Makefile mod_clamav/Makefile
--- mod_clamav.bak/Makefile	Fri Oct 12 09:58:24 2007
+++ mod_clamav/Makefile	Fri Oct 12 09:58:54 2007
@@ -14,8 +14,6 @@
 MAINTAINER=	tmueko@kommunity.net
 COMMENT=	Scans content delivered by the Apache2 proxy module for viruses
 
-BROKEN=		doesn't work since cl_buildtrie() and cl_freetrie() where removed from clamlib (upstream problem)
-
 LIB_DEPENDS+=	clamav:${PORTSDIR}/${CLAMAV_PORT}
 
 USE_AUTOTOOLS=	libtool:15
diff -Nur mod_clamav.bak/files/patch-mod_clamav.c mod_clamav/files/patch-mod_clamav.c
--- mod_clamav.bak/files/patch-mod_clamav.c	Thu Jan  1 01:00:00 1970
+++ mod_clamav/files/patch-mod_clamav.c	Fri Oct 12 10:04:22 2007
@@ -0,0 +1,25 @@
+--- 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 */
--- mod_clamav ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Mon Oct 15 15:02:51 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117135 
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Mon Oct 15 15:37:26 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117135 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117135: commit references a PR
Date: Mon, 15 Oct 2007 15:35:31 +0000 (UTC)

 garga       2007-10-15 15:35:25 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/mod_clamav       Makefile 
   Added files:
     www/mod_clamav/files patch-mod_clamav.c 
   Log:
   - Unbreak
   
   PR:             ports/117135
   Submitted by:   maintainer
   
   Revision  Changes    Path
   1.11      +0 -2      ports/www/mod_clamav/Makefile
   1.3       +25 -0     ports/www/mod_clamav/files/patch-mod_clamav.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
