| 1 |
philantrop 08/04/25 22:48:52 |
| 2 |
|
| 3 |
Added: klamav-0.42-clamav093.patch |
| 4 |
Log: |
| 5 |
Added a patch to fix compilation with >=clamav-0.93. Fixes bug 219021. |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-antivirus/klamav/files/klamav-0.42-clamav093.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/klamav/files/klamav-0.42-clamav093.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/klamav/files/klamav-0.42-clamav093.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: klamav-0.42-clamav093.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur klamav-0.42/src/klammail/cfgparser.c klamav-0.42-clamav093/src/klammail/cfgparser.c |
| 17 |
--- klamav-0.42/src/klammail/cfgparser.c 2008-01-06 17:00:35.000000000 +0100 |
| 18 |
+++ klamav-0.42-clamav093/src/klammail/cfgparser.c 2008-03-28 07:00:26.000000000 +0100 |
| 19 |
@@ -63,10 +63,10 @@ |
| 20 |
{"ScanOLE2", OPT_NOARG}, |
| 21 |
{"ScanArchive", OPT_NOARG}, |
| 22 |
{"ScanRAR", OPT_NOARG}, |
| 23 |
- {"ArchiveMaxFileSize", OPT_COMPSIZE}, |
| 24 |
- {"ArchiveMaxRecursion", OPT_NUM}, |
| 25 |
- {"ArchiveMaxFiles", OPT_NUM}, |
| 26 |
- {"ArchiveMaxCompressionRatio", OPT_NUM}, |
| 27 |
+ {"MaxScanSize", OPT_COMPSIZE}, |
| 28 |
+ {"MaxFileSize", OPT_COMPSIZE}, |
| 29 |
+ {"MaxRecursion", OPT_NUM}, |
| 30 |
+ {"MaxFiles", OPT_NUM}, |
| 31 |
{"ArchiveLimitMemoryUsage", OPT_NOARG}, |
| 32 |
{"ArchiveBlockEncrypted", OPT_NOARG}, |
| 33 |
{"DataDirectory", OPT_STR}, /* obsolete */ |
| 34 |
diff -ur klamav-0.42/src/klammail/clamdmail.c klamav-0.42-clamav093/src/klammail/clamdmail.c |
| 35 |
--- klamav-0.42/src/klammail/clamdmail.c 2008-01-06 17:00:35.000000000 +0100 |
| 36 |
+++ klamav-0.42-clamav093/src/klammail/clamdmail.c 2008-03-28 07:10:31.000000000 +0100 |
| 37 |
@@ -151,14 +151,14 @@ |
| 38 |
while((bytes = read(0, buff, BUFFSIZE)) > 0) { |
| 39 |
|
| 40 |
if(write(fd, buff, bytes) != bytes) { |
| 41 |
- cli_dbgmsg("clamdmail -> Can't write() file.\n"); |
| 42 |
+ printf("clamdmail -> Can't write() file.\n"); |
| 43 |
close(fd); |
| 44 |
return CL_EMEM; |
| 45 |
} |
| 46 |
} |
| 47 |
|
| 48 |
if(fsync(fd) == -1) { |
| 49 |
- cli_dbgmsg("fsync() failed for descriptor %d\n", fd); |
| 50 |
+ printf("fsync() failed for descriptor %d\n", fd); |
| 51 |
close(fd); |
| 52 |
return CL_EFSYNC; |
| 53 |
} |
| 54 |
@@ -202,13 +202,12 @@ |
| 55 |
/* set up archive limits */ |
| 56 |
memset(&limits, 0, sizeof(struct cl_limits)); |
| 57 |
limits.maxfiles = 1000; /* max files */ |
| 58 |
- limits.maxfilesize = 10 * 1048576; /* maximum size of archived/compressed |
| 59 |
+ limits.maxfilesize = 10 * 1048576; /* maximum size of |
| 60 |
* file (files exceeding this limit |
| 61 |
* will be ignored) |
| 62 |
*/ |
| 63 |
- limits.maxreclevel = 5; /* maximum recursion level for archives */ |
| 64 |
- limits.maxmailrec = 64; /* maximum recursion level for mail files */ |
| 65 |
- limits.maxratio = 200; /* maximum compression ratio */ |
| 66 |
+ limits.maxreclevel = 5; /* maximum recursion level for archives and mail files */ |
| 67 |
+ limits.maxscansize = 200 * limits.maxfilesize; /* maximum compression ratio */ |
| 68 |
|
| 69 |
ret = cl_scandesc(fd, &virname, &size, engine, &limits, CL_SCAN_STDOPT | CL_ARCHIVE | CL_MAIL | CL_OLE2 | CL_SCAN_HTML); |
| 70 |
|
| 71 |
@@ -368,7 +367,7 @@ |
| 72 |
while((bytes = read(fd, buff, BUFFSIZE)) > 0) { |
| 73 |
|
| 74 |
if(write(1, buff, bytes) != bytes) { |
| 75 |
- cli_dbgmsg("clamdmail -> Can't write() file.\n"); |
| 76 |
+ printf("clamdmail -> Can't write() file.\n"); |
| 77 |
close(fd); |
| 78 |
return CL_EMEM; |
| 79 |
} |
| 80 |
diff -ur klamav-0.42/src/scanviewer.cpp klamav-0.42-clamav093/src/scanviewer.cpp |
| 81 |
--- klamav-0.42/src/scanviewer.cpp 2008-01-06 17:00:35.000000000 +0100 |
| 82 |
+++ klamav-0.42-clamav093/src/scanviewer.cpp 2008-03-28 07:00:26.000000000 +0100 |
| 83 |
@@ -393,18 +393,18 @@ |
| 84 |
options += "--max-files=" + QString("%1").arg(KlamavConfig::noFilesToExtract()) + " "; |
| 85 |
|
| 86 |
if (KlamavConfig::mBsToExtract() > 0) |
| 87 |
- options += "--max-space=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " "; |
| 88 |
+ options += "--max-filesize=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " "; |
| 89 |
|
| 90 |
- if (KlamavConfig::compressionRatio() > 0) |
| 91 |
- options += "--max-ratio=" + QString("%1").arg(KlamavConfig::compressionRatio()) + " "; |
| 92 |
+ if (KlamavConfig::mBsToExtract() > 0 && KlamavConfig::compressionRatio() > 0) |
| 93 |
+ options += "--max-scansize=" + QString("%1").arg(KlamavConfig::mBsToExtract() * KlamavConfig::compressionRatio()) + " "; |
| 94 |
|
| 95 |
if (KlamavConfig::recursionLevel() > 0) |
| 96 |
options += "--max-recursion=" + QString("%1").arg(KlamavConfig::recursionLevel()) + " "; |
| 97 |
|
| 98 |
|
| 99 |
//config->setGroup("Klamscan"); |
| 100 |
- if (KlamavConfig::virusLimitsExceeded()) |
| 101 |
- options += "--block-max "; |
| 102 |
+// if (KlamavConfig::virusLimitsExceeded()) |
| 103 |
+// options += "--block-max "; |
| 104 |
|
| 105 |
if (KlamavConfig::virusEncrypted()) |
| 106 |
options += "--block-encrypted "; |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
-- |
| 111 |
gentoo-commits@l.g.o mailing list |
Archives