Bug#684914: unblock: clamav/0.97.5+dfsg-6

[Scott Kitterman <debian@kitterman.com>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package clamav

Fixes RC bug #684697 which is a regression from 0.97.3 currently in squeeze.

unblock clamav/0.97.5+dfsg-6

diff -u clamav-0.97.5+dfsg/debian/changelog clamav-0.97.5+dfsg/debian/changelog
--- clamav-0.97.5+dfsg/debian/changelog
+++ clamav-0.97.5+dfsg/debian/changelog
@@ -1,3 +1,12 @@
+clamav (0.97.5+dfsg-6) unstable; urgency=medium
+
+  * Urgency medium for RC bug fix the addressess regression from 0.97.3
+  * Add changes from upstream commit 6a879ad98460303b23a6fc119769a3b463a902f8
+    to fix unpack errors for various compressed files including some .bz2,
+    .xls, .doc, and PDF (Closes: #684697)
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 14 Aug 2012 12:11:19 -0400
+
 clamav (0.97.5+dfsg-5) unstable; urgency=low
 
   * Drop /var/run/clamav from the directories shipped in clamav-base (policy
only in patch2:
unchanged:
--- clamav-0.97.5+dfsg.orig/libclamav/scanners.c
+++ clamav-0.97.5+dfsg/libclamav/scanners.c
@@ -2369,7 +2369,19 @@
 	    ctx->fmap--;
 	    cli_bitset_free(ctx->hook_lsig_matches);
 	    ctx->hook_lsig_matches = old_hook_lsig_matches;
-	    ret_from_magicscan(ret);
+	    /* Same switch as end of magic_scandesc function */
+	    switch(ret) {
+		case CL_EFORMAT:
+		case CL_EMAXREC:
+		case CL_EMAXSIZE:
+		case CL_EMAXFILES:
+		    cli_dbgmsg("Descriptor[%d]: %s\n", desc, cl_strerror(ret));
+		case CL_CLEAN: /* here, only from cli_checkfp() */
+		    cache_add(hash, hashed_size, ctx);
+		    ret_from_magicscan(CL_CLEAN);
+		default:
+		    ret_from_magicscan(ret);
+	    }
 	}
     }