Added a patch to include cl_loaddbdir() in clamav.h to prevent other apps using this...

Package-Manager: portage-2.1.2-r11

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index eb8a6b2dde9ad3513ac0192c38534d3c2625fbb9..21dbec6eead457abe393772f3d975c0aa21de9ea 100644 (file)
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.205 2007/02/22 13:22:04 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.206 2007/02/25 11:27:25 ticho Exp $
+
+  25 Feb 2007; Andrej Kacian <ticho@gentoo.org>
+  +files/clamav-0.90-compat.patch, clamav-0.90.ebuild:
+  Added a patch to include cl_loaddbdir() in clamav.h to prevent other apps
+  using this function from dying during compile-time. Other API
+  incompatibilities will be dealt with as they come (patch if it's trivial,
+  suggest users to whine upstream if it's not). Oh, and marked 0.90 stable on
+  x86, as per security bug #167201.
 
   22 Feb 2007; Patrick McLean <chutzpah@gentoo.org> clamav-0.90.ebuild:
   Stable on amd64 (bug #167201).

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index f66d6937bdc50492222992f11f7776466aed8b85..cd34134bfe02f74c01641433ca77ce7c7dc76ab6 100644 (file)
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX clamav-0.90-compat.patch 585 RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 SHA1 fedfe373a6a911230c553fd5a095c8acb72b4ce2 SHA256 7a646386f74bc9094bd39d6762b78ef74310678cdef5484650e0aa242cf570e9
+MD5 6c50cdabc6ee6dc40df2b89c075380a5 files/clamav-0.90-compat.patch 585
+RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 files/clamav-0.90-compat.patch 585
+SHA256 7a646386f74bc9094bd39d6762b78ef74310678cdef5484650e0aa242cf570e9 files/clamav-0.90-compat.patch 585
 AUX clamav-milter.README.gentoo 1124 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b SHA1 0b9b86a0e7732eaaf7f880859265754f7a4efd3a SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11
 MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124
 RMD160 4fb1e2d9b444874838bcea1071969ca6862fb15b files/clamav-milter.README.gentoo 1124
@@ -41,14 +45,14 @@ EBUILD clamav-0.88.7.ebuild 3432 RMD160 e96b060fd6cdb828ed19f25fcb66606a09949c27
 MD5 28a0ef2c2910d9e96558ca1c3e33f239 clamav-0.88.7.ebuild 3432
 RMD160 e96b060fd6cdb828ed19f25fcb66606a09949c27 clamav-0.88.7.ebuild 3432
 SHA256 cee9e104b7e6a6f3c2d4659b6b92825ece9078ff941b91ceac1b29ed0c245a78 clamav-0.88.7.ebuild 3432
-EBUILD clamav-0.90.ebuild 3880 RMD160 2685639811f98060edd7dc1c91553439fa989fc5 SHA1 903a3dbff3ba1b0ef0c119acb2d157e20af9967a SHA256 5390ad68cbafe2e4a6908f27c59e269687123c740f7d92c10176bf3ebd361005
-MD5 e18933e87975058671435330ef8ac755 clamav-0.90.ebuild 3880
-RMD160 2685639811f98060edd7dc1c91553439fa989fc5 clamav-0.90.ebuild 3880
-SHA256 5390ad68cbafe2e4a6908f27c59e269687123c740f7d92c10176bf3ebd361005 clamav-0.90.ebuild 3880
-MISC ChangeLog 31926 RMD160 0dbd86ed00a8229e9ed26d106d024136a387285a SHA1 7178d1bd1c047e981b25524ba5a985de414e177f SHA256 6d387a8f5f5c28f9f461ee4e76c2fc9e31bfd1d1785bbf3688ce683184e7df75
-MD5 cdb4429d9f278887cda9a27949acd2d0 ChangeLog 31926
-RMD160 0dbd86ed00a8229e9ed26d106d024136a387285a ChangeLog 31926
-SHA256 6d387a8f5f5c28f9f461ee4e76c2fc9e31bfd1d1785bbf3688ce683184e7df75 ChangeLog 31926
+EBUILD clamav-0.90.ebuild 3960 RMD160 090411bc9162ea3b2cc9044436bfc4073fabf779 SHA1 8389f458f0acdfe7ecf44aa812906c965f14ac15 SHA256 8b753ad510bb8414b8dc59681b206ab112f0ba86ac4348d443c8bb63077681d7
+MD5 d32f863ef2d82845cf6a7397a7ca74b7 clamav-0.90.ebuild 3960
+RMD160 090411bc9162ea3b2cc9044436bfc4073fabf779 clamav-0.90.ebuild 3960
+SHA256 8b753ad510bb8414b8dc59681b206ab112f0ba86ac4348d443c8bb63077681d7 clamav-0.90.ebuild 3960
+MISC ChangeLog 32357 RMD160 a7aec9b1edb3ac9be8ec226644f818d2d8fe7363 SHA1 4de85d7957a5f0e5ea7a2a9d9c9ad154250ba981 SHA256 aa5349c4c841202bd2e583707a414964b9690296cdb73ebdeac60fc74cd1a9a1
+MD5 dbf2a4c47bb256ee52de7f9b999d09f2 ChangeLog 32357
+RMD160 a7aec9b1edb3ac9be8ec226644f818d2d8fe7363 ChangeLog 32357
+SHA256 aa5349c4c841202bd2e583707a414964b9690296cdb73ebdeac60fc74cd1a9a1 ChangeLog 32357
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
@@ -72,9 +76,9 @@ MD5 86c5fb07d5e490ef03e5b7837181c66d files/digest-clamav-0.90 241
 RMD160 50f0394e921a2e5b445a7202757943ef14680ac5 files/digest-clamav-0.90 241
 SHA256 9efe02b7f40c318f512bed0e5ddc59d52834a088a0528102ee8ece709ff5966e files/digest-clamav-0.90 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF3ZkNWt/XSf2CZdkRAneBAJ4qxp2JsFs8cuCAcFe48oM69c0v5QCfZPc9
-MLbekAqWrrZAH8ZebeBvwUA=
-=9k+u
+iD8DBQFF4XKqQlM6RnzZP+IRArR+AKCj2kLxxz9Xc6B4sfHzwUZutwZlWQCeN/8Y
+37Ieoj1ix3SVFGCosFIPClM=
+=JRrL
 -----END PGP SIGNATURE-----

diff --git a/app-antivirus/clamav/clamav-0.90.ebuild b/app-antivirus/clamav/clamav-0.90.ebuild
index 588899b4fd583af6e8ea2751874bcf56be3a1a72..8866603e526b9864dc0f456eee4b15c2ccd5b942 100644 (file)
--- a/app-antivirus/clamav/clamav-0.90.ebuild
+++ b/app-antivirus/clamav/clamav-0.90.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/clamav/clamav-0.90.ebuild,v 1.8 2007/02/22 13:22:04 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90.ebuild,v 1.9 2007/02/25 11:27:25 ticho Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="bzip2 crypt curl gmp logrotate mailwrapper milter selinux"
 
 DEPEND="virtual/libc
@@ -40,6 +40,12 @@ pkg_setup() {
        enewuser clamav -1 -1 /dev/null clamav
 }
 
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-compat.patch
+}
+
 src_compile() {
        has_version =sys-libs/glibc-2.2* && filter-lfs-flags
 

diff --git a/app-antivirus/clamav/files/clamav-0.90-compat.patch b/app-antivirus/clamav/files/clamav-0.90-compat.patch
new file mode 100644 (file)
index 0000000..601e2df
--- /dev/null
+++ b/app-antivirus/clamav/files/clamav-0.90-compat.patch
@@ -0,0 +1,11 @@
+diff -bur clamav-0.90.orig/libclamav/clamav.h clamav-0.90/libclamav/clamav.h
+--- clamav-0.90.orig/libclamav/clamav.h        2007-02-25 11:56:29.000000000 +0100
++++ clamav-0.90/libclamav/clamav.h     2007-02-25 11:57:42.000000000 +0100
+@@ -234,6 +234,7 @@
+ /* database handling */
+ extern int cl_load(const char *path, struct cl_engine **engine, unsigned int *signo, unsigned int options);
+ extern const char *cl_retdbdir(void);
++extern int cl_loaddbdir(const char *dirname, struct cl_engine **engine, unsigned int *signo);
+ 
+ /* engine handling */
+ extern int cl_build(struct cl_engine *engine);