Pullup ticket #3230 - requested by adam

mail/clamav: security update

Revisions pulled up:
- mail/clamav/Makefile				1.104-1.105
- mail/clamav/buildlink3.mk			1.24
- mail/clamav/distinfo				1.65-1.67
- mail/clamav/patches/patch-ac			1.9
---
Module Name:	pkgsrc
Committed By:	adam
Date:		Thu Aug 26 05:49:30 UTC 2010

Modified Files:
	pkgsrc/mail/clamav: Makefile distinfo
	pkgsrc/mail/clamav/patches: patch-ac

Log Message:
Changes 0.96.2:
* contrib: add safe_clamd from Luca
* freshclam: uses private symbol which changed proto, change name to prevent
  crash
* libclamav: fix callback_sigload
* clamdscan: fix parsing of virus names in extended mode and --stream
* libclamav/c++/detect.cpp: Mac OS X can run 64-bit apps on 32-bit kernel
* libclamav/others.h: bump f-level
* sigtool/sigtool.c: fix handling of --datadir
* libclamav/matcher-ac.c: improve offset handling
* libclamav/7z/Archive/7z/7zDecode.c: shut up a warning
* libclamav/autoit.c: properly resume from empty files regression introduced
  in ac867aad
* libclamav/elf.c: fix zero mem alloc warning
* win32: fix libclamav's triple and fix GetVersion
* libclamav/bytecode.c: save lsig counts/offsets
* libclamav/{bytecode,matcher}.c: matchicon API
* libclamav/pe_icons.c: BE fixes
* more...
---
Module Name:	pkgsrc
Committed By:	adam
Date:		Thu Aug 26 06:02:07 UTC 2010

Modified Files:
	pkgsrc/mail/clamav: distinfo

Log Message:
patch-ac has been changed
---
Module Name:	pkgsrc
Committed By:	adam
Date:		Tue Sep 21 07:47:26 UTC 2010

Modified Files:
	pkgsrc/mail/clamav: Makefile buildlink3.mk distinfo

Log Message:
Changes 0.96.3:
This release fixes problems with the PDF parser and the internal bzip2 library.
A complete list of changes is available in the Changelog file.

4 files changed, 21 insertions, 24 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 9380386eec8..87291148e93 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,24 +1,21 @@
-# $NetBSD: Makefile,v 1.103 2010/05/20 07:47:45 martti Exp $
+# $NetBSD: Makefile,v 1.103.2.1 2010/09/25 10:30:52 tron Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
-#PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clamav/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.clamav.net/
 COMMENT=	Anti-virus toolkit
-
 LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CLAMAV_VERSION=		0.96.1
+CLAMAV_VERSION=		0.96.3
 
 USE_LIBTOOL=		yes
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-clamav
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk
index 41a47aede51..6d954558957 100644
--- a/mail/clamav/buildlink3.mk
+++ b/mail/clamav/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2010/03/24 21:54:16 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.23.4.1 2010/09/25 10:30:52 tron Exp $
 
 BUILDLINK_TREE+=	clamav
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	clamav
 CLAMAV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.95.3nb1
-BUILDLINK_ABI_DEPENDS.clamav?=	clamav>=0.95.3nb2
+BUILDLINK_ABI_DEPENDS.clamav+=	clamav>=0.95.3nb2
 BUILDLINK_PKGSRCDIR.clamav?=	../../mail/clamav
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index af105055c9b..966a1e7a2cc 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.64 2010/05/20 07:47:45 martti Exp $
+$NetBSD: distinfo,v 1.64.2.1 2010/09/25 10:30:52 tron Exp $
 
-SHA1 (clamav-0.96.1.tar.gz) = cdb24490f402748cbfb57cc87592fe77b470e0a5
-RMD160 (clamav-0.96.1.tar.gz) = f0708b921c8b01a4309fe741ec141ab8cbdf2351
-Size (clamav-0.96.1.tar.gz) = 40568982 bytes
+SHA1 (clamav-0.96.3.tar.gz) = b4566c83bc7ca8bdc3783a9487cfe5eaf6084c65
+RMD160 (clamav-0.96.3.tar.gz) = ef0f326158b25525200a09d1531eb0eb45f137cf
+Size (clamav-0.96.3.tar.gz) = 42129283 bytes
 SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
 SHA1 (patch-ab) = a4d097b785f870cd6213811f504a553e6b87e229
-SHA1 (patch-ac) = e28096ec1bb70d36877e3813cda228b0ede4d552
+SHA1 (patch-ac) = af6c04bdeff91dec5e672f84fea6bd18d4e2fa1d
 SHA1 (patch-ad) = 7d7ea5f8cda22dca1a399ee1219f1f072d8a3eed
 SHA1 (patch-af) = a58e2c484b34bbfccb62d6fdf35b552a15dc9bd3
 SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30
diff --git a/mail/clamav/patches/patch-ac b/mail/clamav/patches/patch-ac
index 507c8928cd9..72327678011 100644
--- a/mail/clamav/patches/patch-ac
+++ b/mail/clamav/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.8 2010/05/20 07:47:45 martti Exp $
+$NetBSD: patch-ac,v 1.8.2.1 2010/09/25 10:30:52 tron Exp $
 
 Make this pkgsrc friedly.
 
---- libclamav/c++/configure.orig	2010-05-07 21:08:04.000000000 +0300
-+++ libclamav/c++/configure	2010-05-20 10:06:33.000000000 +0300
-@@ -14504,7 +14504,7 @@
-   enable_optimized=default
- fi
- 
-- if test "x$enable_optimized" == "xno"; then
-+ if test "x$enable_optimized" = "xno"; then
-   DEBUG_BUILD_TRUE=
-   DEBUG_BUILD_FALSE='#'
- else
+--- contrib/safe_clamd/safe_clamd.orig	2010-08-25 11:26:02.000000000 +0000
++++ contrib/safe_clamd/safe_clamd
+@@ -71,7 +71,7 @@ signalClamd() {
+ 	else
+ 		echo "$CLAMDBIN is not running."
+ 	fi
+-	if [ "$1" == "TERM" ]; then
++	if [ "$1" = "TERM" ]; then
+ 		echo Exiting $0 ...
+ 		exit
+ 	fi