From 865fceea60668f123462c54b5d22c0ba58a4c73f Mon Sep 17 00:00:00 2001 From: pav Date: Thu, 17 Feb 2005 22:57:32 +0000 Subject: - Update to 0.83 PR: ports/77561 Submitted by: Marcus Grando Approved by: Rob Evers (maintainer) --- security/clamav/Makefile | 16 +++++++--------- security/clamav/distinfo | 4 ++-- .../clamav/files/patch-clamav-milter::clamav-milter.c | 11 ----------- 3 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 security/clamav/files/patch-clamav-milter::clamav-milter.c (limited to 'security') diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 3b9261871e5e..a5f35cbb9c49 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -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 @@ RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha \ 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 @@ CPPFLAGS+= -I${LOCALBASE}/include \ LDFLAGS+= -L${LOCALBASE}/lib \ ${PTHREAD_LIBS} -.include - -.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 @@ SED_SCRIPT+= -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \ PLIST_SUB+= RC_DIR=${RC_DIR} \ RC_SUFX=${RC_SUFX} +.include + .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 --git a/security/clamav/distinfo b/security/clamav/distinfo index decc97e5bae7..f96fe4bb21f8 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -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 --git a/security/clamav/files/patch-clamav-milter::clamav-milter.c b/security/clamav/files/patch-clamav-milter::clamav-milter.c deleted file mode 100644 index 8a925a8b569f..000000000000 --- a/security/clamav/files/patch-clamav-milter::clamav-milter.c +++ /dev/null @@ -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 - * -- cgit