- Update security/clamav to 0.94 [1] and fix a remote DoS [2]

- Chase libclamav version bump on all dependant ports
- Bump necessary PORTREVISIONS
- Fix some BROKEN messages from ports that were already broken with clamav-0.93
- Mark security/klamav as BROKEN since it doesn't build with clamav-0.94

PR:		ports/127122 [1], ports/127310 [2]
Submitted by:	Gary Palmer <freebsd-gnats@in-addr.com> [1], delphij [2]
Approved by:	portmgr (pav)

12 files changed, 39 insertions, 35 deletions

diff --git a/security/clamassassin/Makefile b/security/clamassassin/Makefile
index a4924a2df56f..2a5b303b92fd 100644
--- a/security/clamassassin/Makefile
+++ b/security/clamassassin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clamassassin
 PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://jameslick.com/clamassassin/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 5c2d6d7d596b..712c754650f4 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	0.93.3
+PORTVERSION=	0.94
 CATEGORIES=	security
 MASTER_SITES=	SF
 
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 1ea5d5ba45b7..3824e25cfdb6 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-0.93.3.tar.gz) = 06d87fbece062e5c0661ee07703208c9
-SHA256 (clamav-0.93.3.tar.gz) = 7aa98796671dfe3db5a20e25669404c4e4461d2a6c77de352edf99f2c989e500
-SIZE (clamav-0.93.3.tar.gz) = 18242568
+MD5 (clamav-0.94.tar.gz) = d3f6d5fff2db81950491749166ab0ffa
+SHA256 (clamav-0.94.tar.gz) = ae188c18936ea9154eb6a85ea553c29f4349ee3e95457055fae5fe1b981af602
+SIZE (clamav-0.94.tar.gz) = 20509228
diff --git a/security/clamav/files/patch-configure b/security/clamav/files/patch-configure
index 42fbdcbea021..45424480bb1f 100644
--- a/security/clamav/files/patch-configure
+++ b/security/clamav/files/patch-configure
@@ -1,6 +1,24 @@
---- configure.orig	Thu Mar  1 20:46:19 2007
-+++ configure	Tue Mar 13 10:28:27 2007
-@@ -22431,19 +22431,25 @@
+--- configure.orig	2008-09-01 15:41:18.000000000 -0300
++++ configure	2008-09-05 08:57:53.000000000 -0300
+@@ -16571,7 +16571,7 @@
+     ;;
+ freebsd*)
+     if test "$have_pthreads" = "yes"; then
+-	THREAD_LIBS="-lthr"
++	THREAD_LIBS="%%PTHREAD_LIBS%%"
+ 	TH_SAFE="-thread-safe"
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -16931,7 +16931,7 @@
+ if test "$have_milter" = "yes"; then
+ 
+         save_LDFLAGS="$LDFLAGS"
+-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
++	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS"
+     if test -d /usr/lib/libmilter ; then
+ 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
+     fi
+@@ -17468,19 +17468,25 @@
      sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
  
  
@@ -25,22 +43,4 @@
 +fi
  
    fi
- fi
-@@ -23087,7 +23093,7 @@
-     ;;
- freebsd*)
-     if test "$have_pthreads" = "yes"; then
--	THREAD_LIBS="-pthread -lc_r"
-+	THREAD_LIBS="%%PTHREAD_LIBS%%"
- 	TH_SAFE="-thread-safe"
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -23427,7 +23433,7 @@
- if test "$have_milter" = "yes"; then
- 
-         save_LDFLAGS="$LDFLAGS"
--	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
-+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS %%PTHREAD_LIBS%%"
-     if test -d /usr/lib/libmilter ; then
- 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
-     fi
+   if test "x$ac_cv_have_lresolv_r" != "xyes"; then
diff --git a/security/clamcour/Makefile b/security/clamcour/Makefile
index 2e39d6e8dd97..6b0ef35743f8 100644
--- a/security/clamcour/Makefile
+++ b/security/clamcour/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clamcour
 PORTVERSION=	0.3.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.becrux.com/pages/projects/clamcour/
 
@@ -15,7 +15,7 @@ MAINTAINER=	bsd@dino.sk
 COMMENT=	ClamAV courier filter
 
 BUILD_DEPENDS=	courier-config:${PORTSDIR}/mail/courier
-LIB_DEPENDS=	clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav.5:${PORTSDIR}/security/clamav
 
 GNU_CONFIGURE=	yes
 
diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile
index b273a56df402..4d72e89e67ef 100644
--- a/security/clamsmtp/Makefile
+++ b/security/clamsmtp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clamsmtp
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://memberwebs.com/stef/software/clamsmtp/
 
diff --git a/security/clamtk/Makefile b/security/clamtk/Makefile
index 765340c45f63..67bb15878f43 100644
--- a/security/clamtk/Makefile
+++ b/security/clamtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clamtk
 PORTVERSION=	3.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF
 
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index 15bc772fdc80..755ff025ad78 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 MAINTAINER=	anderson@cnpm.embrapa.br
 COMMENT=	A KDE 3 front-end to Clam Anti-Virus
 
-LIB_DEPENDS=	clamav:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav.5:${PORTSDIR}/security/clamav
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -36,6 +36,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${QT_PREFIX} \
 
 USE_KDELIBS_VER=	3
 
+BROKEN=	Doesn't build with clamav-0.94
+
 .include <bsd.port.pre.mk>
 
 pre-configure:
diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile
index 0fb04e76d7d1..28ce26791281 100644
--- a/security/p5-File-Scan-ClamAV/Makefile
+++ b/security/p5-File-Scan-ClamAV/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	File-Scan-ClamAV
 PORTVERSION=	1.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile
index 8cc7cb17e0f3..8af1fd27f40c 100644
--- a/security/py-clamav/Makefile
+++ b/security/py-clamav/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clamav
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	http://xael.org/norman/python/pyclamav/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A python binding to libclamav written in C
 
-LIB_DEPENDS=	clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav.5:${PORTSDIR}/security/clamav
 
 DIST_SUBDIR=	python
 USE_PYTHON=	yes
diff --git a/security/spybye/Makefile b/security/spybye/Makefile
index a2fc70cb8907..7da0ed9064d1 100644
--- a/security/spybye/Makefile
+++ b/security/spybye/Makefile
@@ -27,7 +27,7 @@ MAN1=		spybye.1
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_CLAMAV)
-LIB_DEPENDS+=	clamav:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	clamav.5:${PORTSDIR}/security/clamav
 CONFIGURE_ARGS+=	--with-libclamav=${PREFIX}/bin
 .endif
 
diff --git a/security/squidclam/Makefile b/security/squidclam/Makefile
index 35e6ca5abf8d..0fd568d1e511 100644
--- a/security/squidclam/Makefile
+++ b/security/squidclam/Makefile
@@ -31,7 +31,7 @@ SUB_FILES=	pkg-message
 PLIST_FILES=	bin/squidclam %%EXAMPLESDIR%%/squidclam.conf
 PLIST_DIRS=	%%EXAMPLESDIR%%
 
-BROKEN=	Doesn't build with clamav-0.93
+BROKEN=	Doesn't build with clamav-0.93 or higher
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \