From d0945adaecbe25b7887454d5a7a99f75c10324c5 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Fri, 25 Nov 2005 09:42:59 +0000 Subject: [PATCH] 2005-11-25 [paul] 1.9.100cvs34 * src/plugins/clamav/clamav_plugin.c reflect upstream changes --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/plugins/clamav/clamav_plugin.c | 11 ++++++++--- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7db50a65a..c1462887a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-25 [paul] 1.9.100cvs34 + + * src/plugins/clamav/clamav_plugin.c + reflect upstream changes + 2005-11-25 [paul] 1.9.100cvs33 * manual/ack.xml diff --git a/PATCHSETS b/PATCHSETS index eb22304c7..881f7a609 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1017,3 +1017,4 @@ ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/addrbook.xml; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/advanced.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/starting.xml; cvs diff -u -r 1.14.2.7 -r 1.14.2.8 src/importldif.c; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/wizard.c; ) > 1.9.100cvs31.patchset ( cvs diff -u -r 1.382.2.196 -r 1.382.2.197 src/compose.c; ) > 1.9.100cvs32.patchset ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/ack.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/plugins.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/sylpheed-claws-manual.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 tools/acroread2sylpheed.pl; ) > 1.9.100cvs33.patchset +( cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/plugins/clamav/clamav_plugin.c; ) > 1.9.100cvs34.patchset diff --git a/configure.ac b/configure.ac index 09967b2cf..6b3428c1e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=100 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=33 +EXTRA_VERSION=34 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c index f1d4c5dd3..d71515674 100644 --- a/src/plugins/clamav/clamav_plugin.c +++ b/src/plugins/clamav/clamav_plugin.c @@ -123,6 +123,8 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data) params.limits.maxfiles = 1000; /* max files */ params.limits.maxfilesize = config.clamav_max_size * 1048576; /* maximum archived file size */ params.limits.maxreclevel = 8; /* maximum recursion level */ + params.limits.maxratio = 200; /* maximal compression ratio */ + params.limits.archivememlim = 0; /* disable memory limit for bzip2 scanner */ if (config.clamav_enable_arc) params.scan_archive = TRUE; @@ -212,14 +214,17 @@ gint plugin_init(gchar **error) clamav_gtk_init(); - if ((ret = cl_loaddbdir(cl_retdbdir(), &cl_database, &no)) != 0) { + if ((ret = cl_loaddbdir(cl_retdbdir(), &cl_database, &no))) { debug_print("cl_loaddbdir: %s\n", cl_strerror(ret)); return -1; } debug_print("Database loaded (containing in total %d signatures)\n", no); - cl_buildtrie(cl_database); + if((ret = cl_build(cl_database))) { + debug_print("Database initialization error: %s\n", cl_strerror(ret)); + return -1; + } debug_print("ClamAV plugin loaded\n"); @@ -231,7 +236,7 @@ void plugin_done(void) { hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id); g_free(config.clamav_save_folder); - cl_freetrie(cl_database); + cl_free(cl_database); debug_print("ClamAV plugin unloaded\n"); } -- 2.25.1