Version bump (0.41). Fix compilation with clamav-0.90 for klamav-0.40 (#167610)....

Package-Manager: portage-2.1.2.1

diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog
index dce82c2dd78bd7669f11a32c0d52c7147e2742c6..98392f308c72f88aa071ffc2b26ff4d22a4f435b 100644 (file)
--- 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/Manifest b/app-antivirus/klamav/Manifest
index 3e603ed023627e43c7e9c85dab971319c56197c9..18178607ac793655daea626c59b888ba439e421a 100644 (file)
--- a/app-antivirus/klamav/Manifest
+++ b/app-antivirus/klamav/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX klamav-0.32-parallelmake.patch 1187 RMD160 b2e3be531bf6d6675b5f5202a1076b472686f578 SHA1 c847f44bcf0bd7bc7d9e9531df51722472bd5c8d SHA256 0243e5e4e6bcdc748d8d18daaf92cfeb37f9e2544d64e7fd982f226552ed1b0f
 MD5 c56ae7218aa66579a77f03b7f4353166 files/klamav-0.32-parallelmake.patch 1187
 RMD160 b2e3be531bf6d6675b5f5202a1076b472686f578 files/klamav-0.32-parallelmake.patch 1187
@@ -6,6 +9,10 @@ AUX klamav-0.35.1-gcc-4.1.patch 790 RMD160 1f01232a80ea51054e2383be34a7b99de0c11
 MD5 1eb52be876dee42f10838752b531c120 files/klamav-0.35.1-gcc-4.1.patch 790
 RMD160 1f01232a80ea51054e2383be34a7b99de0c11d2d files/klamav-0.35.1-gcc-4.1.patch 790
 SHA256 c80272257b44cb04447c3c69fe65f4fa5f6c4af3099eee81764fc0ce86e798c2 files/klamav-0.35.1-gcc-4.1.patch 790
+AUX klamav-0.40-clamav_0.90_update.patch 1743 RMD160 2bbc7641e3af549d3654704c4b84be86621e1f6f SHA1 678f292555a0e04b3164e0ba266820914d342ce9 SHA256 dc35df93bbf33ac11ef66aace19e74a5fa2a3b98697a89e8fe7b7db0be3072a3
+MD5 424ee1590bdb850b976bff8fb7a83017 files/klamav-0.40-clamav_0.90_update.patch 1743
+RMD160 2bbc7641e3af549d3654704c4b84be86621e1f6f files/klamav-0.40-clamav_0.90_update.patch 1743
+SHA256 dc35df93bbf33ac11ef66aace19e74a5fa2a3b98697a89e8fe7b7db0be3072a3 files/klamav-0.40-clamav_0.90_update.patch 1743
 DIST klamav-0.17.3.tar.bz2 646829 RMD160 9b5be7dbd16a27c26352b2ced16ce72dec184aba SHA1 c24513a12a3f82bf6f49e437a3bb686ec8bb3d8f SHA256 fb0a9b020e596d671cba815067e7268b4448f1771a672fc335e760a8b378caa3
 DIST klamav-0.22.1.tar.bz2 805460 RMD160 476ed559829474eba154bb5b2fdfbc8882c0136a SHA1 2abeaecc61f7e90310e27f7ec134dbb68db86105 SHA256 dd38251f0ca71d352026ed99f7cbc56cd6a4d7d069f87a8d9bd4c7c3a5d2854b
 DIST klamav-0.30.3-source.tar.gz 1406338 RMD160 630231a1d00ce1758e7056ce9af861ef5f19d582 SHA1 b212fcc9ab1ee6b4b93f7dfe8d40dad4e6a5bd8f SHA256 e4d93b9a7b8e711125a1fba0fbbdb42b4509ba0970a4d78b593ac76830008ebc
@@ -15,6 +22,7 @@ DIST klamav-0.35.1-source.tar.gz 1619223 RMD160 58788d4fdac354fbce14eaff4937bb70
 DIST klamav-0.37-source.tar.gz 1697192 RMD160 7603dccec96f18b5dd803e3125b645356825d966 SHA1 b13289b865334fd8c14903d27abf63659dd04ee8 SHA256 e038785a91775f1b6b2e3b3ddb6d4ebae4ccaf0efe34248df68ca179358b581e
 DIST klamav-0.38-source.tar.gz 2050525 RMD160 6b618f3922932a41f5824400954f3ecc4b192ab1 SHA1 f02b98dcda30a82781767143195d4bc1ad7af60b SHA256 76c172ee8e10c9a2dee02b4d32c4acbfa1eaa5e1fdf6e74d7b51802de344e7f9
 DIST klamav-0.40-source.tar.gz 1758899 RMD160 98ed93097d095c6bd3b6be20f144fd51638471d5 SHA1 1278f2b4e7870f99943e7df9b66049e0956cbe70 SHA256 add8b6093aaf97ef2cb89c17c135ed8aecd7c4e4055ec2a6d79d8344c9b78fee
+DIST klamav-0.41-source.tar.gz 1783244 RMD160 84c8b57fc8391624ec288b6b5fe0497a92e97baf SHA1 cf8d9d9f008057ab66b36e497cda375c95cba7f3 SHA256 7419db65041097129929064f065ae623e8e04a67a550ef24dff3d20223802340
 EBUILD klamav-0.17.3.ebuild 493 RMD160 0ef257851ac40bb2e35b93bc01c0c4c1aae4c33a SHA1 faffc2fa6c3337661174c45ed05d3c5014df8b70 SHA256 2e706c799c973e8a888d914c185a8215d3dd1308bc520a2206f03f5eb069ce51
 MD5 663ae694ff0c2c6d89b70af1005ce731 klamav-0.17.3.ebuild 493
 RMD160 0ef257851ac40bb2e35b93bc01c0c4c1aae4c33a klamav-0.17.3.ebuild 493
@@ -31,10 +39,10 @@ EBUILD klamav-0.32.ebuild 649 RMD160 e53a5258665261f41a64edb333166acb526f626f SH
 MD5 e4eb6eda210f1a4e9bd6ff6f9bda9434 klamav-0.32.ebuild 649
 RMD160 e53a5258665261f41a64edb333166acb526f626f klamav-0.32.ebuild 649
 SHA256 def355ffc3d75e388d27c499ec164c2fcac810e805b311c5c29331d3c90f5763 klamav-0.32.ebuild 649
-EBUILD klamav-0.35.1.ebuild 619 RMD160 49d97c06593adaaf3af4a7b2e48c1e2a3e54d00e SHA1 f6fd6b87ab9ba4718223277e28184e146cc13518 SHA256 42e43ebbc17a6d4561c4443995daf57ce0aabc21bd884617bf90913ad7ccd539
-MD5 df99c671414e77ca78e5aa40b9c4b9ca klamav-0.35.1.ebuild 619
-RMD160 49d97c06593adaaf3af4a7b2e48c1e2a3e54d00e klamav-0.35.1.ebuild 619
-SHA256 42e43ebbc17a6d4561c4443995daf57ce0aabc21bd884617bf90913ad7ccd539 klamav-0.35.1.ebuild 619
+EBUILD klamav-0.35.1.ebuild 615 RMD160 32c8293ff585ed2e4e34cbb05f77338b8c263572 SHA1 3153475bc815d50b25bbd18fafa9b69710c51bc9 SHA256 45f3f9748c2439f902a19c76e9050a002be0659d873d2546dae9869332f32813
+MD5 4dbe1bc1d148bee4ec4d8f088233d8f0 klamav-0.35.1.ebuild 615
+RMD160 32c8293ff585ed2e4e34cbb05f77338b8c263572 klamav-0.35.1.ebuild 615
+SHA256 45f3f9748c2439f902a19c76e9050a002be0659d873d2546dae9869332f32813 klamav-0.35.1.ebuild 615
 EBUILD klamav-0.35.ebuild 728 RMD160 7573ee066abd7956df52edd4726c2e3131e1310f SHA1 9477f3919abc9c316a120821abaf2e124bdbdcb5 SHA256 b114bcadf41ad3163e808083c843a0bc07e1563c99010239ccf8f3fd85a940a0
 MD5 6d996d6a6415f567ba13882688fd9efc klamav-0.35.ebuild 728
 RMD160 7573ee066abd7956df52edd4726c2e3131e1310f klamav-0.35.ebuild 728
@@ -47,14 +55,18 @@ EBUILD klamav-0.38.ebuild 886 RMD160 56e6a43bb6c84ab802a6becc46152b46327c5fea SH
 MD5 d6ee116f7c654ac2e691c4aa5c120357 klamav-0.38.ebuild 886
 RMD160 56e6a43bb6c84ab802a6becc46152b46327c5fea klamav-0.38.ebuild 886
 SHA256 8faa54eb2bb09db7cdb4d2f7183d64f3e3d74c522aa4c5f4b426265435754926 klamav-0.38.ebuild 886
-EBUILD klamav-0.40.ebuild 891 RMD160 8bf0497d38bf9dbc54b1c217dbe851494cd5a599 SHA1 2f64599c27622727ad0e87d7b170417fb389f952 SHA256 cae64cce20b86ac5a72156fd845b3c1bd7e0f7538992eb1bc6bd5e1fc1f41d5f
-MD5 4a7524d2d41937f29fd3b655db3cb2ac klamav-0.40.ebuild 891
-RMD160 8bf0497d38bf9dbc54b1c217dbe851494cd5a599 klamav-0.40.ebuild 891
-SHA256 cae64cce20b86ac5a72156fd845b3c1bd7e0f7538992eb1bc6bd5e1fc1f41d5f klamav-0.40.ebuild 891
-MISC ChangeLog 3252 RMD160 957ce6a499f56aba0448ab38069b017b48eb1004 SHA1 16cdcfc58d4719d727f32acd18fc8d4bb2cf7562 SHA256 8e3e1fc0664fb7ccff979356f4b1f5e9b83c74790f5ff9f56373dafea7dd162a
-MD5 65e93182a423883c9ff7fffef8d0d166 ChangeLog 3252
-RMD160 957ce6a499f56aba0448ab38069b017b48eb1004 ChangeLog 3252
-SHA256 8e3e1fc0664fb7ccff979356f4b1f5e9b83c74790f5ff9f56373dafea7dd162a ChangeLog 3252
+EBUILD klamav-0.40.ebuild 941 RMD160 f2e879ed4d37d968df4afc30aefbd4ddc91307da SHA1 7b73332858683be815cde81436d4f1c52e4e7c33 SHA256 8ca0d4004c6ea241737d6397635255fdc212f542dac0d32ad54e04f4e33f6368
+MD5 d0f3642a539b059683a1328f706784c5 klamav-0.40.ebuild 941
+RMD160 f2e879ed4d37d968df4afc30aefbd4ddc91307da klamav-0.40.ebuild 941
+SHA256 8ca0d4004c6ea241737d6397635255fdc212f542dac0d32ad54e04f4e33f6368 klamav-0.40.ebuild 941
+EBUILD klamav-0.41.ebuild 888 RMD160 8addedd49364953ecbdd40728c0bc260a388c642 SHA1 1efd3374ec5f2ee596cdb18ac3bfb3547d349316 SHA256 2bfcc54ad8221e5a67993cfd32d224622bfa95b10eb279864c8f589379ed1600
+MD5 4b65df8e01de2d864a7b590cf5c21da4 klamav-0.41.ebuild 888
+RMD160 8addedd49364953ecbdd40728c0bc260a388c642 klamav-0.41.ebuild 888
+SHA256 2bfcc54ad8221e5a67993cfd32d224622bfa95b10eb279864c8f589379ed1600 klamav-0.41.ebuild 888
+MISC ChangeLog 3596 RMD160 8d804aa80611c30809763a6e399690a77a71871f SHA1 9b373cfabe39a031af2b156824e246f4082c96cd SHA256 81fa88072e6a1f068bce260dfaa9d278789a774e4c1eac5eb0085e7810cb349a
+MD5 6da52a34eabe808b4b3f0b9d4e2da4e4 ChangeLog 3596
+RMD160 8d804aa80611c30809763a6e399690a77a71871f ChangeLog 3596
+SHA256 81fa88072e6a1f068bce260dfaa9d278789a774e4c1eac5eb0085e7810cb349a ChangeLog 3596
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -86,3 +98,13 @@ SHA256 e55e6dacc6c4cf1783c2b50e66ddbf4f62a2ffe595f9913a932d95a1606182dd files/di
 MD5 aed8e2649f40556d71f331eb2dd0d56b files/digest-klamav-0.40 259
 RMD160 e37a21c943c3fdc71f5b326daa9aaa419e8e3407 files/digest-klamav-0.40 259
 SHA256 06abc567af8674df301b61c678350f69d90dd93c4a1ef0851606f977cb327e9c files/digest-klamav-0.40 259
+MD5 b00478fa75f506c088598408c980e599 files/digest-klamav-0.41 259
+RMD160 e30523cc4b47e0cd7e5fa425d3931872f5c71755 files/digest-klamav-0.41 259
+SHA256 f46d90d65169f980763655fa2048c1d2f184b8df15b81f7ef37a0f3acfd2b516 files/digest-klamav-0.41 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF7e9RexDpKttj3ykRAsc0AJ9S3NE+vfDc7XaWsQ8r0V1wFVLlOgCbBbE3
+AJfEwNUe7PzPiMGFKiQJ0mk=
+=sXMK
+-----END PGP SIGNATURE-----

diff --git a/app-antivirus/klamav/files/digest-klamav-0.41 b/app-antivirus/klamav/files/digest-klamav-0.41
new file mode 100644 (file)
index 0000000..07bb327
--- /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 (file)
index 0000000..6261c74
--- /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 43fb0a78e6a70333d8acd8ff2b7c3eea94b349c5..098280da6ea679d25c6d880a47ec6b6910182286 100644 (file)
--- 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 48407324a435b83ad77cc50081635bf78a19d7d3..19f6d14ddecb879e53a3dda8600afcd64c4e4007 100644 (file)
--- 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 (file)
index 0000000..4bf9eab
--- /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"
+}