summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2007-02-27 12:12:04 +0000
committerAlin Năstac <mrness@gentoo.org>2007-02-27 12:12:04 +0000
commit7ec3e36bfc29522ea46a71a3f859b5271786ed6b (patch)
treeee15c58cef3d7a838fd8fcde799de59d66462bc0 /net-proxy/havp
parentUnmask libisofs since brasero new release supports it. (diff)
downloadgentoo-2-7ec3e36bfc29522ea46a71a3f859b5271786ed6b.tar.gz
gentoo-2-7ec3e36bfc29522ea46a71a3f859b5271786ed6b.tar.bz2
gentoo-2-7ec3e36bfc29522ea46a71a3f859b5271786ed6b.zip
Remove clamav-0.90 patch (#167770)
(Portage version: 2.1.2-r9)
Diffstat (limited to 'net-proxy/havp')
-rw-r--r--net-proxy/havp/ChangeLog6
-rw-r--r--net-proxy/havp/files/havp-0.84-clamav-0.90.patch22
-rw-r--r--net-proxy/havp/havp-0.84.ebuild7
3 files changed, 7 insertions, 28 deletions
diff --git a/net-proxy/havp/ChangeLog b/net-proxy/havp/ChangeLog
index f6c9932cbd93..668cf50d4d13 100644
--- a/net-proxy/havp/ChangeLog
+++ b/net-proxy/havp/ChangeLog
@@ -1,6 +1,10 @@
# 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.13 2007/02/27 06:46:40 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.14 2007/02/27 12:12:04 mrness Exp $
+
+ 27 Feb 2007; Alin Nastac <mrness@gentoo.org>
+ -files/havp-0.84-clamav-0.90.patch, havp-0.84.ebuild:
+ Remove clamav-0.90 patch (#167770).
27 Feb 2007; Christian Faulhammer <opfer@gentoo.org> havp-0.84.ebuild:
stable x86; bug 167770
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
deleted file mode 100644
index 21957f5d4882..000000000000
--- a/net-proxy/havp/files/havp-0.84-clamav-0.90.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 7acc72028440..65a697372830 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.3 2007/02/27 06:46:40 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.84.ebuild,v 1.4 2007/02/27 12:12:04 mrness Exp $
inherit eutils
@@ -24,9 +24,6 @@ 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() {
@@ -53,7 +50,7 @@ src_install() {
diropts -m 0750
dodir /var/run/havp /var/tmp/havp
- dodoc ChangeLog todo
+ dodoc ChangeLog
}
pkg_postinst() {