Added 0.86_rc1. Removed 0.85.1-r2.

(Portage version: 2.0.51.22-r1)

6 files changed, 18 insertions, 42 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 533daded4f78..b86587a1b008 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.77 2005/06/13 18:55:15 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.78 2005/06/14 00:58:01 ticho Exp $
+
+*clamav-0.86_rc1 (14 Jun 2005)
+
+  14 Jun 2005; Andrej Kacian <ticho@gentoo.org>
+  -files/clamav-0.85.1-cvd-dir-traversal-fix.patch,
+  -clamav-0.85.1-r2.ebuild, +clamav-0.86_rc1.ebuild:
+  Version bump - a release candidate. Removed 0.85.1-r2, since the directory
+  traversal fix is contained in this rc1.
 
 *clamav-0.85.1-r2 (13 Jun 2005)
 
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 1be5f2dcf284..dda9b5e1a85a 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,31 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 34a649543043b4506c5ecdca94ddad41 clamav-0.85.ebuild 2314
-MD5 3e31e795ac423db2f575f241ef84ee13 clamav-0.85.1-r2.ebuild 3689
 MD5 bf2cf15ce5fddd93fffa28e8b0a3f50f clamav-0.84.ebuild 2314
 MD5 3fb0f6da7a5672ab890d9ac74f7e7046 clamav-0.85.1-r1.ebuild 3574
 MD5 921a56174bc3634808df37537d77ea1d clamav-0.85.1.ebuild 3326
 MD5 689c7676f16b3126b2c3f9271f7c2a1e clamav-0.85-r1.ebuild 3290
-MD5 3c89328173aaf1638e429d98ee3a9a35 ChangeLog 15832
+MD5 ae8aa52e91448b7f69ce592e05b896ac clamav-0.86_rc1.ebuild 3506
+MD5 7a22db945b4103ffbb6f6f429149c51c ChangeLog 16137
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 MD5 6ea55388f51845c2f815589dfed047a4 clamav-0.83.ebuild 2332
 MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85-r1 64
 MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124
+MD5 9807ac686d54e104f1c86fc1b0cbf23d files/digest-clamav-0.86_rc1 67
 MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1 66
 MD5 9bbf2754f8178fd5164875d784aa9ffa files/digest-clamav-0.83 64
 MD5 3e9877b8901f604bd65ea89ff18833b6 files/digest-clamav-0.84 64
 MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85 64
 MD5 f6bf5b894e60e8686cb5a36ba240e1ef files/clamd.rc.new 2032
 MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1-r1 66
-MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1-r2 66
 MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
-MD5 0f08d9b6e822b2210e332df23260bad6 files/clamav-0.85.1-cvd-dir-traversal-fix.patch 564
 MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrdawQlM6RnzZP+IRAgoYAKCJ0NjNV3vT4A6Ms8UZvo6AcdmqmQCgwjMn
-JAeArRaDyuwuuT92AOgNeds=
-=Tvt3
------END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.85.1-r2.ebuild b/app-antivirus/clamav/clamav-0.86_rc1.ebuild
index bdfbc4ab6089..47939f117b54 100644
--- a/app-antivirus/clamav/clamav-0.85.1-r2.ebuild
+++ b/app-antivirus/clamav/clamav-0.86_rc1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.85.1-r2.ebuild,v 1.1 2005/06/13 18:55:15 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.86_rc1.ebuild,v 1.1 2005/06/14 00:58:01 ticho Exp $
 
 inherit eutils flag-o-matic
 
+MY_P=${P/_/}
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/clamav/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/clamav/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,6 +26,8 @@ RDEPEND="${DEPEND}
 	sys-apps/grep"
 PROVIDE="virtual/antivirus"
 
+S=${WORKDIR}/${MY_P}
+
 pkg_setup() {
 	if use milter; then
 		if [ ! -e /usr/lib/libmilter.a ] ; then
@@ -39,12 +42,6 @@ pkg_setup() {
 	pwconv || die
 }
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-cvd-dir-traversal-fix.patch || die "epatch failed"
-}
-
 src_compile() {
 	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
 
diff --git a/app-antivirus/clamav/files/clamav-0.85.1-cvd-dir-traversal-fix.patch b/app-antivirus/clamav/files/clamav-0.85.1-cvd-dir-traversal-fix.patch
deleted file mode 100644
index fd4c1ed26490..000000000000
--- a/app-antivirus/clamav/files/clamav-0.85.1-cvd-dir-traversal-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -bur clamav-0.85.1/libclamav/cvd.c clamav-0.85.1-fixed/libclamav/cvd.c
---- clamav-0.85.1/libclamav/cvd.c	2005-05-11 03:43:10.000000000 +0200
-+++ clamav-0.85.1-fixed/libclamav/cvd.c	2005-06-13 20:07:34.000000000 +0200
-@@ -77,6 +77,14 @@
- 
- 	    strncpy(name, block, 100);
- 	    name[100] = '\0';
-+
-+	    if(strchr(name, '/')) {
-+		    cli_errmsg("Slash separators are not allowed in CVD.\n");
-+		    free(fullname);
-+		    gzclose(infile);
-+		    return -1;
-+	    }
-+
- 	    strcpy(fullname, destdir);
- 	    strcat(fullname, "/");
- 	    strcat(fullname, name);
diff --git a/app-antivirus/clamav/files/digest-clamav-0.85.1-r2 b/app-antivirus/clamav/files/digest-clamav-0.85.1-r2
deleted file mode 100644
index 56f3267da58d..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.85.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0675c3273785d61eefc1afa304745c0 clamav-0.85.1.tar.gz 4061042
diff --git a/app-antivirus/clamav/files/digest-clamav-0.86_rc1 b/app-antivirus/clamav/files/digest-clamav-0.86_rc1
new file mode 100644
index 000000000000..ba37e43b7533
--- /dev/null
+++ b/app-antivirus/clamav/files/digest-clamav-0.86_rc1
@@ -0,0 +1 @@
+MD5 eada03e9fb2f25440b606a5c44d45db2 clamav-0.86rc1.tar.gz 4181704