From 6b20cdd669f9cfebcb7cdc161dfb6190bfc0d1f9 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Thu, 26 Aug 2010 05:49:30 +0000
Subject: 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...

---
 mail/clamav/Makefile         |  4 ++--
 mail/clamav/distinfo         | 10 +++++-----
 mail/clamav/patches/patch-ac | 24 ++++++++++++------------
 3 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'mail')

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 9380386eec8..5f8416d4f46 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2010/05/20 07:47:45 martti Exp $
+# $NetBSD: Makefile,v 1.104 2010/08/26 05:49:30 adam Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -15,7 +15,7 @@ LICENSE=	gnu-gpl-v2
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CLAMAV_VERSION=		0.96.1
+CLAMAV_VERSION=		0.96.2
 
 USE_LIBTOOL=		yes
 
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index af105055c9b..d31162f121e 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.65 2010/08/26 05:49:30 adam 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.2.tar.gz) = 1b7621a9829f1f0020901ce350d0e6112745c34d
+RMD160 (clamav-0.96.2.tar.gz) = d2d9fc9c7759c5b76072032b0d513eede19b978b
+Size (clamav-0.96.2.tar.gz) = 59109021 bytes
 SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5
 SHA1 (patch-ab) = a4d097b785f870cd6213811f504a553e6b87e229
-SHA1 (patch-ac) = e28096ec1bb70d36877e3813cda228b0ede4d552
+SHA1 (patch-ac) = c4127133256b6adcc65e3ea67b3ad15de453d06e
 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..59dae1cce10 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.9 2010/08/26 05:49:30 adam 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
-- 
cgit v1.2.3