Version bump (0.41). Fix compilation with clamav-0.90 for klamav-0.40 (#167610). Closing #164522. Fixed header for klamav-0.35.1 ebuild

(Portage version: 2.1.2.1)

6 files changed, 94 insertions, 6 deletions

diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog
index dce82c2dd78b..98392f308c72 100644
--- a/app-antivirus/klamav/ChangeLog
+++ b/app-antivirus/klamav/ChangeLog
@@ -1,6 +1,15 @@
 # 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.25 2007/02/21 19:51:55 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.26 2007/03/06 22:33:43 troll Exp $
+
+*klamav-0.41 (06 Mar 2007)
+
+  06 Mar 2007; Przemysław Maciąg <troll@gentoo.org>
+  +files/klamav-0.40-clamav_0.90_update.patch, klamav-0.40.ebuild,
+  +klamav-0.41.ebuild:
+  Version bump (0.41). Fix compilation with >=clamav-0.90 for 0.40 (#167610).
+  With 0.4x viruses databases can be downloaded properly (#164522). Fixed header
+  in 0.35.1
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-antivirus/klamav/files/digest-klamav-0.41 b/app-antivirus/klamav/files/digest-klamav-0.41
new file mode 100644
index 000000000000..07bb327eca60
--- /dev/null
+++ b/app-antivirus/klamav/files/digest-klamav-0.41
@@ -0,0 +1,3 @@
+MD5 4878b88f6b069dcef0f5825f9bca624a klamav-0.41-source.tar.gz 1783244
+RMD160 84c8b57fc8391624ec288b6b5fe0497a92e97baf klamav-0.41-source.tar.gz 1783244
+SHA256 7419db65041097129929064f065ae623e8e04a67a550ef24dff3d20223802340 klamav-0.41-source.tar.gz 1783244
diff --git a/app-antivirus/klamav/files/klamav-0.40-clamav_0.90_update.patch b/app-antivirus/klamav/files/klamav-0.40-clamav_0.90_update.patch
new file mode 100644
index 000000000000..6261c74c55d7
--- /dev/null
+++ b/app-antivirus/klamav/files/klamav-0.40-clamav_0.90_update.patch
@@ -0,0 +1,40 @@
+diff -Naur klamav-0.40-source-orig/klamav-0.40/src/freshklam.cpp klamav-0.40-source/klamav-0.40/src/freshklam.cpp
+--- klamav-0.40-source-orig/klamav-0.40/src/freshklam.cpp	2007-01-02 20:46:37.000000000 +0100
++++ klamav-0.40-source/klamav-0.40/src/freshklam.cpp	2007-02-20 00:09:04.000000000 +0100
+@@ -835,7 +835,9 @@
+     
+ 
+     if (dbdir != dir_combo->url()){
+-        ret = cl_loaddbdir((const char *)dir_combo->url(), &root, &no);
++        //ret = cl_loaddbdir((const char *)dir_combo->url(), &root, &no);
++	 // clamav 0.90 update
++        ret = cl_load((const char *)dir_combo->url(), &root, &no, CL_DB_STDOPT);
+         ////kdDebug() << "ret " << ret << endl;
+         if (no == 0){
+             db = dbdir;
+diff -Naur klamav-0.40-source-orig/klamav-0.40/src/klamav.cpp klamav-0.40-source/klamav-0.40/src/klamav.cpp
+--- klamav-0.40-source-orig/klamav-0.40/src/klamav.cpp	2007-01-02 20:46:37.000000000 +0100
++++ klamav-0.40-source/klamav-0.40/src/klamav.cpp	2007-02-20 00:06:02.000000000 +0100
+@@ -184,6 +184,8 @@
+ 	hide();
+ 	//return false;
+ 
++	// no default ret value
++	return true;
+ }
+ 
+ 
+diff -Naur klamav-0.40-source-orig/klamav-0.40/src/dbviewer.cpp klamav-0.40-source/klamav-0.40/src/dbviewer.cpp
+--- klamav-0.40-source-orig/klamav-0.40/src/dbviewer.cpp	2007-01-02 20:46:37.000000000 +0100
++++ klamav-0.40-source/klamav-0.40/src/dbviewer.cpp	2007-02-20 00:20:02.000000000 +0100
+@@ -815,7 +815,9 @@
+     dbdir = lastDownloadPaths.first();
+ 
+ 
+-    ret = cl_loaddbdir((const char *)dbdir, &root, &no);
++    //ret = cl_loaddbdir((const char *)dbdir, &root, &no);
++    // clamav-0.90 update
++    ret = cl_load((const char *)dbdir, &root, &no, CL_DB_STDOPT);
+     //kdDebug() << "no " << no << endl;
+     cl_free(root);
+     return no;
diff --git a/app-antivirus/klamav/klamav-0.35.1.ebuild b/app-antivirus/klamav/klamav-0.35.1.ebuild
index 43fb0a78e6a7..098280da6ea6 100644
--- a/app-antivirus/klamav/klamav-0.35.1.ebuild
+++ b/app-antivirus/klamav/klamav-0.35.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.35.1.ebuild,v 1.4 2007/01/29 03:03:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.35.1.ebuild,v 1.5 2007/03/06 22:33:43 troll Exp $
 
 inherit kde eutils flag-o-matic
 
diff --git a/app-antivirus/klamav/klamav-0.40.ebuild b/app-antivirus/klamav/klamav-0.40.ebuild
index 48407324a435..19f6d14ddecb 100644
--- a/app-antivirus/klamav/klamav-0.40.ebuild
+++ b/app-antivirus/klamav/klamav-0.40.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.40.ebuild,v 1.1 2007/01/04 12:03:24 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.40.ebuild,v 1.2 2007/03/06 22:33:43 troll Exp $
 
 inherit kde
 
@@ -16,10 +16,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="app-antivirus/clamav"
-RDEPEND="app-antivirus/clamav"
+DEPEND=">=app-antivirus/clamav-0.90"
+RDEPEND="${DEPEND}"
+
 need-kde 3.4
 
+PATCHES="${FILESDIR}/${P}-clamav_0.90_update.patch"
+
 src_unpack(){
 	kde_src_unpack
 	# Assure a future version won't try to build this.
diff --git a/app-antivirus/klamav/klamav-0.41.ebuild b/app-antivirus/klamav/klamav-0.41.ebuild
new file mode 100644
index 000000000000..4bf9eaba8292
--- /dev/null
+++ b/app-antivirus/klamav/klamav-0.41.ebuild
@@ -0,0 +1,33 @@
+# 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.1 2007/03/06 22:33:43 troll 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
+
+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"
+}