rpms/klamav/devel klamav-0.42-clamav093.patch, NONE, 1.1 klamav.spec, 1.19, 1.20

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/klamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20717/devel

Modified Files:
	klamav.spec 
Added Files:
	klamav-0.42-clamav093.patch 
Log Message:
* Fri Mar 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.42-3
- patch for clamav 0.93

klamav-0.42-clamav093.patch:

--- NEW FILE klamav-0.42-clamav093.patch ---
diff -ur klamav-0.42/src/klammail/cfgparser.c klamav-0.42-clamav093/src/klammail/cfgparser.c
--- klamav-0.42/src/klammail/cfgparser.c	2008-01-06 17:00:35.000000000 +0100
+++ klamav-0.42-clamav093/src/klammail/cfgparser.c	2008-03-28 06:40:52.000000000 +0100
@@ -63,10 +63,10 @@
 	    {"ScanOLE2", OPT_NOARG},
 	    {"ScanArchive", OPT_NOARG},
 	    {"ScanRAR", OPT_NOARG},
-	    {"ArchiveMaxFileSize", OPT_COMPSIZE},
-	    {"ArchiveMaxRecursion", OPT_NUM},
-	    {"ArchiveMaxFiles", OPT_NUM},
-	    {"ArchiveMaxCompressionRatio", OPT_NUM},
+	    {"MaxScanSize", OPT_COMPSIZE},
+	    {"MaxFileSize", OPT_COMPSIZE},
+	    {"MaxRecursion", OPT_NUM},
+	    {"MaxFiles", OPT_NUM},
 	    {"ArchiveLimitMemoryUsage", OPT_NOARG},
 	    {"ArchiveBlockEncrypted", OPT_NOARG},
 	    {"DataDirectory", OPT_STR}, /* obsolete */
diff -ur klamav-0.42/src/klammail/clamdmail.c klamav-0.42-clamav093/src/klammail/clamdmail.c
--- klamav-0.42/src/klammail/clamdmail.c	2008-01-06 17:00:35.000000000 +0100
+++ klamav-0.42-clamav093/src/klammail/clamdmail.c	2008-03-28 06:20:55.000000000 +0100
@@ -202,13 +202,12 @@
                         /* set up archive limits */
                         memset(&limits, 0, sizeof(struct cl_limits));
                         limits.maxfiles = 1000; /* max files */
-                        limits.maxfilesize = 10 * 1048576; /* maximum size of archived/compressed
+                        limits.maxfilesize = 10 * 1048576; /* maximum size of
                                                             * file (files exceeding this limit
                                                             * will be ignored)
                                                             */
-                        limits.maxreclevel = 5; /* maximum recursion level for archives */
-                        limits.maxmailrec = 64; /* maximum recursion level for mail files */
-                        limits.maxratio = 200; /* maximum compression ratio */
+                        limits.maxreclevel = 5; /* maximum recursion level for archives and mail files */
+                        limits.maxscansize = 200 * limits.maxfilesize; /* maximum compression ratio */
 
                         ret = cl_scandesc(fd, &virname, &size, engine, &limits, CL_SCAN_STDOPT | CL_ARCHIVE | CL_MAIL | CL_OLE2 | CL_SCAN_HTML);
 
diff -ur klamav-0.42/src/scanviewer.cpp klamav-0.42-clamav093/src/scanviewer.cpp
--- klamav-0.42/src/scanviewer.cpp	2008-01-06 17:00:35.000000000 +0100
+++ klamav-0.42-clamav093/src/scanviewer.cpp	2008-03-28 06:36:43.000000000 +0100
@@ -393,18 +393,18 @@
         options += "--max-files=" + QString("%1").arg(KlamavConfig::noFilesToExtract()) + " ";
 
     if (KlamavConfig::mBsToExtract() > 0)
-        options += "--max-space=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
+        options += "--max-filesize=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
         
-    if (KlamavConfig::compressionRatio() > 0)
-        options += "--max-ratio=" + QString("%1").arg(KlamavConfig::compressionRatio()) + " ";
+    if (KlamavConfig::mBsToExtract() > 0 && KlamavConfig::compressionRatio() > 0)
+        options += "--max-scansize=" + QString("%1").arg(KlamavConfig::mBsToExtract() * KlamavConfig::compressionRatio()) + " ";
 
     if (KlamavConfig::recursionLevel() > 0)
         options += "--max-recursion=" + QString("%1").arg(KlamavConfig::recursionLevel()) + " ";
 
 
     //config->setGroup("Klamscan");
-    if (KlamavConfig::virusLimitsExceeded())
-        options += "--block-max ";
+//    if (KlamavConfig::virusLimitsExceeded())
+//        options += "--block-max ";
 
     if (KlamavConfig::virusEncrypted())
         options += "--block-encrypted ";


Index: klamav.spec
===================================================================
RCS file: /cvs/pkgs/rpms/klamav/devel/klamav.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- klamav.spec	6 Mar 2008 09:38:40 -0000	1.19
+++ klamav.spec	28 Mar 2008 05:44:16 -0000	1.20
@@ -6,6 +6,7 @@
 Patch0: klamav-suse-clamav-path.diff
 Patch1: klamav-0.41.1-pwd-echo.patch
 Patch2: klamav-0.41.1-gcc43.patch
+Patch3: klamav-0.42-clamav093.patch
 URL: http://klamav.sourceforge.net
 Group: Applications/System
 License: GPLv2+
@@ -31,6 +32,9 @@
 %patch0 -p0 -b .suse-clamav-path
 %patch1 -p1 -b .pwd-echo
 %patch2 -p1 -b .gcc43
+%if 0%{?fedora} >= 9
+%patch3 -p1 -b .clamav093
+%endif
 
 %build
 %configure --disable-rpath --without-included-sqlite
@@ -85,6 +89,9 @@
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
+* Fri Mar 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.42-3
+- patch for clamav 0.93
+
 * Thu Mar 06 2008 Andy Shevchenko <andy at smile.org.ua> 0.42-2
 - rebuild against newer clamav