[csw-devel] SF.net SVN: gar:[18878] csw/mgar/pkg/clamav/trunk

[bonivart at users.sourceforge.net]

Revision: 18878
          http://gar.svn.sourceforge.net/gar/?rev=18878&view=rev
Author:   bonivart
Date:     2012-08-01 11:50:20 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
clamav/trunk: test patch from bug 4987

Modified Paths:
--------------
    csw/mgar/pkg/clamav/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/clamav/trunk/files/CSWclamav.scanners.c.p

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2012-08-01 10:49:57 UTC (rev 18877)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2012-08-01 11:50:20 UTC (rev 18878)
@@ -51,6 +51,7 @@
 PATCHFILES += CSWclamav.clamd.conf.p
 PATCHFILES += CSWclamav.clamav-milter.conf.p
 PATCHFILES += CSWclamav.optparser.c.p
+PATCHFILES += CSWclamav.scanners.c.p
 
 # Must have 64-bit libmilter for this to work
 #BUILD64 = 1

Added: csw/mgar/pkg/clamav/trunk/files/CSWclamav.scanners.c.p
===================================================================
--- csw/mgar/pkg/clamav/trunk/files/CSWclamav.scanners.c.p	                        (rev 0)
+++ csw/mgar/pkg/clamav/trunk/files/CSWclamav.scanners.c.p	2012-08-01 11:50:20 UTC (rev 18878)
@@ -0,0 +1,22 @@
+--- /libclamav/scanners.c
++++ /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);
++	    }
+	}
+    }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.