[94525] trunk/dports/sysutils/clamav
dluke at macports.org
dluke at macports.org
Thu Jun 21 11:38:32 PDT 2012
Revision: 94525
https://trac.macports.org/changeset/94525
Author: dluke at macports.org
Date: 2012-06-21 11:38:32 -0700 (Thu, 21 Jun 2012)
Log Message:
-----------
clamav: add a patch for upstream bug (fixes #34948)
Modified Paths:
--------------
trunk/dports/sysutils/clamav/Portfile
Added Paths:
-----------
trunk/dports/sysutils/clamav/files/
trunk/dports/sysutils/clamav/files/libclamav_scanners.c.diff
Modified: trunk/dports/sysutils/clamav/Portfile
===================================================================
--- trunk/dports/sysutils/clamav/Portfile 2012-06-21 18:35:09 UTC (rev 94524)
+++ trunk/dports/sysutils/clamav/Portfile 2012-06-21 18:38:32 UTC (rev 94525)
@@ -5,6 +5,7 @@
name clamav
version 0.97.5
+revision 1
categories sysutils
maintainers geeklair.net:dluke
description clamav antivirus software
@@ -25,6 +26,10 @@
configure.args --mandir=${prefix}/share/man \
--with-zlib=${prefix}
+# This bug should be fixed in 0.97.6, see
+# https://bugzilla.clamav.net/show_bug.cgi?id=5252
+patchfiles libclamav_scanners.c.diff
+
use_parallel_build yes
depends_lib port:libiconv port:zlib port:bzip2 port:ncurses
Added: trunk/dports/sysutils/clamav/files/libclamav_scanners.c.diff
===================================================================
--- trunk/dports/sysutils/clamav/files/libclamav_scanners.c.diff (rev 0)
+++ trunk/dports/sysutils/clamav/files/libclamav_scanners.c.diff 2012-06-21 18:38:32 UTC (rev 94525)
@@ -0,0 +1,24 @@
+--- libclamav/scanners.c.orig 2012-06-21 14:30:56.000000000 -0400
++++ libclamav/scanners.c 2012-06-21 14:33:03.000000000 -0400
+@@ -2369,9 +2369,21 @@
+ ctx->fmap--;
+ cli_bitset_free(ctx->hook_lsig_matches);
+ ctx->hook_lsig_matches = old_hook_lsig_matches;
++ /* 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: %s\n", 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);
+ }
+ }
++ }
+
+ ctx->recursion++;
+ lseek(desc, 0, SEEK_SET);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120621/95534c5c/attachment.html>
More information about the macports-changes
mailing list