Pullup ticket #2730 - requested by martti

clamav: bug fix update

Revisions pulled up:
- mail/clamav/distinfo			1.59
- mail/clamav/patches/patch-ab		delete
- mail/clamav/patches/patch-ac		delete
---
Module Name:	pkgsrc
Committed By:	adam
Date:		Fri Apr 10 07:58:29 UTC 2009

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

Log Message:
Fix problem with scanning RAR archives

3 files changed, 1 insertions, 36 deletions

diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 39681083802..35379a5c09a 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.57.2.1 2009/04/10 08:29:37 tron Exp $
+$NetBSD: distinfo,v 1.57.2.2 2009/04/10 19:52:30 tron Exp $
 
 SHA1 (clamav-0.95.1.tar.gz) = a469b0128cf5e9d18392a0385417fc5e4575bfc7
 RMD160 (clamav-0.95.1.tar.gz) = 80769c09ca15c864a578206feabe9cc4a3d985b4
 Size (clamav-0.95.1.tar.gz) = 24260964 bytes
 SHA1 (patch-aa) = 6b17ddb27affcd7d710adc919ee230ed19bd930c
-SHA1 (patch-ab) = b5233d23b5c1317cf8109d433ac1926361b7cdf7
-SHA1 (patch-ac) = e48939f2d2734d399dfaefb3ce031bbdb87fadf2
 SHA1 (patch-ad) = 9e120e5dda99055356e8820d5e5cc89b156dd867
 SHA1 (patch-af) = 2965773b94753ae36fe958dd7d06697685ffb821
diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab
deleted file mode 100644
index 37ea2b81463..00000000000
--- a/mail/clamav/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2009/03/25 09:21:20 adam Exp $
-
---- libclamunrar_iface/unrar_iface.h.orig	2009-03-20 22:16:29.000000000 +0100
-+++ libclamunrar_iface/unrar_iface.h
-@@ -24,10 +24,6 @@
- #include "clamav-config.h"
- #endif
- 
--#define unrar_open libclamunrar_iface_LTX_unrar_open
--#define unrar_extract_next_prepare libclamunrar_iface_LTX_unrar_extract_next_prepare
--#define unrar_extract_next libclamunrar_iface_LTX_unrar_extract_next
--#define unrar_close libclamunrar_iface_LTX_unrar_close
- 
- #ifndef HAVE_ATTRIB_PACKED
- #define __attribute__(x)
diff --git a/mail/clamav/patches/patch-ac b/mail/clamav/patches/patch-ac
deleted file mode 100644
index 2be7bd0ebf1..00000000000
--- a/mail/clamav/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2009/03/25 09:21:20 adam Exp $
-
---- libclamunrar_iface/libclamunrar_iface.map.orig	2009-03-25 10:09:59.000000000 +0100
-+++ libclamunrar_iface/libclamunrar_iface.map
-@@ -1,9 +1,9 @@
- CLAMAV_PRIVATE {
- 	global:
--		libclamunrar_iface_LTX_unrar_open;
--		libclamunrar_iface_LTX_unrar_extract_next;
--		libclamunrar_iface_LTX_unrar_extract_next_prepare;
--		libclamunrar_iface_LTX_unrar_close;
-+		unrar_open;
-+		unrar_extract_next;
-+		unrar_extract_next_prepare;
-+		unrar_close;
- 	local:
- 		*;
- };