From 9b0f63cfa4eefbdf592ffdb0e98432009eb38827 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Sun, 25 Feb 2007 17:21:29 +0000 Subject: [PATCH] Add clamav-0.90 patch, thanks to Florian Hoppe (#167770). Stable on amd64. Package-Manager: portage-2.1.2-r9 --- net-proxy/havp/ChangeLog | 7 ++++- net-proxy/havp/Manifest | 28 +++++++++++-------- .../havp/files/havp-0.84-clamav-0.90.patch | 22 +++++++++++++++ net-proxy/havp/havp-0.84.ebuild | 7 +++-- 4 files changed, 49 insertions(+), 15 deletions(-) create mode 100644 net-proxy/havp/files/havp-0.84-clamav-0.90.patch 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 + +files/havp-0.84-clamav-0.90.patch, havp-0.84.ebuild: + Add clamav-0.90 patch, thanks to Florian Hoppe + (#167770). Stable on amd64. *havp-0.84 (31 Jan 2007) diff --git a/net-proxy/havp/Manifest b/net-proxy/havp/Manifest index 5c852deb2eeb..66c49d9b54cd 100644 --- a/net-proxy/havp/Manifest +++ b/net-proxy/havp/Manifest @@ -9,6 +9,10 @@ AUX havp-0.83-gentoo.patch 2048 RMD160 2cdc74be14d975f0844e5e85c9a5a292e00d18ac MD5 0739f5636de256e84c0ff1ded53e1ddb files/havp-0.83-gentoo.patch 2048 RMD160 2cdc74be14d975f0844e5e85c9a5a292e00d18ac files/havp-0.83-gentoo.patch 2048 SHA256 1a9a012d729cedc1ceff2dc20baee104b9a312a95d9a5bbc08d9bd887b1f5952 files/havp-0.83-gentoo.patch 2048 +AUX havp-0.84-clamav-0.90.patch 982 RMD160 4b0805d9e6b0cc95a8f551ba1ea0abe203798a7f SHA1 12eb97cb9483c5c502b362633d8519236338ef9c SHA256 9d237cb3bba79870577711205dd34a7d8a77bf3c72c45333ea82e7011cb7becf +MD5 e2f4252df8102f5ca15391f6c94a5cbc files/havp-0.84-clamav-0.90.patch 982 +RMD160 4b0805d9e6b0cc95a8f551ba1ea0abe203798a7f files/havp-0.84-clamav-0.90.patch 982 +SHA256 9d237cb3bba79870577711205dd34a7d8a77bf3c72c45333ea82e7011cb7becf files/havp-0.84-clamav-0.90.patch 982 AUX havp-0.84-gentoo.patch 1557 RMD160 40f8135388984214b397be5526d74561867eeb4c SHA1 ffbd64d75c5df724d40d0bedf73076ae6b1079e6 SHA256 517f8a2e3562f95bb8c66711f5b1eb322254818654127ee29a7d6a073cc9d625 MD5 c423b398ca244672f9f11ab2349e1564 files/havp-0.84-gentoo.patch 1557 RMD160 40f8135388984214b397be5526d74561867eeb4c files/havp-0.84-gentoo.patch 1557 @@ -28,14 +32,14 @@ EBUILD havp-0.83.ebuild 1539 RMD160 1e4b6fa933c163dd8192ab13fdebd075b0ccc756 SHA MD5 f61f0cfad5a2660c8ea76fcc5bf3fa26 havp-0.83.ebuild 1539 RMD160 1e4b6fa933c163dd8192ab13fdebd075b0ccc756 havp-0.83.ebuild 1539 SHA256 17b878fc8e443902ff5e2e8c4b18d9adf33ebeaa1252e62aaa6ca3e8f8d3dcc9 havp-0.83.ebuild 1539 -EBUILD havp-0.84.ebuild 1598 RMD160 c8d0909433af05fd50b93b5d38519cf8da55e982 SHA1 d1aa71da036878125b140af1080925e73c13e586 SHA256 b83dc9fedbfaaf38bdd3e4a6d6e4dc6af6f1f3bfe96fec4bae91d2c72a51e47c -MD5 15808a65e341e4d9060c006a4272a678 havp-0.84.ebuild 1598 -RMD160 c8d0909433af05fd50b93b5d38519cf8da55e982 havp-0.84.ebuild 1598 -SHA256 b83dc9fedbfaaf38bdd3e4a6d6e4dc6af6f1f3bfe96fec4bae91d2c72a51e47c havp-0.84.ebuild 1598 -MISC ChangeLog 2139 RMD160 0336f081ef5d76966031b5f77ead932573153c46 SHA1 5991f2f60e4860e09c1b0c272cb1bccf1e7a2a71 SHA256 7c9c54855f06d3d790fbd520bf0feecdb568a9c8163c6d0468ec6e7d9b88353f -MD5 ea860d613028d8dc7f075890448071c2 ChangeLog 2139 -RMD160 0336f081ef5d76966031b5f77ead932573153c46 ChangeLog 2139 -SHA256 7c9c54855f06d3d790fbd520bf0feecdb568a9c8163c6d0468ec6e7d9b88353f ChangeLog 2139 +EBUILD havp-0.84.ebuild 1714 RMD160 b8e2bdd33c2952dfec84d78856502a998d13f186 SHA1 acdcc65ae646dcfd247daa0d40860375d8f2d223 SHA256 4f943918841cd9c2e91fd7f2f6f717ab483f40cec3019d14ef71cbf1f988a551 +MD5 2f1097cdb317fb35e0ba4c52b24a7ccf havp-0.84.ebuild 1714 +RMD160 b8e2bdd33c2952dfec84d78856502a998d13f186 havp-0.84.ebuild 1714 +SHA256 4f943918841cd9c2e91fd7f2f6f717ab483f40cec3019d14ef71cbf1f988a551 havp-0.84.ebuild 1714 +MISC ChangeLog 2344 RMD160 0309a66ea6819e94849410a4983a9ae988ee5fd8 SHA1 b0953d695ec62808352b8926e0c4288bc6936e10 SHA256 a9673df9bde8a994d3468f1777d2a397f624d3e701ac342d5cadb3a12264ac2f +MD5 02dd91be0834e32f6eb952bd2e924880 ChangeLog 2344 +RMD160 0309a66ea6819e94849410a4983a9ae988ee5fd8 ChangeLog 2344 +SHA256 a9673df9bde8a994d3468f1777d2a397f624d3e701ac342d5cadb3a12264ac2f ChangeLog 2344 MISC metadata.xml 309 RMD160 f9061c1bd03c07ffec2deb81e621912c5a4b091c SHA1 5c8174fcc33b5fe347de99a782d3535a3a90d1b9 SHA256 26c5dece4fe203c9ae4847405314a340fb86058060c9536a92dd7471f4f03d0d MD5 eeef2b4ba39eb40826f14b0bd0489563 metadata.xml 309 RMD160 f9061c1bd03c07ffec2deb81e621912c5a4b091c metadata.xml 309 @@ -50,9 +54,9 @@ MD5 8c92f1c34f50e7838e3963a9d3ec00fe files/digest-havp-0.84 229 RMD160 6de30cc8d8c9319f9cf6f476af7ab83701ed1a10 files/digest-havp-0.84 229 SHA256 12b7c57494f191bf5a8ff82f4adc369d947e7e5df8d2c87c763602f727cd4a3a files/digest-havp-0.84 229 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFwNGoJnxX6mF440QRAoKeAJ9kQPxK0M7PYE+ZLBwLJyMQ6De+8wCdFeoo -6gJYyXL/ITBUXSeeLAUJDdI= -=tjcU +iD8DBQFF4cWuJnxX6mF440QRAozuAJ952nFWDUr4MXnGUzZBT2rmpNqCYQCdEmeD +BDFbTVT3dXuRPqkOcpZUs3k= +=l/2B -----END PGP SIGNATURE----- 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() { -- 2.26.2