2005-11-25 [paul] 1.9.100cvs34

	* src/plugins/clamav/clamav_plugin.c
		reflect upstream changes

diff --git a/ChangeLog b/ChangeLog
index 7db50a65a545041f1f323f549b12dcdb3ed0444e..c1462887a4040dfd53e9d1e6cddbc0fc001fa1fa 100644 (file)
--- 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 eb22304c793463e006461bf0796cd488ae2d7f45..881f7a6093a5e5fb204825e4459cc167c59f1548 100644 (file)
--- 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 09967b2cfb155fede3198b13443f37286f1e904e..6b3428c1e4d18cec5a701c66b9fbd25e225feee0 100644 (file)
--- 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 f1d4c5dd3446d0032324b3deda557539252bc03d..d71515674f7e89d6bea9849b26e821501facdc2c 100644 (file)
--- 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");
 }