Bug 77561

Summary: Update port: security/clamav to 0.83
Product: Ports & Packages Reporter: Marcus Grando <marcus>
Component: Individual Port(s)Assignee: Pav Lucistnik <pav>
Status: Closed FIXED    
Severity: Affects Only Me CC: rob
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
clamav.patch none

Description Marcus Grando 2005-02-15 16:20:27 UTC 
Update port: security/clamav to 0.83

+ Update to 0.83
+ Remove files/patch-clamav-milter::clamav-milter.c
Comment 1 Volker Stolz freebsd_committer freebsd_triage 2005-02-16 16:01:48 UTC 
Dear maintainer, please review the proposed PR!

Volker
Comment 2 Volker Stolz freebsd_committer freebsd_triage 2005-02-16 16:02:40 UTC 
State Changed
From-To: open->feedback

Forwarded PR to maintainer
Comment 3 rob 2005-02-17 20:19:26 UTC 
This is almost the same, but cleans up the ldap option also
(files/patch-clamav-milter::clamav-milter.c is dead)

Rob Evers


diff -ruN --exclude=CVS /usr/ports/security/clamav.orig/Makefile /usr/ports/security/clamav/Makefile
--- /usr/ports/security/clamav.orig/Makefile	Thu Feb 17 20:44:32 2005
+++ /usr/ports/security/clamav/Makefile	Thu Feb 17 20:54:47 2005
@@ -7,7 +7,6 @@
 
 PORTNAME=	clamav
 PORTVERSION=	${DISTVERSION:C/([a-z])[a-z]*/.\1/g:S/-/./g}
-PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	clamav
@@ -24,7 +23,7 @@
 		arc:${PORTSDIR}/archivers/arc \
 		unzip:${PORTSDIR}/archivers/unzip
 
-DISTVERSION=	0.82
+DISTVERSION=	0.83
 
 OPTIONS=	MILTER "Compile the milter interface" Off \
 		CURL "Support URL downloading" Off
@@ -58,13 +57,6 @@
 LDFLAGS+=	-L${LOCALBASE}/lib \
 		${PTHREAD_LIBS}
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_LDAP) && exists(${LOCALBASE}/lib/libldap.so)
-USE_OPENLDAP=	yes
-LDFLAGS+=	-lldap
-.endif
-
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 MAN1=		clamscan.1 freshclam.1 sigtool.1 clamdscan.1
@@ -110,7 +102,13 @@
 PLIST_SUB+=	RC_DIR=${RC_DIR} \
 		RC_SUFX=${RC_SUFX}
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_MILTER)
+.if !defined(WITHOUT_LDAP) && exists(${LOCALBASE}/lib/libldap.so)
+USE_OPENLDAP=	yes
+LDFLAGS+=	-lldap
+.endif
 .if !exists(/usr/lib/libmilter.a)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
 CONFIGURE_ENV+=	SENDMAIL="${LOCALBASE}/sbin/sendmail"
diff -ruN --exclude=CVS /usr/ports/security/clamav.orig/distinfo /usr/ports/security/clamav/distinfo
--- /usr/ports/security/clamav.orig/distinfo	Thu Feb 17 20:44:32 2005
+++ /usr/ports/security/clamav/distinfo	Thu Feb 17 20:55:30 2005
@@ -1,2 +1,2 @@
-MD5 (clamav-0.82.tar.gz) = 1b58972d8918f5174d7f05a35a48856b
-SIZE (clamav-0.82.tar.gz) = 3565864
+MD5 (clamav-0.83.tar.gz) = e3a1b6bbda8095c5aae4eb7bc753804c
+SIZE (clamav-0.83.tar.gz) = 3653658
diff -ruN --exclude=CVS /usr/ports/security/clamav.orig/files/patch-clamav-milter::clamav-milter.c /usr/ports/security/clamav/files/patch-clamav-milter::clamav-milter.c
--- /usr/ports/security/clamav.orig/files/patch-clamav-milter::clamav-milter.c	Thu Feb 17 20:44:32 2005
+++ /usr/ports/security/clamav/files/patch-clamav-milter::clamav-milter.c	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- clamav-milter/clamav-milter.c.orig	Sun Feb  6 21:35:29 2005
-+++ clamav-milter/clamav-milter.c	Wed Feb  9 10:00:06 2005
-@@ -643,7 +643,7 @@
- 
- #define	VERSION_LENGTH	128
- 
--#define	SESSION	/*
-+/* #define	SESSION
- 		 * Keep one command connection open to clamd, otherwise a new
- 		 * command connection is created for each new email
- 		 *
Comment 4 Yar Tikhiy freebsd_committer freebsd_triage 2005-02-17 22:50:57 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->yar

Taking this one.
Comment 5 Pav Lucistnik freebsd_committer freebsd_triage 2005-02-17 22:57:41 UTC 
State Changed
From-To: feedback->closed

Maintainer's patch committed.
Comment 6 Yar Tikhiy freebsd_committer freebsd_triage 2005-02-17 23:06:22 UTC 
Responsible Changed
From-To: yar->pav

Over to the developer who was ahead of me in handling this :-)