diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2007-02-25 17:21:29 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2007-02-25 17:21:29 +0000 |
| commit | c8cd1dc3ee39341db55b0e0762bb4cd94e6cfaa5 (patch) | |
| tree | 88ec029a045a11aef97cc16f37c25d033f02540e /net-proxy | |
| parent | Porting to modular X. (diff) | |
| download | gentoo-2-c8cd1dc3ee39341db55b0e0762bb4cd94e6cfaa5.tar.gz gentoo-2-c8cd1dc3ee39341db55b0e0762bb4cd94e6cfaa5.tar.bz2 gentoo-2-c8cd1dc3ee39341db55b0e0762bb4cd94e6cfaa5.zip | |
Add clamav-0.90 patch, thanks to Florian Hoppe <flp at gmx dot net> (#167770). Stable on amd64.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/havp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-proxy/havp/files/havp-0.84-clamav-0.90.patch | 22 | ||||
| -rw-r--r-- | net-proxy/havp/havp-0.84.ebuild | 7 |
3 files changed, 33 insertions, 3 deletions
diff --git a/net-proxy/havp/ChangeLog b/net-proxy/havp/ChangeLog index aaababfa1b41..781189d6f3ae 100644 --- a/net-proxy/havp/ChangeLog +++ b/net-proxy/havp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-proxy/havp # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.11 2007/01/31 17:27:58 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.12 2007/02/25 17:21:29 mrness Exp $ + + 25 Feb 2007; Alin Năstac <mrness@gentoo.org> + +files/havp-0.84-clamav-0.90.patch, havp-0.84.ebuild: + Add clamav-0.90 patch, thanks to Florian Hoppe <flp at gmx dot net> + (#167770). Stable on amd64. *havp-0.84 (31 Jan 2007) diff --git a/net-proxy/havp/files/havp-0.84-clamav-0.90.patch b/net-proxy/havp/files/havp-0.84-clamav-0.90.patch new file mode 100644 index 000000000000..21957f5d4882 --- /dev/null +++ b/net-proxy/havp/files/havp-0.84-clamav-0.90.patch @@ -0,0 +1,22 @@ +diff -Nru havp-0.84.orig/havp/scanners/clamlibscanner.cpp havp-0.84/havp/scanners/clamlibscanner.cpp +--- havp-0.84.orig/havp/scanners/clamlibscanner.cpp 2007-02-20 17:39:33.202195475 +0100 ++++ havp-0.84/havp/scanners/clamlibscanner.cpp 2007-02-20 17:37:16.300080752 +0100 +@@ -29,7 +29,7 @@ + + LogFile::ErrorMessage("ClamAV: Using database directory: %s\n", dbdir); + +- if ( (ret = cl_loaddbdir(dbdir, &root, &no)) != 0 ) ++ if ( (ret = cl_load(dbdir, &root, &no, CL_DB_STDOPT)) != 0 ) + { + LogFile::ErrorMessage("ClamAV: Could not load database: %s\n", cl_strerror(ret)); + return false; +@@ -65,7 +65,7 @@ + + cl_settempdir(Params::GetConfigString("TEMPDIR").c_str(), 0); + +- if ( (ret = cl_loaddbdir(dbdir, &root, &no)) != 0 ) ++ if ( (ret = cl_load(dbdir, &root, &no, CL_DB_STDOPT)) != 0 ) + { + LogFile::ErrorMessage("ClamAV: Could not reload database: %s\n", cl_strerror(ret)); + return false; + diff --git a/net-proxy/havp/havp-0.84.ebuild b/net-proxy/havp/havp-0.84.ebuild index df00fe394c95..13632f29519f 100644 --- a/net-proxy/havp/havp-0.84.ebuild +++ b/net-proxy/havp/havp-0.84.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/net-proxy/havp/havp-0.84.ebuild,v 1.1 2007/01/31 17:26:59 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.84.ebuild,v 1.2 2007/02/25 17:21:29 mrness Exp $ inherit eutils @@ -10,7 +10,7 @@ SRC_URI="http://www.server-side.de/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="clamav ssl" DEPEND="clamav? ( app-antivirus/clamav )" @@ -24,6 +24,9 @@ src_unpack() { unpack ${A} epatch "${FILESDIR}/${P}-gentoo.patch" + if use clamav && has_version '>=app-antivirus/clamav-0.90' ; then + epatch "${FILESDIR}/${P}-clamav-0.90.patch" + fi } src_compile() { |