From root@debank.tv  Tue Jun 15 08:05:15 2004
Return-Path: <root@debank.tv>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 947DD16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 15 Jun 2004 08:05:15 +0000 (GMT)
Received: from flappie.debank.tv (flappie.debank.tv [212.206.127.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EE7EA43D1D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 15 Jun 2004 08:05:14 +0000 (GMT)
	(envelope-from root@debank.tv)
Received: from localhost (localhost.debank.tv [127.0.0.1])
	by flappie.debank.tv (Postfix) with ESMTP id 73EBB52AD
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 15 Jun 2004 10:04:44 +0200 (CEST)
Received: from flappie.debank.tv ([127.0.0.1])
 by localhost (flappie.debank.tv [127.0.0.1]) (amavisd-new, port 10024)
 with LMTP id 89278-05-2 for <FreeBSD-gnats-submit@freebsd.org>;
 Tue, 15 Jun 2004 10:04:42 +0200 (CEST)
Received: by flappie.debank.tv (Postfix, from userid 0)
	id EDA2652C0; Tue, 15 Jun 2004 10:04:41 +0200 (CEST)
Message-Id: <20040615080441.EDA2652C0@flappie.debank.tv>
Date: Tue, 15 Jun 2004 10:04:41 +0200 (CEST)
From: Rob Evers <rob@debank.tv>
Reply-To: Rob Evers <rob@debank.tv>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update security/clamav to 0.73
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         67962
>Category:       ports
>Synopsis:       Update security/clamav to 0.73
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eik
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 15 08:10:25 GMT 2004
>Closed-Date:    Tue Jun 15 10:06:31 GMT 2004
>Last-Modified:  Tue Jun 15 10:06:31 GMT 2004
>Originator:     Rob Evers
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD flappie.debank.tv 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sun Feb 29 20:35:15 CET 2004 rob@flappie.debank.tv:/usr/obj/usr/src/sys/FLAPPIE i386


>Description:
Update security/clamav to 0.73
Use freshclam pid-file
fix pkg-plist
for all changes look in work/clamav-0.73/ChangeLog
>How-To-Repeat:
>Fix:


--- clamav.patch begins here ---
diff -ruN clamav.orig/Makefile clamav/Makefile
--- clamav.orig/Makefile	Tue Jun 15 09:14:14 2004
+++ clamav/Makefile	Tue Jun 15 09:35:31 2004
@@ -23,11 +23,12 @@
 		arc:${PORTSDIR}/archivers/arc \
 		unzip:${PORTSDIR}/archivers/unzip
 
-DISTVERSION=	0.72
+DISTVERSION=	0.73
 
 OPTIONS=	MILTER "Compile the milter interface" off
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
@@ -108,6 +109,8 @@
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|/usr/lib/sendmail|/usr/sbin/sendmail|g' \
 		${WRKSRC}/clamav-milter/clamav-milter.c
+	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.in
 
 post-build:
 	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf
diff -ruN clamav.orig/distinfo clamav/distinfo
--- clamav.orig/distinfo	Tue Jun 15 09:14:14 2004
+++ clamav/distinfo	Tue Jun 15 09:20:59 2004
@@ -1,2 +1,2 @@
-MD5 (clamav-0.72.tar.gz) = f859f9ba5d156a8be92585f6e7f26cca
-SIZE (clamav-0.72.tar.gz) = 2623397
+MD5 (clamav-0.73.tar.gz) = e96f007e9156b41b5f07707e3b004465
+SIZE (clamav-0.73.tar.gz) = 2646169
diff -ruN clamav.orig/files/clamav-freshclam.sh clamav/files/clamav-freshclam.sh
--- clamav.orig/files/clamav-freshclam.sh	Tue Jun 15 09:14:14 2004
+++ clamav/files/clamav-freshclam.sh	Tue Jun 15 09:32:45 2004
@@ -28,7 +28,7 @@
 # set defaults
 
 clamav_freshclam_enable=${clamav_freshclam_enable:-"NO"}
-clamav_freshclam_flags=${clamav_freshclam_flags:-"--daemon-notify=%%PREFIX%%/etc/clamav.conf"}
+clamav_freshclam_flags=${clamav_freshclam_flags:-"--pid=/var/run/clamav/freshclam.pid --daemon-notify=%%PREFIX%%/etc/clamav.conf"}
 
 load_rc_config $name
 
diff -ruN clamav.orig/pkg-descr clamav/pkg-descr
--- clamav.orig/pkg-descr	Tue Jun 15 09:14:14 2004
+++ clamav/pkg-descr	Tue Jun 15 09:45:50 2004
@@ -1,3 +1,4 @@
+This the stable version of Clam Antivirus.
 Clam Antivirus is command line virus scanner written entirely in C
 and its database is kept up to date. It also detects polymorphic
 viruses, scans compressed files and supported by AMaViS.
diff -ruN clamav.orig/pkg-plist clamav/pkg-plist
--- clamav.orig/pkg-plist	Tue Jun 15 09:14:14 2004
+++ clamav/pkg-plist	Tue Jun 15 09:35:40 2004
@@ -1,5 +1,7 @@
 @comment $FreeBSD: ports/security/clamav/pkg-plist,v 1.13 2004/04/01 16:36:28 eik Exp $
-@unexec [ ! -f /var/run/clamav/clamd.pid ] || %%RC_DIR%%/clamd%%RC_SUFX%% stop || true
+@unexec [ ! -f /var/run/clamav/clamd.pid ] || %%RC_DIR%%/clamav-clamd%%RC_SUFX%% stop || true
+@unexec [ ! -f /var/run/clamav/freshclam.pid ] || %%RC_DIR%%/clamav-freshclam%%RC_SUFX%% stop || true
+bin/clamav-config
 bin/clamscan
 bin/clamdscan
 bin/freshclam
@@ -13,6 +15,7 @@
 lib/libclamav.so.1
 lib/libclamav.so
 lib/libclamav.a
+libdata/pkgconfig/libclamav.pc
 @unexec if cmp -s %D/etc/clamav.conf %D/etc/clamav.conf.default; then rm -f %D/etc/clamav.conf; fi
 etc/clamav.conf.default
 @exec [ -f %B/clamav.conf ] || cp %B/%f %B/clamav.conf
--- clamav.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->eik 
Responsible-Changed-By: eik 
Responsible-Changed-When: Tue Jun 15 11:13:55 CEST 2004 
Responsible-Changed-Why:  
I'll take it. 

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

From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: Rob Evers <rob@debank.tv>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/67962: Update security/clamav to 0.73
Date: Tue, 15 Jun 2004 11:39:57 +0200

 Rob Evers wrote:
 
 >  USE_GMAKE=	yes
 > +USE_GNOME=	pkgconfig
 
 Where do you *use* pkgconfig? While we are here, the port
 builds fine with BSD make(1) on my machine, so I guess we
 could drop USE_GMAKE too.
 
 -Oliver
 

From: Rob Evers <rob@debank.tv>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/67962: Update security/clamav to 0.73
Date: Tue, 15 Jun 2004 11:52:33 +0200

 Oliver Eikemeier wrote:
 > Rob Evers wrote:
 > 
 >>  USE_GMAKE=    yes
 >> +USE_GNOME=    pkgconfig
 > 
 > 
 > Where do you *use* pkgconfig? While we are here, the port
 > builds fine with BSD make(1) on my machine, so I guess we
 > could drop USE_GMAKE too.
 > 
 > -Oliver
 > 
 The USE_GNOME part was added by pav@ to the clamav-devel port (see
 http://www.freebsd.org/cgi/query-pr.cgi?pr=67792). I haven't had time
 to find out what this does exactly, apart from installing
 devel/pkgconfig :-( so it could be useless.
 As for the GMAKE, I can confirm that it builds without that option for
 me as well.
 
 Rob Evers
 
State-Changed-From-To: open->closed 
State-Changed-By: eik 
State-Changed-When: Tue Jun 15 12:05:57 CEST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67962 
>Unformatted:
