ports/57379: [FIX] security/clamav 0.60

[Martin Matuska]

>Number:         57379
>Category:       ports
>Synopsis:       [FIX] security/clamav 0.60
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 29 17:30:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska <martin at tradex.sk>
>Release:        FreeBSD 4.8-RELEASE-p10 i386
>Organization:
>Environment:
FreeBSD 4.8-RELEASE-p10 i386
>Description:
	The clamd socket has to be deleted before starting via rc_subr.

>How-To-Repeat:
>Fix:
--- Makefile.orig	Tue Sep 30 00:45:14 2003
+++ Makefile	Tue Sep 30 02:02:48 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	clamav
 PORTVERSION=	0.60
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	clamav
@@ -40,8 +40,11 @@
 MAN5=		clamav.conf.5
 MAN8=		clamd.8
 
+CLAMD_SOCKET?=	/var/run/clamav/clamd
+
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%DATADIR%%|${DATADIR}|g'
+		-e 's|%%DATADIR%%|${DATADIR}|g' \
+		-e 's|%%CLAMD_SOCKET%%|${CLAMD_SOCKET}|g'
 
 SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 		-e 's|^\#?(LogFile) .*$$|\1 /var/log/clamav/clamd.log|' \
--- files/clamd.sh.orig	Tue Sep 30 00:47:27 2003
+++ files/clamd.sh	Tue Sep 30 00:54:25 2003
@@ -22,6 +22,7 @@
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/clamd
+start_precmd="rm -f %%CLAMD_SOCKET%%"
 pidfile=/var/run/clamav/clamd.pid
 required_dirs=%%DATADIR%%
 required_files=%%PREFIX%%/etc/clamav.conf
>Release-Note:
>Audit-Trail:
>Unformatted: