Added a patch to fix compilation with >=clamav-0.93. Fixes bug 219021.

Package-Manager: portage-2.1.5_rc6

4 files changed, 107 insertions, 6 deletions

diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog
index 1621d4f57dd9..813f47e67d50 100644
--- a/app-antivirus/klamav/ChangeLog
+++ b/app-antivirus/klamav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-antivirus/klamav
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.42 2008/02/26 20:08:12 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.43 2008/04/25 22:48:51 philantrop Exp $
+
+  25 Apr 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/klamav-0.42-clamav093.patch, klamav-0.42.ebuild:
+  Added a patch to fix compilation with >=clamav-0.93. Fixes bug 219021.
 
   26 Feb 2008; Richard Freeman <rich0@gentoo.org> klamav-0.42.ebuild:
   amd64 stable - 202694
diff --git a/app-antivirus/klamav/Manifest b/app-antivirus/klamav/Manifest
index fd5f13620058..60aaa3985ecf 100644
--- a/app-antivirus/klamav/Manifest
+++ b/app-antivirus/klamav/Manifest
@@ -1,6 +1,7 @@
 AUX klamav-0.41-cl_loaddbdir.patch 653 RMD160 5130f329a36e2f38c3e5b8a5d84bd47940597084 SHA1 6a3b9f2a61e91eeaf06f17c1805f5209123c8589 SHA256 d6931d5840f1f45e623b53868bce9971397cbce88dea86342e15b350c303bfcd
 AUX klamav-0.41.1-cl_loaddbdir.patch 653 RMD160 5130f329a36e2f38c3e5b8a5d84bd47940597084 SHA1 6a3b9f2a61e91eeaf06f17c1805f5209123c8589 SHA256 d6931d5840f1f45e623b53868bce9971397cbce88dea86342e15b350c303bfcd
 AUX klamav-0.41.1-gentempdesc.patch 429 RMD160 a3ed104558c966462cf672e0183345dd8af4a351 SHA1 eead0c8538918df289ee07f1e6f4b66ed8d04990 SHA256 c1210f34348406a297d4188ee37e209b355ab64b275a1fe4f5f480520d2f0b9e
+AUX klamav-0.42-clamav093.patch 4995 RMD160 bd8c88b62114a75180370cbb18b80b51b672db8a SHA1 499a7bc5b29455cf073a2576ec9dbd428bf024bf SHA256 9ab0ccbd7b714bdb7f93ebd16350a01cc47f2ff8c19f0e30909f1263b1a698b7
 DIST klamav-0.38-source.tar.gz 2050525 RMD160 6b618f3922932a41f5824400954f3ecc4b192ab1 SHA1 f02b98dcda30a82781767143195d4bc1ad7af60b SHA256 76c172ee8e10c9a2dee02b4d32c4acbfa1eaa5e1fdf6e74d7b51802de344e7f9
 DIST klamav-0.41-source.tar.gz 1783244 RMD160 84c8b57fc8391624ec288b6b5fe0497a92e97baf SHA1 cf8d9d9f008057ab66b36e497cda375c95cba7f3 SHA256 7419db65041097129929064f065ae623e8e04a67a550ef24dff3d20223802340
 DIST klamav-0.41.1-source.tar.gz 1784785 RMD160 fa6115453f9e41c9fd03581aaac8073b8309614f SHA1 1cd14dbfb9a5e5bb0a24a04d0a421154476dceab SHA256 a57609a7948526bcd0f5b104acb77aa41b86263ebb7d9f93cd46443e2c244344
@@ -8,6 +9,6 @@ DIST klamav-0.42-source.tar.gz 1920149 RMD160 75171ac0a35df29fd97132b1ecd2f345c6
 EBUILD klamav-0.38.ebuild 891 RMD160 ab2a140d13f533619a42cebfaf78d4f239449e0c SHA1 6556cbf67a22673741b33ca76ab8435107564b8a SHA256 eb0c1c8e63a55b1dcb9f6cc103fd4c8f5ba0eedb6ba89d8930a230a5c0a2471d
 EBUILD klamav-0.41.1.ebuild 975 RMD160 c71201c7ba716c2f5483cccab770646e84536101 SHA1 a6a28c8e4c3fcc6f161dab68d21fb5a5c6d2253d SHA256 7e693dc01e90e0dff906fd3af5e44375afacce1df9d42a341991b9a0a45794ef
 EBUILD klamav-0.41.ebuild 935 RMD160 12f65375d1796b9d2a7ef83bf89c8e110ce3210e SHA1 3c72f5d90df72a670525bb51ee2068c6468963d7 SHA256 dbe5d95eddaa649cb828821256b6463bf25bc36a9c6d95b54bf88901904ae3c1
-EBUILD klamav-0.42.ebuild 1113 RMD160 780a090a2121f93fe3009795a030bdedc9501e54 SHA1 f8bbba12826f4b7c2363a08eaadeca0416399b38 SHA256 5174706fe1fbb90c7ad8f02738c0cbd56aa6fff95cbf2f7d4f5d9c40d41db377
-MISC ChangeLog 5808 RMD160 700fead525a4496f725fe40ff7bb97720bc86bd9 SHA1 c110212ce4028cd846114c8e1f87f23a091faac3 SHA256 5e72a658455145312581ceb4a1ada44d679a11c5f0ce48452a878e8686a5e492
+EBUILD klamav-0.42.ebuild 1304 RMD160 3146c6464412d18f314985d73381588aa02aab2d SHA1 612d2108d82fb121f9cd68f1b07c5a077c79e596 SHA256 ba57390cee497fb3acedf64c18718a5ef73611dd2fe87ea7d81051f24a01d5ee
+MISC ChangeLog 6000 RMD160 0c450f2e36d83dfa0fe08d7193da04c6bb828696 SHA1 a3882616751b5a8eea7c24f50da0b0d884abd1c6 SHA256 a4cdec32094ad97386d3ba5fe61f7180a3a8c6f745d275032629a630d72055fa
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-antivirus/klamav/files/klamav-0.42-clamav093.patch b/app-antivirus/klamav/files/klamav-0.42-clamav093.patch
new file mode 100644
index 000000000000..c4f81ad07042
--- /dev/null
+++ b/app-antivirus/klamav/files/klamav-0.42-clamav093.patch
@@ -0,0 +1,91 @@
+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 07:00:26.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 07:10:31.000000000 +0100
+@@ -151,14 +151,14 @@
+                 while((bytes = read(0, buff, BUFFSIZE)) > 0) {
+ 
+                         if(write(fd, buff, bytes) != bytes) {
+-                                cli_dbgmsg("clamdmail -> Can't write() file.\n");
++                                printf("clamdmail -> Can't write() file.\n");
+                                 close(fd);
+                                 return CL_EMEM;
+                         }
+                 }
+ 
+                 if(fsync(fd) == -1) {
+-                        cli_dbgmsg("fsync() failed for descriptor %d\n", fd);
++                        printf("fsync() failed for descriptor %d\n", fd);
+                         close(fd);
+                         return CL_EFSYNC;
+                 }
+@@ -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);
+ 
+@@ -368,7 +367,7 @@
+                                 while((bytes = read(fd, buff, BUFFSIZE)) > 0) {
+         
+                                         if(write(1, buff, bytes) != bytes) {
+-                                        cli_dbgmsg("clamdmail -> Can't write() file.\n");
++                                        printf("clamdmail -> Can't write() file.\n");
+                                                 close(fd);
+                                                 return CL_EMEM;
+                                         }
+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 07:00:26.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 ";
diff --git a/app-antivirus/klamav/klamav-0.42.ebuild b/app-antivirus/klamav/klamav-0.42.ebuild
index c82a210745c3..dc50538bae4a 100644
--- a/app-antivirus/klamav/klamav-0.42.ebuild
+++ b/app-antivirus/klamav/klamav-0.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.42.ebuild,v 1.7 2008/02/26 20:08:12 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.42.ebuild,v 1.8 2008/04/25 22:48:51 philantrop Exp $
 
 inherit kde
 
@@ -21,11 +21,16 @@ RDEPEND="${DEPEND}"
 
 need-kde 3.5
 
-PATCHES="${FILESDIR}/${PN}-0.41-cl_loaddbdir.patch"
+PATCHES=( "${FILESDIR}/${PN}-0.41-cl_loaddbdir.patch" )
 
 src_unpack(){
 	kde_src_unpack
 
+	# Make things work with clamav versions >= 0.93. Fixes bug 219021.
+	if has_version '>=app-antivirus/clamav-0.93' ; then
+		epatch "${FILESDIR}/${P}-clamav093.patch"
+	fi
+
 	# Assure a future version won't try to build this.
 	rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
 
@@ -40,5 +45,5 @@ src_compile(){
 
 pkg_postinst(){
 	elog "The on-access scanning functionality is provided by"
-	elog "the Dazuko kernel module:  emerge sys-fs/dazuko"
+	elog "the Dazuko kernel module. To use it, install sys-fs/dazuko."
 }