>Number:         29367
>Category:       pkg
>Synopsis:       patch for clamav upgrade 0.82 -> 0.83
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Feb 14 08:58:01 +0000 2005
>Originator:     Piotr Stolc
>Release:        NetBSD 2.0.1
>Organization:
soclab
>Environment:
System: NetBSD s 2.0.1 NetBSD 2.0.1 (S) #2: Tue Jan 25 03:44:17 CET 2005 build@s:/build/src/sys/arch/i386/compile/S i386
Architecture: i386
Machine: i386
>Description:
	ClamAV team has just released new version of clamav (0.83).
	
	 
Major changes (from clamav-announce mailing list):
due to a high number of bad files produced by broken software, the
MS05-002 exploit detector now only checks specific RIFF files. This version
also fixes a stability problem of clamav-milter/clamd and improves e-mail
scanning.

Release notes:
http://sourceforge.net/project/shownotes.php?release_id=304772
>How-To-Repeat:
	Below is my patch upgrading mail/clamav in pkgsrc.
	It works well in my environment (2004Q4), but maybe I missed
	something not very important :)
>Fix:

diff -bur clamav.orig/Makefile clamav/Makefile
--- clamav.orig/Makefile	2005-02-14 09:12:20.000000000 +0100
+++ clamav/Makefile	2005-02-14 09:14:01.000000000 +0100
@@ -11,7 +11,7 @@
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-CLAMAV_VERSION=		0.82
+CLAMAV_VERSION=		0.83
 
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
diff -bur clamav.orig/buildlink3.mk clamav/buildlink3.mk
--- clamav.orig/buildlink3.mk	2005-02-14 09:12:20.000000000 +0100
+++ clamav/buildlink3.mk	2005-02-14 09:14:07.000000000 +0100
@@ -12,7 +12,7 @@
 
 .if !empty(CLAMAV_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.clamav+=	clamav>=0.60nb1
-BUILDLINK_RECOMMENDED.clamav+=	clamav>=0.82
+BUILDLINK_RECOMMENDED.clamav+=	clamav>=0.83
 BUILDLINK_PKGSRCDIR.clamav?=	../../mail/clamav
 .endif	# CLAMAV_BUILDLINK3_MK
 
diff -bur clamav.orig/distinfo clamav/distinfo
--- clamav.orig/distinfo	2005-02-14 09:12:20.000000000 +0100
+++ clamav/distinfo	2005-02-14 09:27:02.000000000 +0100
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.20.2.1 2005/02/13 15:34:23 salo Exp $
 
-SHA1 (clamav-0.82.tar.gz) = 83dd3b5881efee5d682f746419e5654cfb35e0e6
-Size (clamav-0.82.tar.gz) = 3565864 bytes
+SHA1 (clamav-0.83.tar.gz) = a8264834ee494b44d99db5b3a9e16599cb4e9026
+Size (clamav-0.83.tar.gz) = 3653658 bytes
 SHA1 (patch-aa) = 17c713c3b5833f895b7caa470ae31f3d45d60643
-SHA1 (patch-ad) = 6dffd1bbccf4effd0e073d366f1da35070521bd8
-SHA1 (patch-af) = 605728b133ddb95827285d06bfeec9400222f874
-SHA1 (patch-ah) = 9a62a7e5ad90f05df4972dfd3a129ce8848435e6
+SHA1 (patch-ad) = 4e6a3c72f07f46623a7a5596ccba4649e2a88ec6
+SHA1 (patch-af) = 8714b7626b74fa6dff68342493ccd6cd5f294296
+SHA1 (patch-ah) = 40d9cf190890a49aa39c1847e580c54ff42f266d
diff -bur clamav.orig/patches/patch-ad clamav/patches/patch-ad
--- clamav.orig/patches/patch-ad	2005-02-14 09:12:20.000000000 +0100
+++ clamav/patches/patch-ad	2005-02-14 09:26:40.000000000 +0100
@@ -1,13 +1,13 @@
 $NetBSD: patch-ad,v 1.7.2.1 2005/02/13 15:34:23 salo Exp $
 
---- docs/Makefile.in.orig	2005-02-07 08:28:08.000000000 +1100
-+++ docs/Makefile.in
-@@ -179,6 +179,8 @@ EXTRA_DIST = clamdoc.pdf man clamav-mirr
+--- docs/Makefile.in.orig	2005-02-13 23:40:05.000000000 +0100
++++ docs/Makefile.in	2005-02-14 09:24:48.000000000 +0100
+@@ -182,6 +182,8 @@
  man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
  all: all-am
  
 +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8
 +
  .SUFFIXES:
- $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  	@for dep in $?; do \
diff -bur clamav.orig/patches/patch-af clamav/patches/patch-af
--- clamav.orig/patches/patch-af	2004-08-01 06:35:33.000000000 +0200
+++ clamav/patches/patch-af	2005-02-14 09:26:45.000000000 +0100
@@ -1,8 +1,8 @@
 $NetBSD: patch-af,v 1.1 2004/08/01 04:35:33 jlam Exp $
 
---- database/Makefile.in.orig	Thu Jul 29 17:50:06 2004
-+++ database/Makefile.in
-@@ -344,17 +344,6 @@ install:
+--- database/Makefile.in.orig	2005-02-13 23:40:05.000000000 +0100
++++ database/Makefile.in	2005-02-14 09:25:54.000000000 +0100
+@@ -343,17 +343,6 @@
  	@test -f $(DESTDIR)$(DBINST)/mirrors.txt && rm -f $(DESTDIR)$(DBINST)/mirrors.txt || true
  	@test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true
  	@test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true
diff -bur clamav.orig/patches/patch-ah clamav/patches/patch-ah
--- clamav.orig/patches/patch-ah	2005-02-14 09:12:20.000000000 +0100
+++ clamav/patches/patch-ah	2005-02-14 09:26:50.000000000 +0100
@@ -1,8 +1,8 @@
 $NetBSD: patch-ah,v 1.1.4.1 2005/02/13 15:34:23 salo Exp $
 
---- clamav-milter/clamav-milter.c.orig	2005-02-07 07:35:29.000000000 +1100
-+++ clamav-milter/clamav-milter.c
-@@ -3251,7 +3251,7 @@ clamfi_eom(SMFICTX *ctx)
+--- clamav-milter/clamav-milter.c.orig	2005-02-13 22:44:28.000000000 +0100
++++ clamav-milter/clamav-milter.c	2005-02-14 09:25:57.000000000 +0100
+@@ -3328,7 +3328,7 @@
  						 * the postmaster, so include
  						 * some useful information
  						 */
@@ -11,7 +11,7 @@
  							sendmailId, sender);
  					else
  						fprintf(sendmail, _("A message sent from %s to\n"),
-@@ -3265,7 +3265,7 @@ clamfi_eom(SMFICTX *ctx)
+@@ -3342,7 +3342,7 @@
  						fprintf(sendmail, _("\nThe message in question has been quarantined as %s\n"), privdata->filename);
  
  					if(hflag) {
@@ -20,9 +20,9 @@
  							smfi_getsymval(ctx, "j"), sender,
  							smfi_getsymval(ctx, "_"));
  						fputs(_("For your information, the original message headers were:\n\n"), sendmail);
-@@ -4381,7 +4381,7 @@ qfile(struct privdata *privdata, const c
+@@ -4455,7 +4455,7 @@
+ 
  	if(move(privdata->filename, newname) < 0) {
- 		perror(newname);
  		if(use_syslog)
 -			syslog(LOG_WARNING, _("Can't rename %1$s to %2$s"),
 +			syslog(LOG_WARNING, _("Can't rename %s to %s"),