Version Bump and fix to bug 202694.

Package-Manager: portage-2.1.4_rc11

8 files changed, 101 insertions, 17 deletions

diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog
index 684616aa7d87..659031bff7dd 100644
--- a/app-antivirus/klamav/ChangeLog
+++ b/app-antivirus/klamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/klamav
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.32 2007/05/19 16:52:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.33 2007/12/30 12:50:17 mattepiu Exp $
+
+*klamav-0.41.1 (30 Dec 2007)
+
+  30 Dec 2007; Matteo Azzali <mattepiu@gentoo.org>
+  +files/klamav-0.41.1-cl_loaddbdir.patch,
+  +files/klamav-0.41.1-gentempdesc.patch, +klamav-0.41.1.ebuild:
+  Version Bump.Also fixes bug #202694 .
 
   19 May 2007; nixnut <nixnut@gentoo.org> klamav-0.41.ebuild:
   Stable on ppc wrt bug 177728
diff --git a/app-antivirus/klamav/Manifest b/app-antivirus/klamav/Manifest
index d99629d0fc65..bcbf88ebca38 100644
--- a/app-antivirus/klamav/Manifest
+++ b/app-antivirus/klamav/Manifest
@@ -2,20 +2,33 @@ AUX klamav-0.41-cl_loaddbdir.patch 653 RMD160 5130f329a36e2f38c3e5b8a5d84bd47940
 MD5 21c89a75c8ae9006658c2bf582797393 files/klamav-0.41-cl_loaddbdir.patch 653
 RMD160 5130f329a36e2f38c3e5b8a5d84bd47940597084 files/klamav-0.41-cl_loaddbdir.patch 653
 SHA256 d6931d5840f1f45e623b53868bce9971397cbce88dea86342e15b350c303bfcd files/klamav-0.41-cl_loaddbdir.patch 653
+AUX klamav-0.41.1-cl_loaddbdir.patch 653 RMD160 5130f329a36e2f38c3e5b8a5d84bd47940597084 SHA1 6a3b9f2a61e91eeaf06f17c1805f5209123c8589 SHA256 d6931d5840f1f45e623b53868bce9971397cbce88dea86342e15b350c303bfcd
+MD5 21c89a75c8ae9006658c2bf582797393 files/klamav-0.41.1-cl_loaddbdir.patch 653
+RMD160 5130f329a36e2f38c3e5b8a5d84bd47940597084 files/klamav-0.41.1-cl_loaddbdir.patch 653
+SHA256 d6931d5840f1f45e623b53868bce9971397cbce88dea86342e15b350c303bfcd files/klamav-0.41.1-cl_loaddbdir.patch 653
+AUX klamav-0.41.1-gentempdesc.patch 429 RMD160 a3ed104558c966462cf672e0183345dd8af4a351 SHA1 eead0c8538918df289ee07f1e6f4b66ed8d04990 SHA256 c1210f34348406a297d4188ee37e209b355ab64b275a1fe4f5f480520d2f0b9e
+MD5 8e6492a09495ecc62997167e8d5ccbbd files/klamav-0.41.1-gentempdesc.patch 429
+RMD160 a3ed104558c966462cf672e0183345dd8af4a351 files/klamav-0.41.1-gentempdesc.patch 429
+SHA256 c1210f34348406a297d4188ee37e209b355ab64b275a1fe4f5f480520d2f0b9e files/klamav-0.41.1-gentempdesc.patch 429
 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
-EBUILD klamav-0.38.ebuild 886 RMD160 56e6a43bb6c84ab802a6becc46152b46327c5fea SHA1 5e62e3ab588f63802da6627d78d4990f5cdc1a2a SHA256 8faa54eb2bb09db7cdb4d2f7183d64f3e3d74c522aa4c5f4b426265435754926
-MD5 d6ee116f7c654ac2e691c4aa5c120357 klamav-0.38.ebuild 886
-RMD160 56e6a43bb6c84ab802a6becc46152b46327c5fea klamav-0.38.ebuild 886
-SHA256 8faa54eb2bb09db7cdb4d2f7183d64f3e3d74c522aa4c5f4b426265435754926 klamav-0.38.ebuild 886
-EBUILD klamav-0.41.ebuild 931 RMD160 73a11a28cfdab57ecd5a1f6aaa534301cdbec258 SHA1 38566b3849dcb360b3fe9e180cb3b3cbc045d04c SHA256 bf4aaa7a2b8860eee65c95e8591f5117ba4f8ece086d30bd292823fb7f4a336b
-MD5 67e917307f8f23964668b744d749f496 klamav-0.41.ebuild 931
-RMD160 73a11a28cfdab57ecd5a1f6aaa534301cdbec258 klamav-0.41.ebuild 931
-SHA256 bf4aaa7a2b8860eee65c95e8591f5117ba4f8ece086d30bd292823fb7f4a336b klamav-0.41.ebuild 931
-MISC ChangeLog 4549 RMD160 95fee459afd01d3ca5439c75149b78b5bac8ab3f SHA1 c24fadad2ab6c6a95c11a6ac9ab93c43600f81e9 SHA256 8a8072053f18911176972e822b2d1393cc4008a79ffac576475bf104ee6dae31
-MD5 a9d619184dda8ce945eba7e6de64cb4f ChangeLog 4549
-RMD160 95fee459afd01d3ca5439c75149b78b5bac8ab3f ChangeLog 4549
-SHA256 8a8072053f18911176972e822b2d1393cc4008a79ffac576475bf104ee6dae31 ChangeLog 4549
+DIST klamav-0.41.1-source.tar.gz 1784785 RMD160 fa6115453f9e41c9fd03581aaac8073b8309614f SHA1 1cd14dbfb9a5e5bb0a24a04d0a421154476dceab SHA256 a57609a7948526bcd0f5b104acb77aa41b86263ebb7d9f93cd46443e2c244344
+EBUILD klamav-0.38.ebuild 891 RMD160 ab2a140d13f533619a42cebfaf78d4f239449e0c SHA1 6556cbf67a22673741b33ca76ab8435107564b8a SHA256 eb0c1c8e63a55b1dcb9f6cc103fd4c8f5ba0eedb6ba89d8930a230a5c0a2471d
+MD5 b533883446fa50e79dafb97f10983d83 klamav-0.38.ebuild 891
+RMD160 ab2a140d13f533619a42cebfaf78d4f239449e0c klamav-0.38.ebuild 891
+SHA256 eb0c1c8e63a55b1dcb9f6cc103fd4c8f5ba0eedb6ba89d8930a230a5c0a2471d klamav-0.38.ebuild 891
+EBUILD klamav-0.41.1.ebuild 980 RMD160 d31511827fe7f47377a51f721803b3dd1e01a3bc SHA1 884681b5d6e15e7f3f2bac1856e33787ab01b246 SHA256 35ee545ceacf6ed3c04e8b4fbae556601157266eaa04be7710da34a38aa9a2b1
+MD5 de80e8ffcf79821118e4e0ad9bb98af7 klamav-0.41.1.ebuild 980
+RMD160 d31511827fe7f47377a51f721803b3dd1e01a3bc klamav-0.41.1.ebuild 980
+SHA256 35ee545ceacf6ed3c04e8b4fbae556601157266eaa04be7710da34a38aa9a2b1 klamav-0.41.1.ebuild 980
+EBUILD klamav-0.41.ebuild 935 RMD160 12f65375d1796b9d2a7ef83bf89c8e110ce3210e SHA1 3c72f5d90df72a670525bb51ee2068c6468963d7 SHA256 dbe5d95eddaa649cb828821256b6463bf25bc36a9c6d95b54bf88901904ae3c1
+MD5 cd2b6ee2027bfe63755c88270712cfff klamav-0.41.ebuild 935
+RMD160 12f65375d1796b9d2a7ef83bf89c8e110ce3210e klamav-0.41.ebuild 935
+SHA256 dbe5d95eddaa649cb828821256b6463bf25bc36a9c6d95b54bf88901904ae3c1 klamav-0.41.ebuild 935
+MISC ChangeLog 4781 RMD160 ee267d1f78b5e0f5f50f82049befeea8fa1e6146 SHA1 b3c482a79d859ae86510038201d012a150b4db50 SHA256 ea1d5f5befe4b6af55a3a73010b2f71d7685b4eeee05ef6c1830adeef9577fb6
+MD5 bbab7d811e691d02aa2601bc9f821f74 ChangeLog 4781
+RMD160 ee267d1f78b5e0f5f50f82049befeea8fa1e6146 ChangeLog 4781
+SHA256 ea1d5f5befe4b6af55a3a73010b2f71d7685b4eeee05ef6c1830adeef9577fb6 ChangeLog 4781
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -26,3 +39,6 @@ SHA256 e55e6dacc6c4cf1783c2b50e66ddbf4f62a2ffe595f9913a932d95a1606182dd files/di
 MD5 b00478fa75f506c088598408c980e599 files/digest-klamav-0.41 259
 RMD160 e30523cc4b47e0cd7e5fa425d3931872f5c71755 files/digest-klamav-0.41 259
 SHA256 f46d90d65169f980763655fa2048c1d2f184b8df15b81f7ef37a0f3acfd2b516 files/digest-klamav-0.41 259
+MD5 7787c987e8fef159e17e4f7ba3aa4365 files/digest-klamav-0.41.1 265
+RMD160 8f052326fca0dbe63845aeb0a50f1e1c552b2453 files/digest-klamav-0.41.1 265
+SHA256 30531a02c0ab990719e1fa1a25fd1f39fc9c2c93dd3742fd7c66414a73c8d86e files/digest-klamav-0.41.1 265
diff --git a/app-antivirus/klamav/files/digest-klamav-0.41.1 b/app-antivirus/klamav/files/digest-klamav-0.41.1
new file mode 100644
index 000000000000..f708dca8c37a
--- /dev/null
+++ b/app-antivirus/klamav/files/digest-klamav-0.41.1
@@ -0,0 +1,3 @@
+MD5 073c3f223d89016c14bab957230ac3b7 klamav-0.41.1-source.tar.gz 1784785
+RMD160 fa6115453f9e41c9fd03581aaac8073b8309614f klamav-0.41.1-source.tar.gz 1784785
+SHA256 a57609a7948526bcd0f5b104acb77aa41b86263ebb7d9f93cd46443e2c244344 klamav-0.41.1-source.tar.gz 1784785
diff --git a/app-antivirus/klamav/files/klamav-0.41.1-cl_loaddbdir.patch b/app-antivirus/klamav/files/klamav-0.41.1-cl_loaddbdir.patch
new file mode 100644
index 000000000000..202d942b1aff
--- /dev/null
+++ b/app-antivirus/klamav/files/klamav-0.41.1-cl_loaddbdir.patch
@@ -0,0 +1,11 @@
+--- klamav-0.41/src/klammail/clamdmail.c.orig	2007-03-07 11:51:17.000000000 -0100
++++ klamav-0.41/src/klammail/clamdmail.c	2007-03-07 11:50:08.000000000 -0100
+@@ -185,7 +185,7 @@
+                                     return 50;
+                                 }
+                         }else{
+-                                if((ret = cl_loaddbdir(cl_retdbdir(), &engine, &no, CL_DB_STDOPT))) {
++                                if((ret = cl_loaddbdir(cl_retdbdir(), &engine, &no))) {
+                                 printf("cl_loaddbdir: %s\n", cl_strerror(ret));
+                                 close(fd);
+                                 exit(2);
diff --git a/app-antivirus/klamav/files/klamav-0.41.1-gentempdesc.patch b/app-antivirus/klamav/files/klamav-0.41.1-gentempdesc.patch
new file mode 100644
index 000000000000..f204c953d34d
--- /dev/null
+++ b/app-antivirus/klamav/files/klamav-0.41.1-gentempdesc.patch
@@ -0,0 +1,11 @@
+--- klamav-0.41.1/src/klamd/scanner.c.orig	2007-12-19 10:38:11.000000000 +0100
++++ klamav-0.41.1/src/klamd/scanner.c	2007-12-19 10:43:12.000000000 +0100
+@@ -396,7 +396,7 @@
+ 
+     logg("*Accepted connection on port %d, fd %d\n", port, acceptd);
+ 
+-    if ((tmpname = cli_gentempdesc(NULL, &tmpd)) == NULL) {
++    if (cli_gentempfd(NULL, &tmpname, &tmpd) != CL_SUCCESS) {
+ 	shutdown(sockfd, 2);
+ 	close(sockfd);
+ 	close(acceptd);
diff --git a/app-antivirus/klamav/klamav-0.38.ebuild b/app-antivirus/klamav/klamav-0.38.ebuild
index c75426318d66..4c61a68b3fba 100644
--- a/app-antivirus/klamav/klamav-0.38.ebuild
+++ b/app-antivirus/klamav/klamav-0.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.38.ebuild,v 1.6 2006/11/05 10:23:29 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.38.ebuild,v 1.7 2007/12/30 12:50:17 mattepiu Exp $
 
 inherit kde
 
@@ -23,7 +23,7 @@ need-kde 3.4
 src_unpack(){
 	kde_src_unpack
 	# Assure a future version won't try to build this.
-	rm -rf ${WORKDIR}/${MY_P}/dazuko* || die "We missed to eradicate some files"
+	rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
 }
 
 pkg_postinst(){
diff --git a/app-antivirus/klamav/klamav-0.41.1.ebuild b/app-antivirus/klamav/klamav-0.41.1.ebuild
new file mode 100644
index 000000000000..a5719ccf2d58
--- /dev/null
+++ b/app-antivirus/klamav/klamav-0.41.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.41.1.ebuild,v 1.1 2007/12/30 12:50:17 mattepiu Exp $
+
+inherit kde
+
+MY_P="${P}-source"
+S="${WORKDIR}/${MY_P}/${P}"
+
+DESCRIPTION="KlamAV is a KDE frontend for the ClamAV antivirus."
+HOMEPAGE="http://klamav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/klamav/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=app-antivirus/clamav-0.90"
+RDEPEND="${DEPEND}"
+
+need-kde 3.4
+
+PATCHES="${FILESDIR}/${P}-cl_loaddbdir.patch
+	${FILESDIR}/klamav-gentempdesc.patch"
+
+src_unpack(){
+	kde_src_unpack
+	# Assure a future version won't try to build this.
+	rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
+}
+
+pkg_postinst(){
+	elog "The on-access scanning functionality is provided by"
+	elog "the Dazuko kernel module:  emerge sys-fs/dazuko"
+}
diff --git a/app-antivirus/klamav/klamav-0.41.ebuild b/app-antivirus/klamav/klamav-0.41.ebuild
index 4bab7a17f9b1..1640c0ff52a5 100644
--- a/app-antivirus/klamav/klamav-0.41.ebuild
+++ b/app-antivirus/klamav/klamav-0.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.41.ebuild,v 1.7 2007/05/19 16:52:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.41.ebuild,v 1.8 2007/12/30 12:50:17 mattepiu Exp $
 
 inherit kde
 
@@ -26,7 +26,7 @@ PATCHES="${FILESDIR}/${P}-cl_loaddbdir.patch"
 src_unpack(){
 	kde_src_unpack
 	# Assure a future version won't try to build this.
-	rm -rf ${WORKDIR}/${MY_P}/dazuko* || die "We missed to eradicate some files"
+	rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
 }
 
 pkg_postinst(){